[cfitsio] Using system libz

[Sergio Pascual]

commit b6031f49af43e55c58b0984ed72bc19fe866f58b
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Fri Jan 6 01:04:05 2012 +0100

    Using system libz

 cfitsio.spec |   38 ++++++++++++++++++++++----------------
 1 files changed, 22 insertions(+), 16 deletions(-)
---
diff --git a/cfitsio.spec b/cfitsio.spec
index 4f01db8..78dafb6 100644
--- a/cfitsio.spec
+++ b/cfitsio.spec
@@ -1,17 +1,17 @@
-Name:           cfitsio
-Version:        3.290
-Release:        1%{?dist}
-Summary:        Library for manipulating FITS data files
-
-Group:          Development/Libraries
-License:        MIT
-URL:            http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html
-Source0:        ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3290.tar.gz
-Patch0:         cfitsio.patch
-Patch1:         makefile.patch
-Patch2:         cfitsio-s390.patch
-
-BuildRequires:     gcc-gfortran
+Name: cfitsio
+Version: 3.290
+Release: 2%{?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/cfitsio3290.tar.gz
+Patch0: cfitsio.patch
+Patch1: makefile.patch
+Patch2: cfitsio-s390.patch
+Patch3: cfitsio-zlib.patch
+
+BuildRequires:     gcc-gfortran zlib-devel
 Requires(post):    /sbin/ldconfig
 Requires(postun):  /sbin/ldconfig
 
@@ -50,7 +50,7 @@ BuildArch:  noarch
 Stand-alone documentation for cfitsio.
 
 %package -n fpack
-Summary: FPACK FITS image compression and decompression utilites
+Summary: FITS image compression and decompression utilities
 Group: Applications/Engineering
 Requires: %{name} = %{version}-%{release}
 
@@ -77,14 +77,17 @@ compression algorithm.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 # Fixing cfitsio.pc.in
 sed -e 's|3.29|3.290|' -i cfitsio.pc.in 
 sed -e 's|Libs: -L${libdir} -lcfitsio @LIBS@|Libs: -L${libdir} -lcfitsio|' -i cfitsio.pc.in
-sed -e 's|Libs.private: -lm|Libs.private: @LIBS@ -lm|' -i cfitsio.pc.in 
+sed -e 's|Libs.private: -lm|Libs.private: @LIBS@ -lz -lm|' -i cfitsio.pc.in 
 sed -e 's|Cflags: -I${includedir}|Cflags: -D_REENTRANT -I${includedir}|' -i cfitsio.pc.in
 # Manually fix pkgconfig .pc.in file (BZ 436539, BZ 618291)
 sed -e 's|includedir=@includedir@|includedir=@includedir@/cfitsio|' -i cfitsio.pc.in
 
+rm zlib.h zconf.h
+
 %build
 FC=f95
 export FC
@@ -141,6 +144,9 @@ cp -p f{,un}pack %{buildroot}%{_bindir}/
 %{_bindir}/funpack
 
 %changelog
+* Fri Jan 06 2012 Sergio Pascual <sergiopr at fedoraproject.org> - 3.290-2
+- Using system libz
+
 * Mon Dec 05 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 3.290-1
 - New upstream version
 - Reorganizing patches