[pyfits] Fixed bz #815376
Sergio Pascual
sergiopr at fedoraproject.org
Tue Apr 24 10:50:28 UTC 2012
commit d9ca86a3bb41f67cbde8504699e0bf2f53fe4f77
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date: Tue Apr 24 12:50:19 2012 +0200
Fixed bz #815376
pyfits.spec | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/pyfits.spec b/pyfits.spec
index e81710c..6a6419e 100644
--- a/pyfits.spec
+++ b/pyfits.spec
@@ -20,7 +20,7 @@ BuildRequires: python2-devel python-setuptools numpy
Requires: numpy
%if 0%{?with_python3}
-BuildRequires: python3-devel python3-numpy python3-setuptools /usr/bin/2to3
+BuildRequires: python3-devel python3-numpy python3-setuptools python3-tools
Requires: python3-numpy
%endif # with_python3
@@ -55,7 +55,9 @@ cp %SOURCE1 setup.py
rm -rf %{py3dir}
cp -a . %{py3dir}
find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'
-2to3 --write --nobackup %{py3dir}
+python3-2to3 --no-diffs --write --nobackup %{py3dir}
+sed s/fitscheck/fitscheck-3/ -i %{py3dir}/setup.py
+mv %{py3dir}/scripts/fitscheck %{py3dir}/scripts/fitscheck-3
%endif # with_python3
find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python}|'
@@ -90,11 +92,14 @@ chmod 755 %{buildroot}%{python_sitearch}/pyfits/compression.so
%files -n python3-pyfits
%doc LICENSE.txt CHANGES.txt
# Provides the same functionality than the 2.x version
-%exclude %{_bindir}/fitscheck
+%exclude %{_bindir}/fitscheck-3
%{python3_sitearch}/*
%endif # with_python3
%changelog
+* Tue Jan 31 2012 Sergio Pascual <sergiopr at fedoraproject.org> - 3.0.5-2
+- Fixed bz #815376
+
* Tue Jan 31 2012 Sergio Pascual <sergiopr at fedoraproject.org> - 3.0.5-1
- New upstream version, mainly bugfixes
More information about the scm-commits
mailing list