rpms/wcstools/devel wcstools.spec, 1.14, 1.15 wcstools3-shared.patch, 1.6, 1.7

[Sergio Pascual]

Author: sergiopr

Update of /cvs/pkgs/rpms/wcstools/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28937

Modified Files:
	wcstools.spec wcstools3-shared.patch 
Log Message:
* Thu Feb 19 2009 Sergio Pascual <sergiopr at fedoraproject.org> 3.7.0-6
- Reverting soname change



Index: wcstools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/devel/wcstools.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wcstools.spec	14 Feb 2009 16:41:35 -0000	1.14
+++ wcstools.spec	19 Feb 2009 08:51:20 -0000	1.15
@@ -1,6 +1,6 @@
 Name: wcstools
 Version: 3.7.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: Software utilities to display and manipulate the WCS of a FITS image
 
 Group: Applications/Engineering
@@ -20,7 +20,7 @@
 search star catalogs and manipulate images.
 
 %package libs
-Summary: Libwcs shared library 
+Summary: Wcstools shared library 
 Group: System Environment/Libraries
 License: LGPLv2+
 Obsoletes: libwcs < 3.7.0-4
@@ -32,13 +32,13 @@
 Shared library necessary to run wcstools and programs based on libwcs.
 
 %package devel
-Summary: Libraries, includes, etc. used to develop an application with libwcs
+Summary: Libraries, includes, etc. used to develop an application with wcstools
 Group: Development/Libraries
 License: LGPLv2+
 Requires: %{name}-libs = %{version}-%{release}
 Obsoletes: libwcs-devel < 3.7.0-4
 %description devel
-This are the files needed to develop an application using libwcs.
+This are the files needed to develop an application using wcstools.
 
 %prep
 %setup -q
@@ -53,11 +53,11 @@
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}%{_libdir}
 %{__mkdir_p} %{buildroot}%{_bindir}
-%{__mkdir_p} %{buildroot}%{_includedir}/wcstools
+%{__mkdir_p} %{buildroot}%{_includedir}/wcs
 %{__mkdir_p} %{buildroot}%{_mandir}/man1
 %{__install} -p bin/* %{buildroot}%{_bindir}
 %{__cp} -a libwcs/*.so* %{buildroot}%{_libdir}
-%{__install} -p -m 644 libwcs/*.h %{buildroot}%{_includedir}/wcstools
+%{__install} -p -m 644 libwcs/*.h %{buildroot}%{_includedir}/wcs
 %{__install} -p -m 644 Man/man1/* %{buildroot}%{_mandir}/man1
 
 %clean
@@ -82,10 +82,13 @@
 %doc libwcs/COPYING libwcs/NEWS
 %defattr(-,root,root)
 %{_libdir}/*.so
-%{_includedir}/wcstools
+%{_includedir}/wcs
 
 
 %changelog
+* Thu Feb 19 2009 Sergio Pascual <sergiopr at fedoraproject.org> 3.7.0-6
+- Reverting soname change
+
 * Sat Feb 14 2009 Sergio Pascual <sergiopr at fedoraproject.org> 3.7.0-5
 - Libray and headers renamed as wcstools
 

wcstools3-shared.patch:

Index: wcstools3-shared.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/devel/wcstools3-shared.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wcstools3-shared.patch	14 Feb 2009 16:41:36 -0000	1.6
+++ wcstools3-shared.patch	19 Feb 2009 08:51:20 -0000	1.7
@@ -5,16 +5,16 @@
  	sortstar.o platefit.o iget.o fileutil.o \
  	wcslib.o lin.o cel.o proj.o sph.o wcstrig.o distort.o
  
-+all: libwcs.a libwcstools.so.0.0.0
++all: libwcs.a libwcs.so.0.0.0
 +
  libwcs.a:	$(OBJS)
  	ar rv $@ $?
  	ranlib $@
  
-+libwcstools.so.0.0.0: $(OBJS)
-+	$(CC) $(CFLAGS) -shared -o $@ -Wl,-soname,libwcstools.so.0 $?
-+	ln -s libwcstools.so.0.0.0 libwcstools.so.0
-+	ln -s libwcstools.so.0.0.0 libwcstools.so
++libwcs.so.0.0.0: $(OBJS)
++	$(CC) $(CFLAGS) -shared -o $@ -Wl,-soname,libwc.so.0 $?
++	ln -s libwcs.so.0.0.0 libwcs.so.0
++	ln -s libwcs.so.0.0.0 libwcs.so
 +
 +
  actread.o:	fitsfile.h wcscat.h wcs.h fitshead.h wcslib.h
@@ -32,7 +32,7 @@
  CFLAGS= -g
  CC= cc
 -LIBWCS = libwcs/libwcs.a
-+LIBWCS = -L`pwd`/libwcs -lwcstools
++LIBWCS = -L`pwd`/libwcs -lwcs
  LIBS = $(LIBWCS) -lm
  #CATLIBS = $(LIBS) -lnsl -lsocket
  CATLIBS = $(LIBS)