[pyfits] New upstream source

[Sergio Pascual]

commit 8b4ae001db137b78b1fa2631e51bf9e59cdb8f0e
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Thu Jun 21 23:02:55 2012 +0200

    New upstream source
    
    - A better patch to unbundle zlib from Kacper Kowalik (Gentoo)

 .gitignore              |    1 +
 pyfits-compat-setup.py  |    2 +-
 pyfits-unbundle-z.patch |   48 +++++++++++++++++++++++++++++++++++++++++++++++
 pyfits.spec             |   10 +++++++-
 sources                 |    2 +-
 5 files changed, 59 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b505e82..bb0b88e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ pyfits-2.3.1.tar.gz
 /pyfits-3.0.1.tar.gz
 /pyfits-3.0.5.tar.gz
 /pyfits-3.0.7.tar.gz
+/pyfits-3.0.8.tar.gz
diff --git a/pyfits-compat-setup.py b/pyfits-compat-setup.py
index 7be0745..4a1e5df 100644
--- a/pyfits-compat-setup.py
+++ b/pyfits-compat-setup.py
@@ -20,7 +20,7 @@ comp = Extension('pyfits.compression', [
 	include_dirs=[numpy_include])
 
 setup(name='pyfits',
-	version='3.0.7',
+	version='3.0.8',
 	author= 'J. C. Hsu, Paul Barrett, Christopher Hanley, James Taylor, Michael Droettboom, Erik Bray',
 	author_email='help at stsci.edu',
 	description='Reads FITS images and tables into numpy or numarray objects and manipulates FITS headers',
diff --git a/pyfits-unbundle-z.patch b/pyfits-unbundle-z.patch
new file mode 100644
index 0000000..eede4d2
--- /dev/null
+++ b/pyfits-unbundle-z.patch
@@ -0,0 +1,48 @@
+diff -ur pyfits-3.0.8/src/compress.c pyfits-3.0.8.z/src/compress.c
+--- pyfits-3.0.8/src/compress.c	2012-06-04 23:43:49.000000000 +0200
++++ pyfits-3.0.8.z/src/compress.c	2012-06-21 22:55:51.602963003 +0200
+@@ -106,7 +106,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include "zlib.h"  
++#include <zlib.h>  
+ 
+ int _pyfits_uncompress2mem_from_mem(
+              char *inmemptr,     
+@@ -182,7 +182,7 @@
+         d_stream.next_out = uncompr;
+         d_stream.avail_out = uncomprLen;
+ 
+-        err = _pyfits_inflate(&d_stream, Z_NO_FLUSH);
++        err = inflate(&d_stream, Z_NO_FLUSH);
+ 
+         if (err != Z_OK && err != Z_STREAM_END)
+         {
+@@ -217,7 +217,7 @@
+     *filesize = d_stream.total_out;
+ 
+     /* End the decompression */
+-    err = _pyfits_inflateEnd(&d_stream);
++    err = inflateEnd(&d_stream);
+ 
+     /* free temporary output data buffer */
+     free(uncompr);
+@@ -285,7 +285,7 @@
+         c_stream.next_out = compr;
+         c_stream.avail_out = comprLen;
+ 
+-        err = _pyfits_deflate(&c_stream, Z_FINISH);
++        err = deflate(&c_stream, Z_FINISH);
+ 
+         if (err != Z_OK && err != Z_STREAM_END)
+         {
+@@ -320,7 +320,7 @@
+     *filesize = c_stream.total_out;
+ 
+     /* End the compression */
+-    err = _pyfits_deflateEnd(&c_stream);
++    err = deflateEnd(&c_stream);
+ 
+     /* free temporary output data buffer */
+     free(compr);
diff --git a/pyfits.spec b/pyfits.spec
index c822318..fa568fd 100644
--- a/pyfits.spec
+++ b/pyfits.spec
@@ -5,8 +5,8 @@
 %endif
 
 Name: pyfits
-Version: 3.0.7
-Release: 3%{?dist}
+Version: 3.0.8
+Release: 1%{?dist}
 Summary: Python interface to FITS
 
 Group: Development/Languages
@@ -15,6 +15,7 @@ License: BSD
 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
+Patch0: pyfits-unbundle-z.patch
 
 BuildRequires: python2-devel python-setuptools numpy zlib-devel
 Requires: numpy
@@ -52,6 +53,7 @@ writing analysis scripts in Python using FITS files as either input or output.
 
 %prep
 %setup -q
+%patch0 -p1
 sed -i -e "1d" lib/pyfits/core.py
 rm -f setup.py setup.cfg
 # remove bundled zlib
@@ -107,6 +109,10 @@ chmod 755 %{buildroot}%{python_sitearch}/pyfits/compression.so
 %endif # with_python3
 
 %changelog
+* Thu Jun 21 2012 Sergio Pascual <sergiopr at fedoraproject.org> - 3.0.8-1
+- New upstream source
+- A better patch to unbundle zlib from Kacper Kowalik (Gentoo)
+
 * Wed Apr 25 2012 Sergio Pascual <sergiopr at fedoraproject.org> - 3.0.7-3
 - Added a filter to provides in python3-pyfits
 
diff --git a/sources b/sources
index fca8895..49f582f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6aaa1b02ac349120cb5fd03cf569dffd  pyfits-3.0.7.tar.gz
+5789db891689642a8b01d9a72cee08b2  pyfits-3.0.8.tar.gz