From 1f934037502833fe09c67eb8503324b76456ef35 Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Sep 07 2016 18:58:24 +0000 Subject: Sync w/ RDO Newton Change-Id: Id214e9969c3687887f64c6fac8932aa25e431ac4 --- diff --git a/Changelog.old b/Changelog.old index 6e735db..4c5bb63 100644 --- a/Changelog.old +++ b/Changelog.old @@ -1,3 +1,22 @@ +* Tue Jul 19 2016 Fedora Release Engineering - 3.7.1-4 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Mon Jun 27 2016 Haïkel Guémar - 3.7.1-3 +- Drop python3-futures dep + +* Sun Jun 26 2016 Haïkel Guémar - 3.7.1-2 +- Fix python2 package pulling python3 +- Fix tests packaging + +* Fri Jun 17 2016 Haikel Guemar 3.7.1-1 +- Update to 3.7.1 + +* Fri Jun 03 2016 Charalampos Stratakis 3.6.0-2 +- Provide a python 3 tests subpackage + +* Wed Mar 23 2016 Haikel Guemar 3.6.0-1 +- Update to 3.6.0 + * Thu Feb 04 2016 Fedora Release Engineering - 2.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/python-oslo-concurrency.spec b/python-oslo-concurrency.spec index a6b44e3..1cb5836 100644 --- a/python-oslo-concurrency.spec +++ b/python-oslo-concurrency.spec @@ -8,13 +8,13 @@ %global pkg_name oslo-concurrency Name: python-oslo-concurrency -Version: 3.7.1 -Release: 4%{?dist} +Version: 3.14.0 +Release: 1%{?dist} Summary: OpenStack Oslo concurrency library License: ASL 2.0 URL: https://launchpad.net/oslo -Source0: https://pypi.python.org/packages/source/o/%{pypi_name}/%{pypi_name}-%{version}.tar.gz +Source0: https://pypi.io/packages/source/o/%{pypi_name}/%{pypi_name}-%{version}.tar.gz BuildArch: noarch %description @@ -36,6 +36,8 @@ BuildRequires: python-futures BuildRequires: python-fixtures BuildRequires: python-enum34 BuildRequires: python-eventlet +# Required to compile translation files +BuildRequires: python-babel Requires: python-babel Requires: python-iso8601 @@ -48,6 +50,7 @@ Requires: python-retrying Requires: python-six Requires: python-fasteners Requires: python-enum34 +Requires: python-%{pkg_name}-lang = %{version}-%{release} %description -n python2-%{pkg_name} Oslo concurrency library has utilities for safely running multi-thread, @@ -106,6 +109,7 @@ Requires: python3-posix_ipc Requires: python3-retrying Requires: python3-six Requires: python3-fasteners +Requires: python-%{pkg_name}-lang = %{version}-%{release} %description -n python3-%{pkg_name} Oslo concurrency library has utilities for safely running multi-thread, @@ -113,7 +117,7 @@ multi-process applications using locking mechanisms and for running external processes. %package -n python3-%{pkg_name}-tests -Summary: Testes for the Oslo concurrency library +Summary: Tests for the Oslo concurrency library %{?python_provide:%python_provide python3-%{pkg_name}-tests} Requires: python3-%{pkg_name} = %{version}-%{release} @@ -126,6 +130,11 @@ Requires: python3-fixtures Tests for the Oslo concurrency library. %endif +%package -n python-%{pkg_name}-lang +Summary: Translation files for Oslo concurrency library + +%description -n python-%{pkg_name}-lang +Translation files for Oslo concurrency library %prep %setup -q -n %{pypi_name}-%{upstream_version} @@ -138,6 +147,9 @@ rm -rf {test-,}requirements.txt %py3_build %endif +# Generate i18n files +%{__python2} setup.py compile_catalog -d build/lib/oslo_concurrency/locale + # generate html docs sphinx-build doc/source html # remove the sphinx-build leftovers @@ -157,12 +169,23 @@ ln -s ./lockutils-wrapper-%{python2_version} %{buildroot}%{_bindir}/lockutils-wr ln -s ./lockutils-wrapper-%{python2_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 + +# Find language files +%find_lang oslo_concurrency --all-name %check -%{__python2} setup.py test ||: +%{__python2} setup.py test %if 0%{?with_python3} rm -rf .testrepository -%{__python3} setup.py test ||: +%{__python3} setup.py test %endif %files -n python2-%{pkg_name} @@ -182,6 +205,7 @@ rm -rf .testrepository %files -n python2-%{pkg_name}-tests %{python2_sitelib}/oslo_concurrency/tests +%files -n python-%{pkg_name}-lang -f oslo_concurrency.lang %if 0%{?with_python3} %files -n python3-%{pkg_name} @@ -199,22 +223,6 @@ rm -rf .testrepository %changelog -* Tue Jul 19 2016 Fedora Release Engineering - 3.7.1-4 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Mon Jun 27 2016 Haïkel Guémar - 3.7.1-3 -- Drop python3-futures dep - -* Sun Jun 26 2016 Haïkel Guémar - 3.7.1-2 -- Fix python2 package pulling python3 -- Fix tests packaging - -* Fri Jun 17 2016 Haikel Guemar 3.7.1-1 -- Update to 3.7.1 - -* Fri Jun 03 2016 Charalampos Stratakis 3.6.0-2 -- Provide a python 3 tests subpackage - -* Wed Mar 23 2016 Haikel Guemar 3.6.0-1 -- Update to 3.6.0 +* Wed Sep 07 2016 Haikel Guemar 3.14.0-1 +- Update to 3.14.0