diff --git a/python-dirq.spec b/python-dirq.spec index 522d22e..969eba8 100644 --- a/python-dirq.spec +++ b/python-dirq.spec @@ -1,21 +1,15 @@ -%if 0%{?fedora} > 12 || 0%{?rhel} > 7 -%global with_python3 1 -%endif %global srcname dirq Name: python-dirq Version: 1.7.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Directory based queue License: ASL 2.0 URL: https://github.com/cern-mig/%{name} Source0: http://pypi.python.org/packages/source/d/%{srcname}/%{srcname}-%{version}.tar.gz BuildArch: noarch -BuildRequires: python2-devel -%if 0%{?with_python3} BuildRequires: python3-devel -%endif # if with_python3 %global _description\ The goal of this module is to offer a simple queue system using the\ @@ -28,13 +22,6 @@ module Directory::Queue. %description %_description -%package -n python2-dirq -Summary: %summary -%{?python_provide:%python_provide python2-dirq} - -%description -n python2-dirq %_description - -%if 0%{?with_python3} %package -n python3-dirq Summary: Directory based queue @@ -46,58 +33,32 @@ robustness and the ability to scale. The python module dirq is compatible with the Perl module Directory::Queue. -%endif # with_python3 %prep %setup -q -n %{srcname}-%{version} -%if 0%{?with_python3} -rm -fr %{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|#!%{__python3}|' %build -%{__python2} setup.py build -%if 0%{?with_python3} -pushd %{py3dir} %{__python3} setup.py build -popd -%endif # with_python3 %install -rm -fr $RPM_BUILD_ROOT -%{__python2} setup.py install --skip-build --root $RPM_BUILD_ROOT -%if 0%{?with_python3} -pushd %{py3dir} %{__python3} setup.py install --skip-build --root $RPM_BUILD_ROOT -popd -%endif # with_python3 %check -%{__python2} setup.py test -# And remove compiled documentation. -rm -f test/*.pyc -%if 0%{?with_python3} -pushd %{py3dir} %{__python3} setup.py test # And remove compiled documentation. rm -f test/*.pyc -popd -%endif # with_python3 -%files -n python2-dirq -%doc README.rst CHANGES examples test -%{python2_sitelib}/%{srcname}/ -%{python2_sitelib}/%{srcname}-%{version}-py?.?.egg-info - -%if 0%{?with_python3} %files -n python3-dirq %doc README.rst CHANGES examples test %{python3_sitelib}/%{srcname}/ %{python3_sitelib}/%{srcname}-%{version}-py?.?.egg-info -%endif # with_python3 %changelog +* Tue Jun 18 2019 Miro HronĨok - 1.7.1-11 +- Subpackage python2-dirq has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + * Sat Feb 02 2019 Fedora Release Engineering - 1.7.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild