[pyfits] New upstream 3.2
Sergio Pascual
sergiopr at fedoraproject.org
Wed Dec 4 10:05:34 UTC 2013
commit 8bf2b9ee94a4dcbb49e24f30e1d219b242eaa99a
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date: Wed Dec 4 11:05:21 2013 +0100
New upstream 3.2
.gitignore | 1 +
pyfits-compat-setup.py | 43 -------------
pyfits-unbundle-cfitsio.patch | 131 +++++++++++++++++++++++++++++++++++++++++
pyfits-unbundle-z.patch | 48 ---------------
pyfits.spec | 62 ++++++-------------
sources | 2 +-
6 files changed, 153 insertions(+), 134 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b1518b3..dcbcff9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ pyfits-2.3.1.tar.gz
/pyfits-3.1.tar.gz
/pyfits-3.1.1.tar.gz
/pyfits-3.1.2.tar.gz
+/pyfits-3.2.tar.gz
diff --git a/pyfits-unbundle-cfitsio.patch b/pyfits-unbundle-cfitsio.patch
new file mode 100644
index 0000000..2f7169a
--- /dev/null
+++ b/pyfits-unbundle-cfitsio.patch
@@ -0,0 +1,131 @@
+diff -ur pyfits-3.2/setup.cfg pyfits-3.2.new/setup.cfg
+--- pyfits-3.2/setup.cfg 2013-11-26 19:54:15.000000000 +0100
++++ pyfits-3.2.new/setup.cfg 2013-12-04 10:42:59.020173770 +0100
+@@ -36,91 +36,13 @@
+
+ [extension=pyfits.compression]
+ sources =
+- cextern/cfitsio/adler32.c
+- cextern/cfitsio/buffers.c
+- cextern/cfitsio/cfileio.c
+- cextern/cfitsio/checksum.c
+- cextern/cfitsio/crc32.c
+- cextern/cfitsio/deflate.c
+- cextern/cfitsio/drvrfile.c
+- cextern/cfitsio/drvrgsiftp.c
+- cextern/cfitsio/drvrmem.c
+- cextern/cfitsio/drvrnet.c
+- cextern/cfitsio/drvrsmem.c
+- cextern/cfitsio/editcol.c
+- cextern/cfitsio/edithdu.c
+- cextern/cfitsio/eval_f.c
+- cextern/cfitsio/eval_l.c
+- cextern/cfitsio/eval_y.c
+- cextern/cfitsio/fitscore.c
+- cextern/cfitsio/fits_hcompress.c
+- cextern/cfitsio/fits_hdecompress.c
+- cextern/cfitsio/getcolb.c
+- cextern/cfitsio/getcol.c
+- cextern/cfitsio/getcold.c
+- cextern/cfitsio/getcole.c
+- cextern/cfitsio/getcoli.c
+- cextern/cfitsio/getcolj.c
+- cextern/cfitsio/getcolk.c
+- cextern/cfitsio/getcoll.c
+- cextern/cfitsio/getcolsb.c
+- cextern/cfitsio/getcols.c
+- cextern/cfitsio/getcolui.c
+- cextern/cfitsio/getcoluj.c
+- cextern/cfitsio/getcoluk.c
+- cextern/cfitsio/getkey.c
+- cextern/cfitsio/group.c
+- cextern/cfitsio/grparser.c
+- cextern/cfitsio/histo.c
+- cextern/cfitsio/imcompress.c
+- cextern/cfitsio/infback.c
+- cextern/cfitsio/inffast.c
+- cextern/cfitsio/inflate.c
+- cextern/cfitsio/inftrees.c
+- cextern/cfitsio/iraffits.c
+- cextern/cfitsio/modkey.c
+- cextern/cfitsio/pliocomp.c
+- cextern/cfitsio/putcolb.c
+- cextern/cfitsio/putcol.c
+- cextern/cfitsio/putcold.c
+- cextern/cfitsio/putcole.c
+- cextern/cfitsio/putcoli.c
+- cextern/cfitsio/putcolj.c
+- cextern/cfitsio/putcolk.c
+- cextern/cfitsio/putcoll.c
+- cextern/cfitsio/putcolsb.c
+- cextern/cfitsio/putcols.c
+- cextern/cfitsio/putcolu.c
+- cextern/cfitsio/putcolui.c
+- cextern/cfitsio/putcoluj.c
+- cextern/cfitsio/putcoluk.c
+- cextern/cfitsio/putkey.c
+- cextern/cfitsio/quantize.c
+- cextern/cfitsio/region.c
+- cextern/cfitsio/ricecomp.c
+- cextern/cfitsio/scalnull.c
+- cextern/cfitsio/swapproc.c
+- cextern/cfitsio/trees.c
+- cextern/cfitsio/uncompr.c
+- cextern/cfitsio/wcssub.c
+- cextern/cfitsio/wcsutil.c
+- cextern/cfitsio/zcompress.c
+- cextern/cfitsio/zuncompress.c
+- cextern/cfitsio/zutil.c
+ src/compressionmodule.c
+ include_dirs =
+ numpy
+- cextern/cfitsio
+-extra_compile_args =
+- -Wno-unused-variable
+- -Wno-parentheses
+- -Wno-uninitialized
+- -Wno-format
+- -Wno-strict-prototypes
+- -Wno-unused
+- -Wno-comments
+- -Wno-switch
+-optional = True
++ /usr/include/cfitsio
++libraries =
++ cfitsio
++optional = False
+ fail_message =
+ !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ Failed to build PyFITS tile compression support. PyFITS will still
+@@ -128,18 +50,13 @@
+ Please seek support from help at stsci.edu if you need this capability.
+ !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+-[global]
+-setup-hooks =
+- stsci.distutils.hooks.version_setup_hook
+-commands = stsci.distutils.command.build_optional_ext.build_optional_ext
+-
+ [entry_points]
+ console_scripts =
+ fitsdiff = pyfits.scripts.fitsdiff:main
+ fitscheck = pyfits.scripts.fitscheck:main
+
+ [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/setup.py pyfits-3.2.new/setup.py
+--- pyfits-3.2/setup.py 2013-12-04 10:45:04.387902539 +0100
++++ pyfits-3.2.new/setup.py 2013-12-04 10:34:42.151342566 +0100
+@@ -9,7 +9,7 @@
+
+
+ setup(
+- 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 6b6a9f4..c290ac3 100644
--- a/pyfits.spec
+++ b/pyfits.spec
@@ -4,9 +4,11 @@
%{!?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.1.2
-Release: 2%{?dist}
+Version: 3.2
+Release: 1%{?dist}
Summary: Python interface to FITS
Group: Development/Languages
@@ -14,19 +16,11 @@ 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
+Patch0: pyfits-unbundle-cfitsio.patch
-BuildRequires: python2-devel python-setuptools numpy zlib-devel
+BuildRequires: python2-devel python-setuptools python-d2to1 numpy cfitsio-devel
Requires: numpy
-
-# we don't want to provide private python extension libs
-%{?filter_setup:
-%filter_provides_in %{python_sitearch}/.*\.so$
-%filter_setup
-}
-
%description
PyFITS provides an interface to FITS formatted files under the Python
scripting language. It is useful both for interactive data analysis and for
@@ -35,16 +29,11 @@ writing analysis scripts in Python using FITS files as either input or output.
%if 0%{?with_python3}
%package -n python3-pyfits
Summary: Python interface to FITS
-BuildRequires: python3-devel python3-numpy python3-setuptools python3-tools
-BuildRequires: zlib-devel
+BuildRequires: python3-tools
+BuildRequires: python3-devel python3-setuptools python3-d2to1 python3-numpy
+BuildRequires: cfitsio-devel
Requires: python3-numpy
-# we don't want to provide private python extension libs
-%{?filter_setup:
-%filter_provides_in %{python3_sitearch}/.*\.so$
-%filter_setup
-}
-
%description -n python3-pyfits
PyFITS provides an interface to FITS formatted files under the Python
scripting language. It is useful both for interactive data analysis and for
@@ -55,27 +44,16 @@ writing analysis scripts in Python using FITS files as either input or output.
%setup -q
%patch0 -p1
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
+# remove bundled cfitsio
+rm -rf cextern/cfitsio
+find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python}|'
%if 0%{?with_python3}
rm -rf %{py3dir}
cp -a . %{py3dir}
find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'
-python3-2to3 --no-diffs --write --nobackup %{py3dir}
-sed s/fitscheck/fitscheck-3/ -i %{py3dir}/setup.py
-sed s/fitsdiff/fitsdiff-3/ -i %{py3dir}/setup.py
-mv %{py3dir}/scripts/fitscheck %{py3dir}/scripts/fitscheck-3
-mv %{py3dir}/scripts/fitsdiff %{py3dir}/scripts/fitsdiff-3
%endif # with_python3
-find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python}|'
-
%build
CFLAGS="%{optflags}" %{__python} setup.py build
@@ -90,12 +68,12 @@ rm -rf %{buildroot}
%if 0%{?with_python3}
pushd %{py3dir}
%{__python3} setup.py install --skip-build --root %{buildroot}
-chmod 755 %{buildroot}%{python3_sitearch}/pyfits/compression*.so
+#chmod 755 %{buildroot}%{python3_sitearch}/pyfits/compression*.so
popd
%endif # with_python3
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
-chmod 755 %{buildroot}%{python_sitearch}/pyfits/compression.so
+#chmod 755 %{buildroot}%{python_sitearch}/pyfits/compression.so
%files
%doc FAQ.txt README.txt LICENSE.txt CHANGES.txt
@@ -106,13 +84,13 @@ chmod 755 %{buildroot}%{python_sitearch}/pyfits/compression.so
%if 0%{?with_python3}
%files -n python3-pyfits
%doc FAQ.txt README.txt LICENSE.txt CHANGES.txt
-# Provides the same functionality than the 2.x version
-%exclude %{_bindir}/fitscheck-3
-%exclude %{_bindir}/fitsdiff-3
%{python3_sitearch}/*
%endif # with_python3
%changelog
+* Wed Dec 04 2013 Sergio Pascual <sergiopr at fedoraproject.org> - 3.2-1
+- New upstream 3.2
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
@@ -123,7 +101,7 @@ chmod 755 %{buildroot}%{python_sitearch}/pyfits/compression.so
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-* Fri Jan 02 2013 Sergio Pascual <sergiopr at fedoraproject.org> - 3.1.1-1
+* Wed Jan 02 2013 Sergio Pascual <sergiopr at fedoraproject.org> - 3.1.1-1
- New upstream 3.1.1 (bugfixes)
- Added FAQ.txt and README.txt to doc
@@ -184,10 +162,10 @@ chmod 755 %{buildroot}%{python_sitearch}/pyfits/compression.so
* Fri May 21 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 2.3-1
- New upstream source
-* Tue Jan 20 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 2.2.2-3
+* Wed Jan 20 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 2.2.2-3
- Added missing quotes in CFLAGS
-* Tue Jan 20 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 2.2.2-2
+* Wed Jan 20 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 2.2.2-2
- Added CFLAGS to the build line
* Tue Nov 17 2009 Sergio Pascual <sergiopr at fedoraproject.org> - 2.2.2-1
diff --git a/sources b/sources
index f80828a..3ad9fb3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc849bf9b8d79235356d3fd1096757c1 pyfits-3.1.2.tar.gz
+23fe76429fcd229f0abbd21535d1c41a pyfits-3.2.tar.gz
More information about the scm-commits
mailing list