[rpms/python-oslo-concurrency] noevent: Sync from RDO train release

[rpms/python-oslo-concurrency] noevent: Sync from RDO train release

[Alfredo Moralejo]

A new commit has been pushed.

Repo   : rpms/python-oslo-concurrency
Branch : noevent
Commit : 6719344eaed9f68ad9538699779212b266716912
Author : Alfredo Moralejo <amoralej@redhat.com>
Date   : 2019-11-06T14:47:27+01:00
Stats  : +94/-69 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/python-oslo-concurrency/c/6719344eaed9f68ad9538699779212b266716912?branch=noevent

Log:
Sync from RDO train release

---
diff --git a/.gitignore b/.gitignore
index ccd77ed..bd7de9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /oslo.concurrency-3.25.0.tar.gz
 /oslo.concurrency-3.25.1.tar.gz
 /oslo.concurrency-3.29.1.tar.gz
+/oslo.concurrency-3.30.0.tar.gz

diff --git a/python-oslo-concurrency.spec b/python-oslo-concurrency.spec
index c612a27..17bc415 100644
--- a/python-oslo-concurrency.spec
+++ b/python-oslo-concurrency.spec
@@ -1,3 +1,14 @@
+# Macros for py2/py3 compatibility
+%if 0%{?fedora} || 0%{?rhel} > 7
+%global pyver %{python3_pkgversion}
+%else
+%global pyver 2
+%endif
+%global pyver_bin python%{pyver}
+%global pyver_sitelib %python%{pyver}_sitelib
+%global pyver_install %py%{pyver}_install
+%global pyver_build %py%{pyver}_build
+# End of macros for py2/py3 compatibility
 
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
 %global with_doc 1
@@ -14,8 +25,8 @@ external processes.
 Tests for the Oslo concurrency library.
 
 Name:           python-oslo-concurrency
-Version:        3.29.1
-Release:        4%{?dist}
+Version:        3.30.0
+Release:        2%{?dist}
 Summary:        OpenStack Oslo concurrency library
 
 License:        ASL 2.0
@@ -26,56 +37,73 @@ BuildArch:      noarch
 %description
 %{common_desc}
 
+%package -n python%{pyver}-%{pkg_name}
+Summary:        OpenStack Oslo concurrency library
+%{?python_provide:%python_provide python%{pyver}-%{pkg_name}}
+
+BuildRequires:  python%{pyver}-devel
+BuildRequires:  python%{pyver}-pbr
+BuildRequires:  git
+# Required for tests
+BuildRequires:  python%{pyver}-hacking
+BuildRequires:  python%{pyver}-oslotest
+BuildRequires:  python%{pyver}-fixtures
+BuildRequires:  python%{pyver}-eventlet
+BuildRequires:  python%{pyver}-oslo-config
+BuildRequires:  python%{pyver}-oslo-utils
+BuildRequires:  python%{pyver}-fasteners
+# Required to compile translation files
+BuildRequires:  python%{pyver}-babel
+# Handle python2 exception
+%if %{pyver} == 2
+BuildRequires:  python%{pyver}-futures
+BuildRequires:  python-enum34
+%endif
+
+Requires:       python%{pyver}-pbr
+Requires:       python%{pyver}-oslo-config >= 2:5.2.0
+Requires:       python%{pyver}-oslo-i18n >= 3.15.3
+Requires:       python%{pyver}-oslo-utils >= 3.33.0
+Requires:       python%{pyver}-six
+Requires:       python%{pyver}-fasteners
+# Handle python2 exception
+%if %{pyver} == 2
+Requires:       python-enum34
+%endif
+
+Requires:       python-%{pkg_name}-lang = %{version}-%{release}
+
+%description -n python%{pyver}-%{pkg_name}
+%{common_desc}
+
 %if 0%{?with_doc}
 
 %package  -n python-%{pkg_name}-doc
 Summary:    Documentation for the Oslo concurrency library
 Group:      Documentation
-BuildRequires:  python3-sphinx
-BuildRequires:  python3-openstackdocstheme
+BuildRequires:  python%{pyver}-sphinx
+BuildRequires:  python%{pyver}-openstackdocstheme
+BuildRequires:  python%{pyver}-sphinxcontrib-apidoc
 
 %description -n python-%{pkg_name}-doc
 Documentation for the Oslo concurrency library.
 
 %endif
 
-%package -n python3-%{pkg_name}
-Summary:        OpenStack Oslo concurrency library
-%{?python_provide:%python_provide python3-%{pkg_name}}
-
-BuildRequires:  python3-devel
-BuildRequires:  python3-pbr
-# Required for tests
-BuildRequires:  python3-hacking
-BuildRequires:  python3-oslotest
-BuildRequires:  python3-fixtures
-BuildRequires:  python3-eventlet
-BuildRequires:  python3-fasteners
-BuildRequires:  python3-oslo-config
-BuildRequires:  python3-oslo-i18n
-BuildRequires:  python3-oslo-utils
-
-Requires:       python3-pbr
-Requires:       python3-oslo-config >= 2:5.2.0
-Requires:       python3-oslo-i18n >= 3.15.3
-Requires:       python3-oslo-utils >= 3.33.0
-Requires:       python3-six
-Requires:       python3-fasteners
-Requires:       python-%{pkg_name}-lang = %{version}-%{release}
-
-%description -n python3-%{pkg_name}
-%{common_desc}
-
-%package  -n python3-%{pkg_name}-tests
+%package  -n python%{pyver}-%{pkg_name}-tests
 Summary:    Tests for the Oslo concurrency library
-%{?python_provide:%python_provide python3-%{pkg_name}-tests}
-
-Requires:  python3-%{pkg_name} = %{version}-%{release}
-Requires:  python3-hacking
-Requires:  python3-oslotest
-Requires:  python3-fixtures
+%{?python_provide:%python_provide python%{pyver}-%{pkg_name}-tests}
+
+Requires:  python%{pyver}-%{pkg_name} = %{version}-%{release}
+Requires:  python%{pyver}-hacking
+Requires:  python%{pyver}-oslotest
+Requires:  python%{pyver}-fixtures
+# Handle python2 exception
+%if %{pyver} == 2
+Requires:  python%{pyver}-futures
+%endif
 
-%description -n python3-%{pkg_name}-tests
+%description -n python%{pyver}-%{pkg_name}-tests
 %{common_desc2}
 
 %package  -n python-%{pkg_name}-lang
@@ -90,39 +118,43 @@ Translation files for Oslo concurrency library
 rm -rf {test-,}requirements.txt
 
 %build
-%py3_build
+%{pyver_build}
 
 # Generate i18n files
-%{__python3} setup.py compile_catalog -d build/lib/oslo_concurrency/locale
+%{pyver_bin} setup.py compile_catalog -d build/lib/oslo_concurrency/locale
 
 %if 0%{?with_doc}
 # generate html docs
-%{__python3} setup.py build_sphinx -b html
-# remove the sphinx-build-3 leftovers
+%{pyver_bin} setup.py build_sphinx -b html
+# remove the sphinx-build-%{pyver} leftovers
 rm -rf doc/build/html/.{doctrees,buildinfo}
 %endif
 
 %install
-%py3_install
-mv %{buildroot}%{_bindir}/lockutils-wrapper %{buildroot}%{_bindir}/lockutils-wrapper-%{python3_version}
-ln -s ./lockutils-wrapper-%{python3_version} %{buildroot}%{_bindir}/lockutils-wrapper-3
-ln -s ./lockutils-wrapper-%{python3_version} %{buildroot}%{_bindir}/lockutils-wrapper
+%{pyver_install}
+ln -s ./lockutils-wrapper %{buildroot}%{_bindir}/lockutils-wrapper-%{pyver}
 
 # Install i18n .mo files (.po and .pot are not required)
 install -d -m 755 %{buildroot}%{_datadir}
-
-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
-rm -rf %{buildroot}%{python3_sitelib}/oslo_concurrency/locale
+rm -f %{buildroot}%{pyver_sitelib}/oslo_concurrency/locale/*/LC_*/oslo_concurrency*po
+rm -f %{buildroot}%{pyver_sitelib}/oslo_concurrency/locale/*pot
+mv %{buildroot}%{pyver_sitelib}/oslo_concurrency/locale %{buildroot}%{_datadir}/locale
 
 # Find language files
 %find_lang oslo_concurrency --all-name
 
 %check
 export PYTHON_DISALLOW_AMBIGUOUS_VERSION=0
-rm -rf .testrepository
-%{__python3} setup.py test
+%{pyver_bin} setup.py test
+
+%files -n python%{pyver}-%{pkg_name}
+%doc README.rst
+%license LICENSE
+%{_bindir}/lockutils-wrapper
+%{_bindir}/lockutils-wrapper-%{pyver}
+%{pyver_sitelib}/oslo_concurrency
+%{pyver_sitelib}/*.egg-info
+%exclude %{pyver_sitelib}/oslo_concurrency/tests
 
 %if 0%{?with_doc}
 %files -n python-%{pkg_name}-doc
@@ -130,24 +162,16 @@ rm -rf .testrepository
 %doc doc/build/html
 %endif
 
-%files -n python-%{pkg_name}-lang -f oslo_concurrency.lang
-%license LICENSE
+%files -n python%{pyver}-%{pkg_name}-tests
+%{pyver_sitelib}/oslo_concurrency/tests
 
-%files -n python3-%{pkg_name}
-%doc README.rst
+%files -n python-%{pkg_name}-lang -f oslo_concurrency.lang
 %license LICENSE
-%{_bindir}/lockutils-wrapper
-%{_bindir}/lockutils-wrapper-3
-%{_bindir}/lockutils-wrapper-%{python3_version}
-%{python3_sitelib}/oslo_concurrency
-%{python3_sitelib}/*.egg-info
-%exclude %{python3_sitelib}/oslo_concurrency/tests
-
-%files -n python3-%{pkg_name}-tests
-%{python3_sitelib}/oslo_concurrency/tests
-
 
 %changelog
+* Wed Nov 06 2019 Alfredo Moralejo <amoralej@redhat.com> 3.30.0-2
+- Update to upstream version 3.30.0
+
 * Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 3.29.1-4
 - Rebuilt for Python 3.8.0rc1 (#1748018)
 

diff --git a/sources b/sources
index 4880f0b..43a2f5f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (oslo.concurrency-3.29.1.tar.gz) = f820b07dbb26be9170c7ded08ce96bebc8c8cbfa72a3be56e0cb0fd7a025160fe630ad256c8c5b1adc9059cd1608c3625513b3da311e5a611866280d2b65424e
+SHA512 (oslo.concurrency-3.30.0.tar.gz) = f86a58c88afcefe24d1acd0a1a716598ef39e696cd46841bbd9ab2df16546118a61f8b28df234e8d383233b1a5b768efbca50bdd05591ce09d8e738c7f20cac6