[python-asciitable/f14] Removed python3 support (no python3-numpy in f14)

Sergio Pascual sergiopr at fedoraproject.org
Fri Jul 15 14:47:25 UTC 2011


commit 30f6a5c572bedb6797182b8e794ab8862c005add
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Fri Jul 15 16:47:05 2011 +0200

    Removed python3 support (no python3-numpy in f14)

 python-asciitable.spec |   64 ++++-------------------------------------------
 1 files changed, 6 insertions(+), 58 deletions(-)
---
diff --git a/python-asciitable.spec b/python-asciitable.spec
index 0ddd19d..2c23a97 100644
--- a/python-asciitable.spec
+++ b/python-asciitable.spec
@@ -1,30 +1,19 @@
 %global upname asciitable
 
-%if 0%{?fedora} > 12 || 0%{?rhel} > 6
-%global with_python3 1
-%else
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")}
-%endif
-
 Name: python-%{upname}
 Version: 0.7.0.2
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 Summary: Extensible ASCII table reader and writer
 License: BSD
 
 Group: Development/Libraries
 URL: http://cxc.harvard.edu/contrib/asciitable/
 Source0: http://pypi.python.org/packages/source/a/%{upname}/%{upname}-%{version}.tar.gz
-BuildRequires: python2-devel python-nose
+BuildRequires: python-devel python-nose
 BuildArch: noarch
 
 Requires: numpy
 
-%if 0%{?with_python3}
-BuildRequires: python3-devel
-Requires: python3-numpy
-%endif # with_python3
-
 %description
 An extensible ASCII table reader.  Asciitable can read a wide range of ASCII 
 table formats via built-in Extension Reader Classes:
@@ -40,71 +29,30 @@ table formats via built-in Extension Reader Classes:
   definition line
   * Tab: tab-separated values
 
-%if 0%{?with_python3}
-%package -n python3-asciitable
-Summary: Extensible ASCII table reader and writer
-
-%description -n python3-asciitable
-An extensible ASCII table reader.  Asciitable can read a wide range of ASCII 
-table formats via built-in Extension Reader Classes:
-  * Basic: basic table with customizable delimiters and header configurations
-  * Cds: CDS format table (also Vizier and ApJ machine readable tables)
-  * CommentedHeader: column names given in a line that begins with 
-  the comment character
-  * Daophot: table from the IRAF DAOphot package
-  * Ipac: IPAC format table
-  * Latex: LaTeX tables (plain and AASTex)
-  * NoHeader: basic table with no header where columns are auto-named
-  * Rdb: tab-separated values with an extra line after the column 
-  definition line
-  * Tab: tab-separated values
-%endif # with_python3
-
 %prep
 %setup -n %{upname}-%{version} -q
 
-%if 0%{?with_python3}
-rm -rf %{py3dir}
-cp -a . %{py3dir}
-find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'
-%endif # with_python3
-
 find -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python}|'
 
 %build
 %{__python} setup.py build
 
-%if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py build
-popd
-%endif # with_python3
-
 %check
 nosetests --with-doctest
 
 %install
 rm -rf %{buildroot}
-%if 0%{?with_python3}
-pushd %{py3dir}
-%{__python3} setup.py install --skip-build --root  %{buildroot}
-popd
-%endif # with_python3
-
 %{__python} setup.py install --skip-build --root  %{buildroot}
  
 %files
 %doc CHANGES doc/index.rst
 %{python_sitelib}/*
 
-%if 0%{?with_python3}
-%files -n python3-asciitable
-%doc CHANGES doc/index.rst
-%{python3_sitelib}/*
-%endif # with_python3
-
 %changelog
-* Tue Jul 5 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 0.7.0.1-1
+* Fri Jul 15 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 0.7.0.2-1.1
+- Removed python3 support (no python3-numpy in f14)
+
+* Tue Jul 5 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 0.7.0.2-1
 - New upstream version with Latex, AASTex support
 
 * Mon Jun 6 2011 Sergio Pascual <sergiopr at fedoraproject.org> - 0.6.0-2


More information about the scm-commits mailing list