[rpms/python-oslo-concurrency] noevent: Fix python2 package pulling python3

[rpms/python-oslo-concurrency] noevent: Fix python2 package pulling python3

[Haikel Guemar]

            A new commit has been pushed.

            Repo   : rpms/python-oslo-concurrency
            Branch : noevent
            Commit : 0cfbb35462ee35be25b3392466c999daeec01073
            Author : Haikel Guemar <hguemar@fedoraproject.org>
            Date   : 2016-06-26T17:32:41+02:00
            Stats  : +28/-10 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/python-oslo-concurrency/c/0cfbb35462ee35be25b3392466c999daeec01073?branch=noevent

            Log:
            Fix python2 package pulling python3

- Fix tests packaging

Change-Id: I57111d505a5f974624ffb843868a241952713e17

---
diff --git a/python-oslo-concurrency.spec b/python-oslo-concurrency.spec
index b3d9357..1a337ac 100644
--- a/python-oslo-concurrency.spec
+++ b/python-oslo-concurrency.spec
@@ -8,7 +8,7 @@
 %global pkg_name oslo-concurrency
 
 Name:           python-oslo-concurrency
-Version:        3.6.0
+Version:        3.7.1
 Release:        2%{?dist}
 Summary:        OpenStack Oslo concurrency library
 
@@ -67,17 +67,17 @@ BuildRequires:  python-fasteners
 %description -n python-%{pkg_name}-doc
 Documentation for the Oslo concurrency library.
 
-%package  -n python-%{pkg_name}-tests
+%package  -n python2-%{pkg_name}-tests
 Summary:    Tests for the Oslo concurrency library
 
-Requires:  python-%{pkg_name} = %{version}-%{release}
+Requires:  python2-%{pkg_name} = %{version}-%{release}
 Requires:  python-hacking
 Requires:  python-oslotest
 Requires:  python-coverage
 Requires:  python-futures
 Requires:  python-fixtures
 
-%description -n python-%{pkg_name}-tests
+%description -n python2-%{pkg_name}-tests
 Tests for the Oslo concurrency library.
 
 %if 0%{?with_python3}
@@ -109,9 +109,7 @@ Requires:       python3-fasteners
 Oslo concurrency library has utilities for safely running multi-thread,
 multi-process applications using locking mechanisms and for running
 external processes.
-%endif
 
-%if 0%{?with_python3}
 %package  -n python3-%{pkg_name}-tests
 Summary:    Tests for the Oslo concurrency library
 
@@ -119,12 +117,14 @@ Requires:  python3-%{pkg_name} = %{version}-%{release}
 Requires:  python3-hacking
 Requires:  python3-oslotest
 Requires:  python3-coverage
+Requires:  python3-futures
 Requires:  python3-fixtures
 
 %description -n python3-%{pkg_name}-tests
 Tests for the Oslo concurrency library.
 %endif
 
+
 %prep
 %setup -q -n %{pypi_name}-%{upstream_version}
 # Let RPM handle the dependencies
@@ -143,11 +143,19 @@ rm -rf html/.{doctrees,buildinfo}
 
 
 %install
-%py2_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
+
+
 %check
 %{__python2} setup.py test ||:
 %if 0%{?with_python3}
@@ -159,6 +167,8 @@ rm -rf .testrepository
 %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
@@ -167,7 +177,7 @@ rm -rf .testrepository
 %license LICENSE
 %doc html
 
-%files -n python-%{pkg_name}-tests
+%files -n python2-%{pkg_name}-tests
 %{python2_sitelib}/oslo_concurrency/tests
 
 
@@ -175,17 +185,25 @@ rm -rf .testrepository
 %files -n python3-%{pkg_name}
 %doc README.rst
 %license LICENSE
+%{_bindir}/lockutils-wrapper-3
+%{_bindir}/lockutils-wrapper-%{python3_version}
 %{python3_sitelib}/oslo_concurrency
 %{python3_sitelib}/*.egg-info
 %exclude %{python3_sitelib}/oslo_concurrency/tests
-%endif
 
-%if 0%{?with_python3}
 %files -n python3-%{pkg_name}-tests
 %{python3_sitelib}/oslo_concurrency/tests
 %endif
 
+
 %changelog
+* Sun Jun 26 2016 Haïkel Guémar <hguemar@fedoraproject.org> - 3.7.1-2
+- Fix python2 package pulling python3
+- Fix tests packaging
+
+* Fri Jun 17 2016 Haikel Guemar <hguemar@fedoraproject.org> 3.7.1-1
+- Update to 3.7.1
+
 * Fri Jun 03 2016 Charalampos Stratakis <cstratak@redhat.com> 3.6.0-2
 - Provide a python 3 tests subpackage