From 3f009a9990d6cd3fd2f28344805f0a2246795237 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Oct 05 2018 10:39:03 +0000 Subject: Update spec file Drop python2 subpackage --- diff --git a/ATpy.spec b/ATpy.spec index 35873c2..b9e568f 100644 --- a/ATpy.spec +++ b/ATpy.spec @@ -1,8 +1,6 @@ -%global with_python3 1 - Name: ATpy Version: 0.9.7 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Astronomical Tables in Python License: MIT @@ -11,13 +9,8 @@ URL: http://atpy.readthedocs.org Source0: https://pypi.python.org/packages/source/A/ATpy/%{name}-%{version}.tar.gz BuildArch: noarch -BuildRequires: python2-devel -BuildRequires: python2-setuptools - -%if 0%{?with_python3} BuildRequires: python3-devel BuildRequires: python3-setuptools -%endif # with_python3 %global _description\ ATpy is a high-level Python package providing a way to manipulate tables of\ @@ -27,17 +20,6 @@ and ASCII tables) with a very simple API. %description %_description -%package -n python2-atpy -Summary: %summary -Requires: python2-numpy python2-astropy -%{?python_provide:%python_provide python2-atpy} -# Remove before F30 -Provides: ATpy%{?_isa} = %{version}-%{release} -Obsoletes: ATpy < %{version}-%{release} - -%description -n python2-atpy %_description - -%if 0%{?with_python3} %package -n python3-ATpy Summary: Astronomical Tables in Python Requires: python3-numpy python3-astropy @@ -48,51 +30,26 @@ astronomical data in a uniform way. It provides built-in support for NumPy recarrays and common astronomical file/database formats (FITS, VO, HDF5, and ASCII tables) with a very simple API. -%endif # with_python3 - %prep %setup -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|#!%{__python2}|' - %build -%{__python2} setup.py build - -%if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py build -popd -%endif # with_python3 +%py3_build %install +%py3_install -%if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py install --skip-build --root %{buildroot} -popd -%endif # with_python3 - -%{__python2} setup.py install --skip-build --root %{buildroot} - -%files -n python2-atpy -%doc CHANGES LICENSE README.md -%{python2_sitelib}/ATpy-*.egg-info -%{python2_sitelib}/atpy - -%if 0%{?with_python3} %files -n python3-ATpy -%doc CHANGES LICENSE README.md +%doc CHANGES README.md +%license LICENSE %{python3_sitelib}/ATpy-*.egg-info %{python3_sitelib}/atpy -%endif # with_python3 %changelog +* Fri Oct 05 2018 Sergio Pascual - 0.9.7-18 +- Update spec file +- Drop python2 subpackage + * Thu Jul 12 2018 Fedora Release Engineering - 0.9.7-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild