[pyfits] Unbundle zlib

[Sergio Pascual]

commit 2e73364b85c833c21c0f3278ef603badaf100718
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Wed Apr 25 01:34:57 2012 +0200

    Unbundle zlib

 pyfits-compat-setup.py |    5 +----
 pyfits.spec            |   17 +++++++++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/pyfits-compat-setup.py b/pyfits-compat-setup.py
index 2d19d9c..7be0745 100644
--- a/pyfits-compat-setup.py
+++ b/pyfits-compat-setup.py
@@ -15,11 +15,8 @@ comp = Extension('pyfits.compression', [
 	'src/compressionmodule.c',
 	'src/quantize.c',
 	'src/ricecomp.c',
-	'src/zlib.c',
-	'src/inffast.c',
-	'src/inftrees.c',
-	'src/trees.c'
 	],
+        libraries=['z'],
 	include_dirs=[numpy_include])
 
 setup(name='pyfits',
diff --git a/pyfits.spec b/pyfits.spec
index 95572f5..25393e0 100644
--- a/pyfits.spec
+++ b/pyfits.spec
@@ -6,7 +6,7 @@
 
 Name: pyfits
 Version: 3.0.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Python interface to FITS
 
 Group: Development/Languages
@@ -16,7 +16,7 @@ URL: http://www.stsci.edu/resources/software_hardware/pyfits
 Source0: http://pypi.python.org/packages/source/p/pyfits/%{name}-%{version}.tar.gz
 Source1: pyfits-compat-setup.py
 
-BuildRequires: python2-devel python-setuptools numpy
+BuildRequires: python2-devel python-setuptools numpy zlib-devel
 Requires: numpy
 
 
@@ -35,6 +35,7 @@ writing analysis scripts in Python using FITS files as either input or output.
 %package -n python3-pyfits
 Summary: Python interface to FITS
 BuildRequires: python3-devel python3-numpy python3-setuptools python3-tools
+BuildRequires: zlib-devel
 Requires: python3-numpy
 
 %description -n python3-pyfits
@@ -47,6 +48,11 @@ writing analysis scripts in Python using FITS files as either input or output.
 %setup -q
 sed -i -e "1d" lib/pyfits/core.py
 rm -f setup.py setup.cfg
+# remove bundled zlib
+pushd src
+rm crc32.h deflate.h inffast.c inffast.h inffixed.h inflate.h inftrees.c \
+inftrees.h trees.c trees.h zlib.c zlib.h zutil.h
+popd
 cp %SOURCE1 setup.py
 
 %if 0%{?with_python3}
@@ -95,10 +101,13 @@ chmod 755 %{buildroot}%{python_sitearch}/pyfits/compression.so
 %endif # with_python3
 
 %changelog
-* Tue Jan 31 2012 Sergio Pascual <sergiopr at fedoraproject.org> - 3.0.7-1
+* Wed Apr 25 2012 Sergio Pascual <sergiopr at fedoraproject.org> - 3.0.7-2
+- Unbundle zlib
+
+* Tue Apr 24 2012 Sergio Pascual <sergiopr at fedoraproject.org> - 3.0.7-1
 - New upstream version
 
-* Tue Jan 31 2012 Sergio Pascual <sergiopr at fedoraproject.org> - 3.0.5-2
+* Tue Apr 24 2012 Sergio Pascual <sergiopr at fedoraproject.org> - 3.0.5-2
 - Fixed bz #815376
 - Moved python3 requires to package description