diff --git a/python-trollius.spec b/python-trollius.spec index e33ccd3..7d946cf 100644 --- a/python-trollius.spec +++ b/python-trollius.spec @@ -1,11 +1,7 @@ -%if 0%{?fedora} > 12 -%global with_python3 1 -%endif - %global pypiname trollius Name: python-trollius Version: 2.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A port of the Tulip asyncio module to Python 2 License: ASL 2.0 @@ -15,24 +11,8 @@ Source0: https://files.pythonhosted.org/packages/source/t/%{pypiname}/%{p Patch0: %{name}-async.patch BuildArch: noarch -BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-mock -%if 0%{?with_python3} BuildRequires: python3-devel BuildRequires: python3-setuptools -%endif #python3 - -# see https://fedoraproject.org/wiki/Packaging:Python#Macros -%if 0%{?rhel} && 0%{?rhel} <= 6 -%{!?__python2: %global __python2 /usr/bin/python2} -%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} -%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} -%endif - -# required for check -BuildRequires: python2-unittest2 -BuildRequires: python2-futures %global _description\ @@ -48,19 +28,6 @@ Linux, Mac OS X, FreeBSD and OpenIndiana. %description %_description -%package -n python2-trollius -Summary: %summary -Requires: python2-futures -Requires: python2-six -%if 0%{?rhel}==6 -# things required just by python2.6 on RHEL -Requires: python-ordereddict -%endif -%{?python_provide:%python_provide python2-trollius} - -%description -n python2-trollius %_description - -%if 0%{?with_python3} %package -n python3-trollius Summary: A port of the Tulip asyncio module @@ -74,65 +41,34 @@ related primitives. Trollius is a portage of the asyncio project (PEP 3156) on Python 2. Trollius works on Python 2.6-3.5. It has been tested on Windows, Linux, Mac OS X, FreeBSD and OpenIndiana. -%endif #python3 %prep %setup -q -n %{pypiname}-%{version} - -%if 0%{?with_python3} -rm -rf %{py3dir} -cp -a . %{py3dir} -pushd %{py3dir} %patch0 -popd -%endif %build - -%if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py build -popd -%endif - -%{__python2} setup.py build +%py3_build %install -%if 0%{?with_python3} -pushd %{py3dir} -%{__python3} setup.py install -O1 --skip-build --root %{buildroot} -popd -%endif - -%{__python2} setup.py install -O1 --skip-build --root %{buildroot} +%py3_install %check - # these are currently causing koji builds to hang -#python runtests.py -v1 -x test_subprocess_kill -#%if 0%{?with_python3} -#pushd %{py3dir} #%{__python3} runtests.py -v1 -x test_subprocess_kill -#popd -#%endif -%files -n python2-trollius -%defattr(-,root,root,-) -%doc README.rst -%{python2_sitelib}/trollius -%{python2_sitelib}/%{pypiname}-%{version}-py2.?.egg-info - -%if 0%{?with_python3} %files -n python3-trollius %defattr(-,root,root,-) %doc README.rst %dir %{python3_sitelib}/trollius %{python3_sitelib}/trollius/*.py %{python3_sitelib}/trollius/__pycache__ -%{python3_sitelib}/%{pypiname}-%{version}-py3.?.egg-info -%endif +%{python3_sitelib}/%{pypiname}-%{version}-py3.?.egg-info/ %changelog +* Wed Apr 03 2019 Miro HronĨok - 2.1-11 +- Subpackage python2-trollius has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + * Sat Feb 02 2019 Fedora Release Engineering - 2.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild