[cfitsio] New upstream (3.360)

[Sergio Pascual]

commit 3cd4a2a30eb58aa4cf0a60b4b6bdd0701d6c58d4
Author: Sergio Pascual <sergiopr at fedoraproject.org>
Date:   Mon Dec 9 11:21:36 2013 +0100

    New upstream (3.360)

 .gitignore         |    1 +
 cfitsio-zlib.patch |   24 +++++++++++++-----------
 cfitsio.spec       |   29 ++++++++++++++++-------------
 sources            |    2 +-
 4 files changed, 31 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e2308b6..c219ff8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ cfitsio3250.tar.gz
 /cfitsio3330.tar.gz
 /cfitsio3340.tar.gz
 /cfitsio3350.tar.gz
+/cfitsio3360.tar.gz
diff --git a/cfitsio-zlib.patch b/cfitsio-zlib.patch
index 47a804e..543b184 100644
--- a/cfitsio-zlib.patch
+++ b/cfitsio-zlib.patch
@@ -1,16 +1,18 @@
-diff -ur cfitsio/Makefile.in cfitsio.new/Makefile.in
---- cfitsio/Makefile.in	2013-04-08 20:11:42.000000000 +0200
-+++ cfitsio.new/Makefile.in	2013-07-04 00:03:13.314991071 +0200
-@@ -61,8 +61,6 @@
- 		putcolu.c putcolui.c putcoluj.c putkey.c region.c scalnull.c \
+diff -ur cfitsio/Makefile.in cfitsio.no-zlib/Makefile.in
+--- cfitsio/Makefile.in	2013-12-05 23:20:57.000000000 +0100
++++ cfitsio.no-zlib/Makefile.in	2013-12-09 11:05:55.332013282 +0100
+@@ -62,9 +62,7 @@
  		swapproc.c wcssub.c wcsutil.c imcompress.c quantize.c ricecomp.c \
- 		pliocomp.c fits_hcompress.c fits_hdecompress.c zuncompress.c zcompress.c \
--		adler32.c crc32.c inffast.c inftrees.c trees.c zutil.c \
--		deflate.c infback.c inflate.c uncompr.c \
+ 		pliocomp.c fits_hcompress.c fits_hdecompress.c
  
- SOURCES = ${CORE_SOURCES} @F77_WRAPPERS@
+-ZLIB_SOURCES =	zlib/adler32.c zlib/crc32.c zlib/deflate.c zlib/infback.c \
+-		zlib/inffast.c zlib/inflate.c zlib/inftrees.c zlib/trees.c \
+-		zlib/uncompr.c zlib/zcompress.c zlib/zuncompress.c zlib/zutil.c
++ZLIB_SOURCES =	zlib/zcompress.c zlib/zuncompress.c
  
-@@ -95,7 +93,7 @@
+ SOURCES = ${CORE_SOURCES} ${ZLIB_SOURCES} @F77_WRAPPERS@
+ 
+@@ -97,7 +95,7 @@
  shared: libcfitsio${SHLIB_SUFFIX}
  
  libcfitsio${SHLIB_SUFFIX}: ${OBJECTS}
@@ -19,7 +21,7 @@ diff -ur cfitsio/Makefile.in cfitsio.new/Makefile.in
  		@if [ "x${CFITSIO_SHLIB_SONAME}" != x ]; then \
  			ln -sf ${CFITSIO_SHLIB} ${CFITSIO_SHLIB_SONAME}; \
  			ln -sf ${CFITSIO_SHLIB_SONAME} $@; \
-@@ -116,13 +114,13 @@
+@@ -118,13 +116,13 @@
  		${CC} $(CFLAGS) $(DEFS) -o smem smem.o -L. -lcfitsio -lm
  
  testprog:	testprog.o libcfitsio.a ${OBJECTS}
diff --git a/cfitsio.spec b/cfitsio.spec
index a8cb6ac..93c4b2d 100644
--- a/cfitsio.spec
+++ b/cfitsio.spec
@@ -1,11 +1,11 @@
 Name: cfitsio
-Version: 3.350
-Release: 2%{?dist}
+Version: 3.360
+Release: 1%{?dist}
 Summary: Library for manipulating FITS data files
 Group: Development/Libraries
 License: MIT
 URL: http://heasarc.gsfc.nasa.gov/fitsio/
-Source0: ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3350.tar.gz
+Source0: ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3360.tar.gz
 # Unbundles zlib
 Patch0: cfitsio-zlib.patch
 # Remove soname version check
@@ -81,18 +81,18 @@ compression algorithm.
 %patch2 -p1
 
 # remove bundled zlib
+# not all the files inside zlib belong to zlib
+pushd zlib
 rm adler32.c crc32.c deflate.c infback.c inffast.c inflate.c inflate.h \
  inftrees.c inftrees.h zlib.h deflate.h trees.c trees.h uncompr.c zconf.h \
- zutil.c zutil.h
+ zutil.c zutil.h crc32.h  inffast.h  inffixed.h 
+popd
 
 %build
-export FC=f95
-export CC=gcc # fixes -O*, -g
 %configure --enable-reentrant
 make shared %{?_smp_mflags} 
 make fpack %{?_smp_mflags}
 make funpack %{?_smp_mflags}
-unset FC
 
 %check
 make testprog
@@ -108,18 +108,18 @@ make LIBDIR=%{_libdir} INCLUDEDIR=%{_includedir}/%{name} \
  CFITSIO_LIB=%{buildroot}%{_libdir} \
  CFITSIO_INCLUDE=%{buildroot}%{_includedir}/%{name} \
 install
-# make is not installing properly the shared libs
-cp -d libcfitsio.so.* %{buildroot}%{_libdir}
-chmod 755 %{buildroot}%{_libdir}/libcfitsio.so.*
 cp -p f{,un}pack %{buildroot}%{_bindir}
+
+chmod 755 %{buildroot}%{_libdir}/libcfitsio.so.*
 chmod 755 %{buildroot}%{_bindir}/f{,un}pack
 
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%doc README License.txt changes.txt
+%doc README License.txt docs/changes.txt
 %{_libdir}/libcfitsio.so.*
 
 %files devel
@@ -132,14 +132,17 @@ chmod 755 %{buildroot}%{_bindir}/f{,un}pack
 %{_libdir}/libcfitsio.a
 
 %files docs
-%doc fitsio.doc fitsio.ps cfitsio.doc cfitsio.ps License.txt
+%doc docs/fitsio.doc docs/fitsio.pdf docs/cfitsio.doc docs/cfitsio.pdf License.txt
 
 %files -n fpack
-%doc fpackguide.pdf License.txt
+%doc docs/fpackguide.pdf License.txt
 %{_bindir}/fpack
 %{_bindir}/funpack
 
 %changelog
+* Mon Dec 09 2013 Sergio Pascual <sergiopr at fedoraproject.org> - 3.360-1
+- New upstream (3.360)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.350-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 78de60a..d0f3504 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0bc79cd8eeabbcd26828f64269e39e63  cfitsio3350.tar.gz
+f98d8782b78594210def81234dfe79df  cfitsio3360.tar.gz