rpms/wcstools/devel wcstools.spec, 1.13, 1.14 wcstools3-shared.patch, 1.5, 1.6

[Sergio Pascual]

Author: sergiopr

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

Modified Files:
	wcstools.spec wcstools3-shared.patch 
Log Message:
* Sat Feb 14 2009 Sergio Pascual <sergiopr at fedoraproject.org> 3.7.0-5
- Libray and headers renamed as wcstools



Index: wcstools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/devel/wcstools.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- wcstools.spec	1 Oct 2008 18:45:00 -0000	1.13
+++ wcstools.spec	14 Feb 2009 16:41:35 -0000	1.14
@@ -1,12 +1,12 @@
 Name: wcstools
 Version: 3.7.0
-Release: 3%{?dist}
+Release: 5%{?dist}
 Summary: Software utilities to display and manipulate the WCS of a FITS image
 
 Group: Applications/Engineering
 License: GPLv2+
 URL: http://tdc-www.harvard.edu/wcstools
-Source0: http://tdc-www.harvard.edu/software/wcstools/wcstools-%{version}.tar.gz
+Source0: http://tdc-www.harvard.edu/software/wcstools/%{name}-%{version}.tar.gz
 Patch0: wcstools3-shared.patch
 Patch1: wcstools3-codewarn.patch
 Patch2: wcstools3-bug232413.patch
@@ -19,23 +19,25 @@
 position within the image to position on the sky.  Auxillary programs
 search star catalogs and manipulate images.
 
-%package -n libwcs
+%package libs
 Summary: Libwcs shared library 
 Group: System Environment/Libraries
 License: LGPLv2+
+Obsoletes: libwcs < 3.7.0-4
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-%description -n libwcs
+%description libs
 Shared library necessary to run wcstools and programs based on libwcs.
 
-%package -n libwcs-devel
+%package devel
 Summary: Libraries, includes, etc. used to develop an application with libwcs
 Group: Development/Libraries
 License: LGPLv2+
-Requires: libwcs = %{version}-%{release}
-%description -n libwcs-devel
+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.
 
 %prep
@@ -51,19 +53,19 @@
 %{__rm} -rf %{buildroot}
 %{__mkdir_p} %{buildroot}%{_libdir}
 %{__mkdir_p} %{buildroot}%{_bindir}
-%{__mkdir_p} %{buildroot}%{_includedir}/wcs
+%{__mkdir_p} %{buildroot}%{_includedir}/wcstools
 %{__mkdir_p} %{buildroot}%{_mandir}/man1
 %{__install} -p bin/* %{buildroot}%{_bindir}
 %{__cp} -a libwcs/*.so* %{buildroot}%{_libdir}
-%{__install} -p -m 644 libwcs/*.h %{buildroot}%{_includedir}/wcs
+%{__install} -p -m 644 libwcs/*.h %{buildroot}%{_includedir}/wcstools
 %{__install} -p -m 644 Man/man1/* %{buildroot}%{_mandir}/man1
 
 %clean
 %{__rm} -fr %{buildroot}
 
-%post -n libwcs -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
 
-%postun -n libwcs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %files
 %doc NEWS COPYING Readme Programs
@@ -71,19 +73,25 @@
 %{_bindir}/*
 %{_mandir}/man1/*
 
-%files -n libwcs
+%files libs
 %defattr(-,root,root)
 %doc libwcs/COPYING
 %{_libdir}/*.so.*
 
-%files -n libwcs-devel
+%files devel
 %doc libwcs/COPYING libwcs/NEWS
 %defattr(-,root,root)
 %{_libdir}/*.so
-%{_includedir}/wcs
+%{_includedir}/wcstools
 
 
 %changelog
+* Sat Feb 14 2009 Sergio Pascual <sergiopr at fedoraproject.org> 3.7.0-5
+- Libray and headers renamed as wcstools
+
+* Wed Oct 01 2008 Sergio Pascual <sergiopr at fedoraproject.org> 3.7.0-4
+- Fails to build from source bz#465061
+
 * Wed Oct 01 2008 Sergio Pascual <sergiopr at fedoraproject.org> 3.7.0-3
 - Fails to build from source bz#465061
 

wcstools3-shared.patch:

Index: wcstools3-shared.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wcstools/devel/wcstools3-shared.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wcstools3-shared.patch	7 Sep 2007 20:16:11 -0000	1.5
+++ wcstools3-shared.patch	14 Feb 2009 16:41:36 -0000	1.6
@@ -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 libwcs.so.3.0.0
++all: libwcs.a libwcstools.so.0.0.0
 +
  libwcs.a:	$(OBJS)
  	ar rv $@ $?
  	ranlib $@
  
-+libwcs.so.3.0.0: $(OBJS)
-+	$(CC) $(CFLAGS) -shared -o $@ -Wl,-soname,libwcs.so.3 $?
-+	ln -s libwcs.so.3.0.0 libwcs.so.3
-+	ln -s libwcs.so.3.0.0 libwcs.so
++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
 +
 +
  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 -lwcs
++LIBWCS = -L`pwd`/libwcs -lwcstools
  LIBS = $(LIBWCS) -lm
  #CATLIBS = $(LIBS) -lnsl -lsocket
  CATLIBS = $(LIBS)