diff --git a/Changelog.old b/Changelog.old index 135cc25..7b2aea9 100644 --- a/Changelog.old +++ b/Changelog.old @@ -1,3 +1,12 @@ +* Tue Jul 19 2016 Fedora Release Engineering - 3.7.0-3 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Wed Jun 01 2016 Charalampos Stratakis 3.7.0-2 +- Provide a python 3 tests subpackage + +* Tue Mar 22 2016 Haikel Guemar 3.7.0-1 +- Update to 3.7.0 + * Thu Feb 04 2016 Fedora Release Engineering - 2.5.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/python-oslo-utils.spec b/python-oslo-utils.spec index 2b8ab65..bc6311c 100644 --- a/python-oslo-utils.spec +++ b/python-oslo-utils.spec @@ -8,8 +8,8 @@ %{!?upstream_version: %global upstream_version %{version}%{?milestone}} Name: python-oslo-utils -Version: 3.7.0 -Release: 3%{?dist} +Version: 3.16.0 +Release: 1 Summary: OpenStack Oslo Utility library License: ASL 2.0 @@ -36,6 +36,7 @@ BuildRequires: python-monotonic BuildRequires: pytz # test requirements +BuildRequires: pyparsing BuildRequires: python-hacking BuildRequires: python-fixtures BuildRequires: python-oslo-config @@ -44,7 +45,10 @@ BuildRequires: python-testscenarios BuildRequires: python-testtools BuildRequires: python-testrepository BuildRequires: python-funcsigs +# Required to compile translation files +BuildRequires: python-babel +Requires: pyparsing Requires: python-funcsigs Requires: python-oslo-config Requires: python-oslo-i18n @@ -57,6 +61,7 @@ Requires: python-netifaces >= 0.10.4 Requires: python-debtcollector >= 0.3.0 Requires: pytz Requires: python-monotonic +Requires: python-%{pkg_name}-lang = %{version}-%{release} %description -n python2-%{pkg_name} The OpenStack Oslo Utility library. @@ -140,6 +145,7 @@ Requires: python3-netifaces >= 0.10.4 Requires: python3-debtcollector >= 0.3.0 Requires: python3-pytz Requires: python3-monotonic +Requires: python-%{pkg_name}-lang = %{version}-%{release} %description -n python3-%{pkg_name} The OpenStack Oslo Utility library. @@ -148,6 +154,12 @@ The OpenStack Oslo Utility library. * Bugs: http://bugs.launchpad.net/oslo %endif +%package -n python-%{pkg_name}-lang +Summary: Translation files for Oslo utils library + +%description -n python-%{pkg_name}-lang +Translation files for Oslo utils library + %prep %setup -q -n %{pypi_name}-%{upstream_version} @@ -162,6 +174,9 @@ sphinx-build doc/source html # remove the sphinx-build leftovers rm -rf html/.{doctrees,buildinfo} +# Generate i18n files +%{__python2} setup.py compile_catalog -d build/lib/oslo_utils/locale + %if 0%{?with_python3} %py3_build %endif @@ -172,6 +187,19 @@ rm -rf html/.{doctrees,buildinfo} %py3_install %endif +# Install i18n .mo files (.po and .pot are not required) +install -d -m 755 %{buildroot}%{_datadir} +rm -f %{buildroot}%{python2_sitelib}/oslo_utils/locale/*/LC_*/oslo_utils*po +rm -f %{buildroot}%{python2_sitelib}/oslo_utils/locale/*pot +mv %{buildroot}%{python2_sitelib}/oslo_utils/locale %{buildroot}%{_datadir}/locale +%if 0%{?with_python3} +rm -rf %{buildroot}%{python3_sitelib}/oslo_utils/locale +%endif + +# Find language files +%find_lang oslo_utils --all-name + + %check %if 0%{?with_python3} %{__python3} setup.py test @@ -201,18 +229,14 @@ rm -rf html/.{doctrees,buildinfo} %files -n python-%{pkg_name}-tests %{python2_sitelib}/oslo_utils/tests +%files -n python-%{pkg_name}-lang -f oslo_utils.lang + %if 0%{?with_python3} %files -n python3-%{pkg_name}-tests %{python3_sitelib}/oslo_utils/tests %endif %changelog -* Tue Jul 19 2016 Fedora Release Engineering - 3.7.0-3 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Wed Jun 01 2016 Charalampos Stratakis 3.7.0-2 -- Provide a python 3 tests subpackage - -* Tue Mar 22 2016 Haikel Guemar 3.7.0-1 -- Update to 3.7.0 +* Tue Sep 06 2016 Haikel Guemar 3.16.0-1 +- Update to 3.16.0