diff --git a/python-oslo-concurrency.spec b/python-oslo-concurrency.spec index b99c577..91921c0 100644 --- a/python-oslo-concurrency.spec +++ b/python-oslo-concurrency.spec @@ -1,7 +1,3 @@ -%if 0%{?fedora} >= 24 -%global with_python3 1 -%endif - %{!?upstream_version: %global upstream_version %{version}%{?milestone}} %global with_doc 1 @@ -18,7 +14,7 @@ Tests for the Oslo concurrency library. Name: python-oslo-concurrency Version: 3.25.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: OpenStack Oslo concurrency library License: ASL 2.0 @@ -29,84 +25,19 @@ BuildArch: noarch %description %{common_desc} -%package -n python2-%{pkg_name} -Summary: OpenStack Oslo concurrency library -%{?python_provide:%python_provide python2-%{pkg_name}} - -BuildRequires: python2-devel -BuildRequires: python2-pbr -BuildRequires: git -# Required for tests -# FIXME(hguemar): required or tests will fail -# should be unnecessary with Rocky version -BuildRequires: python-unversioned-command -BuildRequires: python2-hacking -BuildRequires: python2-oslotest -BuildRequires: python2-fixtures -BuildRequires: python2-eventlet -BuildRequires: python2-oslo-config -BuildRequires: python2-oslo-utils -BuildRequires: python2-fasteners -# Required to compile translation files -BuildRequires: python2-babel -%if 0%{?fedora} > 0 -BuildRequires: python2-futures -BuildRequires: python2-enum34 -%else -BuildRequires: python-futures -BuildRequires: python-enum34 -%endif - -Requires: python2-pbr -Requires: python2-fixtures -Requires: python2-oslo-config >= 2:5.1.0 -Requires: python2-oslo-i18n >= 3.15.3 -Requires: python2-oslo-utils >= 3.33.0 -Requires: python2-six -Requires: python2-fasteners -%if 0%{?fedora} > 0 -Requires: python2-enum34 -%else -Requires: python-enum34 -%endif -Requires: python-%{pkg_name}-lang = %{version}-%{release} - -%description -n python2-%{pkg_name} -%{common_desc} - %if 0%{?with_doc} %package -n python-%{pkg_name}-doc Summary: Documentation for the Oslo concurrency library -BuildRequires: python2-sphinx -BuildRequires: python2-openstackdocstheme -BuildRequires: python2-fixtures +BuildRequires: python3-sphinx +BuildRequires: python3-openstackdocstheme %description -n python-%{pkg_name}-doc Documentation for the Oslo concurrency library. %endif -%package -n python2-%{pkg_name}-tests -Summary: Tests for the Oslo concurrency library -%{?python_provide:%python_provide python2-%{pkg_name}-tests} - -Requires: python2-%{pkg_name} = %{version}-%{release} -Requires: python2-hacking -Requires: python2-oslotest -Requires: python2-fixtures -%if 0%{?fedora} > 0 -Requires: python2-futures -%else -Requires: python-futures -%endif - - -%description -n python2-%{pkg_name}-tests -%{common_desc2} - -%if 0%{?with_python3} %package -n python3-%{pkg_name} Summary: OpenStack Oslo concurrency library %{?python_provide:%python_provide python3-%{pkg_name}} @@ -118,6 +49,10 @@ BuildRequires: python3-hacking BuildRequires: python3-oslotest BuildRequires: python3-fixtures BuildRequires: python3-eventlet +BuildRequires: python3-oslo-config +BuildRequires: python3-oslo-utils +BuildRequires: python3-fasteners + Requires: python3-pbr Requires: python3-fixtures @@ -142,7 +77,6 @@ Requires: python3-fixtures %description -n python3-%{pkg_name}-tests %{common_desc2} -%endif %package -n python-%{pkg_name}-lang Summary: Translation files for Oslo concurrency library @@ -156,62 +90,35 @@ Translation files for Oslo concurrency library rm -rf {test-,}requirements.txt %build -%py2_build -%if 0%{?with_python3} %py3_build -%endif # Generate i18n files -%{__python2} setup.py compile_catalog -d build/lib/oslo_concurrency/locale +%{__python3} setup.py compile_catalog -d build/lib/oslo_concurrency/locale %if 0%{?with_doc} # generate html docs -%{__python2} setup.py build_sphinx -b html +%{__python3} setup.py build_sphinx -b html # remove the sphinx-build leftovers rm -rf doc/build/html/.{doctrees,buildinfo} %endif %install -%if 0%{?with_python3} %py3_install mv %{buildroot}%{_bindir}/lockutils-wrapper %{buildroot}%{_bindir}/lockutils-wrapper-%{python3_version} ln -s ./lockutils-wrapper-%{python3_version} %{buildroot}%{_bindir}/lockutils-wrapper-3 -%endif - -%py2_install -mv %{buildroot}%{_bindir}/lockutils-wrapper %{buildroot}%{_bindir}/lockutils-wrapper-%{python2_version} -ln -s ./lockutils-wrapper-%{python2_version} %{buildroot}%{_bindir}/lockutils-wrapper-2 - -ln -s ./lockutils-wrapper-%{python2_version} %{buildroot}%{_bindir}/lockutils-wrapper +ln -s ./lockutils-wrapper-%{python3_version} %{buildroot}%{_bindir}/lockutils-wrapper # Install i18n .mo files (.po and .pot are not required) install -d -m 755 %{buildroot}%{_datadir} -rm -f %{buildroot}%{python2_sitelib}/oslo_concurrency/locale/*/LC_*/oslo_concurrency*po -rm -f %{buildroot}%{python2_sitelib}/oslo_concurrency/locale/*pot -mv %{buildroot}%{python2_sitelib}/oslo_concurrency/locale %{buildroot}%{_datadir}/locale -%if 0%{?with_python3} -rm -rf %{buildroot}%{python3_sitelib}/oslo_concurrency/locale -%endif +rm -f %{buildroot}%{python3_sitelib}/oslo_concurrency/locale/*/LC_*/oslo_concurrency*po +rm -f %{buildroot}%{python3_sitelib}/oslo_concurrency/locale/*pot +mv %{buildroot}%{python3_sitelib}/oslo_concurrency/locale %{buildroot}%{_datadir}/locale # Find language files %find_lang oslo_concurrency --all-name %check -%{__python2} setup.py test -%if 0%{?with_python3} -rm -rf .testrepository -%{__python3} setup.py test -%endif - -%files -n python2-%{pkg_name} -%doc README.rst -%license LICENSE -%{_bindir}/lockutils-wrapper -%{_bindir}/lockutils-wrapper-2 -%{_bindir}/lockutils-wrapper-%{python2_version} -%{python2_sitelib}/oslo_concurrency -%{python2_sitelib}/*.egg-info -%exclude %{python2_sitelib}/oslo_concurrency/tests +PYTHON=%{__python3} %{__python3} setup.py test %if 0%{?with_doc} %files -n python-%{pkg_name}-doc @@ -219,16 +126,13 @@ rm -rf .testrepository %doc doc/build/html %endif -%files -n python2-%{pkg_name}-tests -%{python2_sitelib}/oslo_concurrency/tests - %files -n python-%{pkg_name}-lang -f oslo_concurrency.lang %license LICENSE -%if 0%{?with_python3} %files -n python3-%{pkg_name} %doc README.rst %license LICENSE +%{_bindir}/lockutils-wrapper %{_bindir}/lockutils-wrapper-3 %{_bindir}/lockutils-wrapper-%{python3_version} %{python3_sitelib}/oslo_concurrency @@ -237,10 +141,12 @@ rm -rf .testrepository %files -n python3-%{pkg_name}-tests %{python3_sitelib}/oslo_concurrency/tests -%endif %changelog +* Fri Feb 01 2019 Alfredo Moralejo 3.25.1-2 +- Remove python2 subpackages. + * Fri May 11 2018 RDO 3.25.1-1 - Update to 3.25.1