From ad3877f5d9364be01d43b6c4cef5141807daaadb Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Mon, 21 Feb 2011 23:12:29 +0100 Subject: [PATCH 1/3] Merge branch 'master', remote-tracking branch 'origin' into f15 From 5709a66e59e0bae81cacba9dac408d0700f3d620 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Mon, 21 Feb 2011 23:13:32 +0100 Subject: [PATCH 2/3] New upstream source --- wcslib.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/wcslib.spec b/wcslib.spec index 51900f6..fe1c03d 100644 --- a/wcslib.spec +++ b/wcslib.spec @@ -1,6 +1,6 @@ Name: wcslib Version: 4.7 -Release: 2%{?dist} +Release: 1%{?dist} Summary: An implementation of the FITS World Coordinate System standard Group: Development/Libraries @@ -82,9 +82,6 @@ make check %changelog * Mon Feb 21 2011 Sergio Pascual 4.7-2 -- EVR bump for rebuilding - -* Sun Feb 20 2011 Sergio Pascual 4.7-1 - New upstream source * Mon Feb 07 2011 Fedora Release Engineering - 4.6.3-3 From 2eec3d186124629a5d5f4d8ad09eda3bec42195c Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Wed, 24 Aug 2011 16:11:38 +0200 Subject: [PATCH 3/3] Removing unused patch Removed clean section --- wcslib-cross.patch | 48 ---------------------------------------------- wcslib.spec | 11 ++++++----- 2 files changed, 6 insertions(+), 53 deletions(-) delete mode 100644 wcslib-cross.patch diff --git a/wcslib-cross.patch b/wcslib-cross.patch deleted file mode 100644 index cb74af2..0000000 --- a/wcslib-cross.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -ur wcslib-4.6.3/configure wcslib-4.6.3.new/configure ---- wcslib-4.6.3/configure 2010-11-24 02:35:31.000000000 +0100 -+++ wcslib-4.6.3.new/configure 2010-12-13 11:31:39.519768352 +0100 -@@ -9648,7 +9648,7 @@ - *) - # Covers Linux and Solaris at least. - SHRLIB="libwcs.so.$V" -- SHRLD="$SHRLD -shared -Wl,-h\$(SHRLIB)" -+ SHRLD="$SHRLD $CFLAGS -shared -Wl,-h\$(SHRLIB)" - SHRLN="libwcs.so" - ;; - esac -diff -ur wcslib-4.6.3/utils/GNUmakefile wcslib-4.6.3.new/utils/GNUmakefile ---- wcslib-4.6.3/utils/GNUmakefile 2010-11-16 07:16:20.000000000 +0100 -+++ wcslib-4.6.3.new/utils/GNUmakefile 2010-12-13 11:44:09.276785040 +0100 -@@ -59,20 +59,20 @@ - fitshdr : fitshdr.c - -@ echo '' - $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@.o $< -- $(LD) -o $@ $@.o $(LDFLAGS) $(LIBS) -+ $(LD) $(CFLAGS) -o $@ $@.o $(LDFLAGS) $(LIBS) - -@ $(RM) $@.o - - HPXcvt : HPXcvt.c - -@ echo '' - $(CC) $(CPPFLAGS) $(CFITSIOINC) $(CFLAGS) -c -o $@.o $< -- $(LD) -o $@ $@.o $(LDFLAGS) $(CFITSIOLIB) $(LIBS) -+ $(LD) $(CFLAGS) -o $@ $@.o $(LDFLAGS) $(CFITSIOLIB) $(LIBS) - -@ $(RM) $@.o - - wcsware : wcsware.c $(GETWCSTAB) $(LIBWCS) - -@ echo '' - $(CC) -DDO_CFITSIO $(CPPFLAGS) -I../pgsbox -I../C $(CFITSIOINC) \ - $(CFLAGS) -c -o $@.o $< -- $(LD) $(LDFLAGS) -o $@ $@.o $(GETWCSTAB) $(CFITSIOLIB) $(LIBWCS) \ -+ $(LD) $(CFLAGS) $(LDFLAGS) -o $@ $@.o $(GETWCSTAB) $(CFITSIOLIB) $(LIBWCS) \ - $(FLIBS) $(LIBS) - -@ $(RM) $@.o - -@@ -80,7 +80,7 @@ - -@ echo '' - $(CC) -DDO_CFITSIO $(CPPFLAGS) -I../pgsbox -I../C $(PGPLOTINC) \ - $(CFITSIOINC) $(CFLAGS) -c -o $@.o $< -- $(LD) $(LDFLAGS) -o $@ $@.o $(PGSBOXLIB) $(PGPLOTLIB) \ -+ $(LD) $(CFLAGS) $(LDFLAGS) -o $@ $@.o $(PGSBOXLIB) $(PGPLOTLIB) \ - $(GETWCSTAB) $(CFITSIOLIB) $(LIBWCS) $(FLIBS) $(LIBS) - -@ $(RM) $@.o - diff --git a/wcslib.spec b/wcslib.spec index fe1c03d..97f86c7 100644 --- a/wcslib.spec +++ b/wcslib.spec @@ -1,6 +1,6 @@ Name: wcslib Version: 4.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An implementation of the FITS World Coordinate System standard Group: Development/Libraries @@ -54,9 +54,6 @@ install -m 755 C/libwcs.so.%{version} %{buildroot}/%{_libdir} ln -s libwcs.so.%{version} %{buildroot}/%{_libdir}/libwcs.so.4 ln -s libwcs.so.%{version} %{buildroot}/%{_libdir}/libwcs.so -%clean -rm -rf %{buildroot} - %check make check @@ -81,7 +78,11 @@ make check %{_bindir}/* %changelog -* Mon Feb 21 2011 Sergio Pascual 4.7-2 +* Wed Aug 24 2011 Sergio Pascual 4.7-2 +- Removing unused patch +- Removed clean section + +* Mon Feb 21 2011 Sergio Pascual 4.7-1 - New upstream source * Mon Feb 07 2011 Fedora Release Engineering - 4.6.3-3