From fa75a0f292047025e2b43828987da13a5244e64e Mon Sep 17 00:00:00 2001
From: Sergio Pascual <sergiopr@fis.ucm.es>
Date: Jan 06 2012 16:23:44 +0000
Subject: New upstream source


---

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-perms.patch b/wcslib-perms.patch
new file mode 100644
index 0000000..85f0827
--- /dev/null
+++ b/wcslib-perms.patch
@@ -0,0 +1,33 @@
+diff -ur wcslib-4.8.4/C/GNUmakefile wcslib-4.8.4.perm/C/GNUmakefile
+--- wcslib-4.8.4/C/GNUmakefile	2011-12-05 07:41:10.000000000 +0100
++++ wcslib-4.8.4.perm/C/GNUmakefile	2012-01-06 16:54:57.473299563 +0100
+@@ -253,7 +253,7 @@
+ 	   fi
+ 	-  $(LN_S) $(WCSLIB) $(LIBDIR)/libwcs.a
+ 	-  if [ "$(SHRLIB)" != "" ] ; then \
+-	     $(INSTALL) -m 644 $(SHRLIB) $(LIBDIR) ; \
++	     $(INSTALL) -m 755 $(SHRLIB) $(LIBDIR) ; \
+ 	     if [ -h "$(LIBDIR)/$(SONAME)" ] ; then \
+ 	       $(RM) $(LIBDIR)/$(SONAME) ; \
+ 	     fi ; \
+@@ -266,7 +266,7 @@
+ 	     fi ; \
+ 	   fi
+ 	-  if [ ! -d "$(INCDIR)" ] ; then \
+-	     $(INSTALL) -d -m 2775 $(INCDIR) ; \
++	     $(INSTALL) -d -m 0755 $(INCDIR) ; \
+ 	   fi
+ 	   $(INSTALL) -m 444 *.h $(INCDIR)
+ 	   $(RM) $(INCLINK)
+diff -ur wcslib-4.8.4/utils/GNUmakefile wcslib-4.8.4.perm/utils/GNUmakefile
+--- wcslib-4.8.4/utils/GNUmakefile	2011-10-04 09:54:26.000000000 +0200
++++ wcslib-4.8.4.perm/utils/GNUmakefile	2012-01-06 16:56:05.360754907 +0100
+@@ -114,7 +114,7 @@
+ 	-  if [ ! -d "$(MANDIR)" ] ; then \
+ 	     $(INSTALL) -d -m 2775 $(MANDIR)/man1 ; \
+ 	   fi
+-	   $(INSTALL) -m 755 $(MAN) $(MANDIR)/man1
++	   $(INSTALL) -m 644 $(MAN) $(MANDIR)/man1
+ 
+ GNUmakefile : ../makedefs ;
+ 
diff --git a/wcslib.spec b/wcslib.spec
index 51900f6..476de76 100644
--- a/wcslib.spec
+++ b/wcslib.spec
@@ -1,13 +1,14 @@
 Name: wcslib
-Version: 4.7
-Release: 2%{?dist}
+Version: 4.8.4
+Release: 1%{?dist}
 Summary: An implementation of the FITS World Coordinate System standard
 
 Group: Development/Libraries
 # Library is under LGPLv3+ utils under GPLv3+
 License: LGPLv3+
 URL: http://www.atnf.csiro.au/people/mcalabre/WCS/
-Source0: ftp://ftp.atnf.csiro.au/pub/software/wcslib/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.atnf.csiro.au/pub/software/wcslib/%{name}-%{version}.tar.xz
+Patch0: wcslib-perms.patch
 BuildRequires: cfitsio-devel zlib-devel
 
 %description
@@ -32,30 +33,19 @@ Utils provided with %{name}
 
 %prep
 %setup -q 
+%patch0 -p1
 
 %build
-%configure --disable-fortran
+%configure --disable-fortran --disable-static
 # seems to have a race condition
 #make %{?_smp_mflags}
 make
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}/%{_bindir}
-mkdir -p %{buildroot}/%{_libdir}
-mkdir -p %{buildroot}/%{_libdir}/pkgconfig
-mkdir -p %{buildroot}/%{_includedir}/wcslib
-install -m 755 utils/fitshdr %{buildroot}/%{_bindir}
-install -m 755 utils/HPXcvt %{buildroot}/%{_bindir}
-install -m 644 wcsconfig.h %{buildroot}/%{_includedir}/wcslib
-install -m 644 wcslib.pc %{buildroot}/%{_libdir}/pkgconfig
-install -m 644 C/*.h %{buildroot}/%{_includedir}/wcslib
-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}
+make install DESTDIR=%{buildroot}
+# fix permissions
+rm -rf %{buildroot}//usr/share/doc/wcslib-4.8.4
 
 %check
 make check
@@ -65,22 +55,26 @@ make check
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING.LESSER README
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root,-)
+%doc COPYING.LESSER html wcslib.pdf
 %{_libdir}/*.so
+%exclude %{_libdir}/*.a
 %{_libdir}/pkgconfig/wcslib.pc
 %{_includedir}/wcslib
+%{_includedir}/wcslib-4.8.4
 
 %files utils
-%defattr(-,root,root,-)
 %doc COPYING 
 %{_bindir}/*
+%{_mandir}/man1/*
 
 %changelog
+* Fri Jan 06 2012 Sergio Pascual <sergiopr at fedoraproject.org> 4.8.4-1
+- New upstream source
+
 * Mon Feb 21 2011 Sergio Pascual <sergiopr at fedoraproject.org> 4.7-2
 - EVR bump for rebuilding