[pyfits: 1/2] New upstream source (3.3)

[Sergio Pascual]

commit 17ceb81403d8c69619e7cce316bbc98e65deb5cf
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Tue Jul 29 15:29:38 2014 +0200

    New upstream source (3.3)

 pyfits-python3-script.patch   |   12 ++++++++++++
 pyfits-unbundle-cfitsio.patch |   26 +++++++++++++-------------
 pyfits.spec                   |   14 +++++---------
 3 files changed, 30 insertions(+), 22 deletions(-)
---
diff --git a/pyfits-python3-script.patch b/pyfits-python3-script.patch
new file mode 100644
index 0000000..345c04c
--- /dev/null
+++ b/pyfits-python3-script.patch
@@ -0,0 +1,12 @@
+diff -ur pyfits-3.3/lib/pyfits/scripts/fitscheck.py pyfits-3.3.scripts/lib/pyfits/scripts/fitscheck.py
+--- pyfits-3.3/lib/pyfits/scripts/fitscheck.py	2014-07-29 14:04:03.934177170 +0200
++++ pyfits-3.3.scripts/lib/pyfits/scripts/fitscheck.py	2014-07-29 14:04:52.314588599 +0200
+@@ -132,7 +132,7 @@
+     errors = 0
+     try:
+         hdulist = pyfits.open(filename, checksum=OPTIONS.checksum_kind)
+-    except UserWarning, w:
++    except UserWarning as w:
+         remainder = '.. ' + ' '.join(str(w).split(' ')[1:]).strip()
+         # if "Checksum" in str(w) or "Datasum" in str(w):
+         log.warn('BAD %r %s' % (filename, remainder))
diff --git a/pyfits-unbundle-cfitsio.patch b/pyfits-unbundle-cfitsio.patch
index cafb11f..8b2482c 100644
--- a/pyfits-unbundle-cfitsio.patch
+++ b/pyfits-unbundle-cfitsio.patch
@@ -1,7 +1,7 @@
-diff -ur pyfits-3.2.2/setup.cfg pyfits-3.2.2.p/setup.cfg
---- pyfits-3.2.2/setup.cfg	2014-03-25 20:49:27.000000000 +0100
-+++ pyfits-3.2.2.p/setup.cfg	2014-03-27 12:30:11.927688316 +0100
-@@ -36,92 +36,13 @@
+diff -ur pyfits-3.3/setup.cfg pyfits-3.3.cfitsio/setup.cfg
+--- pyfits-3.3/setup.cfg	2014-07-17 20:36:07.000000000 +0200
++++ pyfits-3.3.cfitsio/setup.cfg	2014-07-29 13:58:52.804531315 +0200
+@@ -37,92 +37,13 @@
  
  [extension=pyfits.compression]
  sources = 
@@ -91,14 +91,14 @@ diff -ur pyfits-3.2.2/setup.cfg pyfits-3.2.2.p/setup.cfg
 -	-Wno-comments
 -	-Wno-switch
 -optional = True
-+        /usr/include/cfitsio
++	/usr/include/cfitsio
 +libraries =
 +        cfitsio
 +optional = False
  fail_message = 
  	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  	Failed to build PyFITS tile compression support.  PyFITS will still
-@@ -129,18 +50,13 @@
+@@ -130,19 +51,11 @@
  	Please seek support from help at stsci.edu if you need this capability.
  	!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  
@@ -112,15 +112,15 @@ diff -ur pyfits-3.2.2/setup.cfg pyfits-3.2.2.p/setup.cfg
  	fitsdiff = pyfits.scripts.fitsdiff:main
  	fitscheck = pyfits.scripts.fitscheck:main
  
- [build_ext]
+-[build_ext]
 -pre-hook.numpy-extension-hook = stsci.distutils.hooks.numpy_extension_hook
-+#pre-hook.numpy-extension-hook = stsci.distutils.hooks.numpy_extension_hook
- 
+-
  [upload_docs]
  upload-dir = docs/build/html
-diff -ur pyfits-3.2.2/setup.py pyfits-3.2.2.p/setup.py
---- pyfits-3.2.2/setup.py	2014-03-27 12:27:12.367288141 +0100
-+++ pyfits-3.2.2.p/setup.py	2014-03-27 12:30:32.842851186 +0100
+ 
+diff -ur pyfits-3.3/setup.py pyfits-3.3.cfitsio/setup.py
+--- pyfits-3.3/setup.py	2014-06-09 22:07:11.000000000 +0200
++++ pyfits-3.3.cfitsio/setup.py	2014-07-29 13:59:48.854007962 +0200
 @@ -9,7 +9,7 @@
  
  
@@ -128,5 +128,5 @@ diff -ur pyfits-3.2.2/setup.py pyfits-3.2.2.p/setup.py
 -    setup_requires=['d2to1>=0.2.5', 'stsci.distutils>=0.3'],
 +    setup_requires=['d2to1>=0.2.5'],
      d2to1=True,
-     use_2to3=True,
      zip_safe=False
+ )
diff --git a/pyfits.spec b/pyfits.spec
index 698f911..df0a323 100644
--- a/pyfits.spec
+++ b/pyfits.spec
@@ -1,13 +1,7 @@
-%if 0%{?fedora} > 12 || 0%{?rhel} > 6
 %global with_python3 1
-%else
-%{!?python_sitearch: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib(1))")}
-%endif
-
-%global __provides_exclude_from ^(%{python_sitearch}|%{python3_sitearch})/.*\\.so$
 
 Name: pyfits
-Version: 3.2.4
+Version: 3.3
 Release: 1%{?dist}
 Summary: Python interface to FITS
 
@@ -17,8 +11,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
 Patch0: pyfits-unbundle-cfitsio.patch
-# https://github.com/astropy/astropy/issues/2171
-Patch1: pyfits-disable-checksum-test.patch
+Patch1: pyfits-python3-script.patch
 
 BuildRequires: python2-devel python-setuptools python-d2to1 numpy
 BuildRequires: cfitsio-devel
@@ -117,6 +110,9 @@ chmod 755 %{buildroot}%{python2_sitearch}/pyfits/compression.so
 %endif # with_python3
 
 %changelog
+* Tue Jul 29 2014 Sergio Pascual <sergiopr at fedoraproject.org> 3.3-1
+- New upstream source (3.3)
+
 * Tue Jun 03 2014 Sergio Pascual <sergiopr at fedoraproject.org> 3.2.4-1
 - New upstream source (3.2.4)