diff --git a/Changelog.old b/Changelog.old index efd47df..7a943f2 100644 --- a/Changelog.old +++ b/Changelog.old @@ -1,3 +1,12 @@ +* Tue Jul 19 2016 Fedora Release Engineering - 4.6.0-3 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Fri Jun 03 2016 Charalampos Stratakis 4.6.0-2 +- Provide a python 3 tests subpackage + +* Wed Mar 23 2016 Haikel Guemar 4.6.0-1 +- Update to 4.6.0 + * Thu Feb 04 2016 Fedora Release Engineering - 2.6.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/python-oslo-db.spec b/python-oslo-db.spec index 413d64a..a7690fb 100644 --- a/python-oslo-db.spec +++ b/python-oslo-db.spec @@ -1,3 +1,4 @@ +%{!?upstream_version: %global upstream_version %{version}%{?milestone}} %global pypi_name oslo.db %global pkg_name oslo-db @@ -5,16 +6,14 @@ %global with_python3 1 %endif -%{!?upstream_version: %global upstream_version %{version}%{?milestone}} - Name: python-%{pkg_name} -Version: 4.6.0 -Release: 3%{?dist} +Version: 4.13.2 +Release: 1%{?dist} Summary: OpenStack oslo.db library License: ASL 2.0 URL: http://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 @@ -41,21 +40,24 @@ BuildRequires: python-testscenarios BuildRequires: python-oslotest BuildRequires: python-oslo-context BuildRequires: python-psycopg2 +# Required to compile translation files +BuildRequires: python-babel Requires: MySQL-python Requires: python-PyMySQL -Requires: python-oslo-config >= 2:2.3.0 -Requires: python-oslo-context >= 0.2.0 -Requires: python-oslo-i18n >= 1.5.0 -Requires: python-oslo-utils >= 2.0.0 -Requires: python-alembic >= 0.8.0 +Requires: python-oslo-config >= 2:3.14.0 +Requires: python-oslo-context >= 2.9.0 +Requires: python-oslo-i18n >= 2.1.0 +Requires: python-oslo-utils >= 3.16.0 +Requires: python-alembic >= 0.8.4 Requires: python-babel Requires: python-iso8601 Requires: python-migrate >= 0.9.6 Requires: python-six >= 1.9.0 -Requires: python-sqlalchemy >= 0.9.9 -Requires: python-stevedore >= 1.5.0 +Requires: python-sqlalchemy >= 1.0.10 +Requires: python-stevedore >= 1.16.0 Requires: python-pbr +Requires: python-%{pkg_name}-lang = %{version}-%{release} %description -n python2-%{pkg_name} The OpenStack Oslo database handling library. Provides database connectivity @@ -112,44 +114,30 @@ BuildRequires: python3-psycopg2 Requires: MySQL-python3 Requires: python3-PyMySQL -Requires: python3-oslo-config >= 2:2.3.0 -Requires: python3-oslo-context >= 0.2.0 -Requires: python3-oslo-i18n >= 1.5.0 -Requires: python3-oslo-utils >= 2.0.0 -Requires: python3-alembic >= 0.8.0 +Requires: python3-oslo-config >= 2:3.14.0 +Requires: python3-oslo-context >= 2.9.0 +Requires: python3-oslo-i18n >= 2.1.0 +Requires: python3-oslo-utils >= 3.16.0 +Requires: python3-alembic >= 0.8.4 Requires: python3-babel Requires: python3-iso8601 Requires: python3-migrate >= 0.9.6 Requires: python3-six >= 1.9.0 -Requires: python3-sqlalchemy >= 0.9.9 -Requires: python3-stevedore >= 1.5.0 +Requires: python3-sqlalchemy >= 1.0.10 +Requires: python3-stevedore >= 1.16.0 Requires: python3-pbr +Requires: python-%{pkg_name}-lang = %{version}-%{release} %description -n python3-%{pkg_name} The OpenStack Oslo database handling library. Provides database connectivity to the different backends and helper utils. %endif -%if 0%{?with_python3} -%package -n python3-%{pkg_name}-tests -Summary: test subpackage for the Oslo database handling library +%package -n python-%{pkg_name}-lang +Summary: Translation files for Oslo db library -Requires: python3-%{pkg_name} = %{version}-%{release} -Requires: python3-oslo-utils -Requires: python3-oslo-config -Requires: python3-six -Requires: python3-alembic -Requires: python3-fixtures -Requires: python3-migrate -Requires: python3-testresources -Requires: python3-testscenarios -Requires: python3-oslotest -Requires: python3-oslo-context -Requires: python3-psycopg2 - -%description -n python3-%{pkg_name}-tests -Test subpackage for the Oslo database handling library. -%endif +%description -n python-%{pkg_name}-lang +Translation files for Oslo db library %prep %setup -q -n %{pypi_name}-%{upstream_version} @@ -164,6 +152,8 @@ rm -f requirements.txt 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_db/locale %if 0%{?with_python3} %py3_build @@ -176,6 +166,18 @@ 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_db/locale/*/LC_*/oslo_db*po +rm -f %{buildroot}%{python2_sitelib}/oslo_db/locale/*pot +mv %{buildroot}%{python2_sitelib}/oslo_db/locale %{buildroot}%{_datadir}/locale +%if 0%{?with_python3} +rm -rf %{buildroot}%{python3_sitelib}/oslo_db/locale +%endif + +# Find language files +%find_lang oslo_db --all-name + %check %{__python2} setup.py test %if 0%{?with_python3} @@ -197,6 +199,8 @@ rm -rf .testrepository %files -n python-%{pkg_name}-tests %{python2_sitelib}/oslo_db/tests +%files -n python-%{pkg_name}-lang -f oslo_db.lang + %if 0%{?with_python3} %files -n python3-%{pkg_name} %doc README.rst @@ -206,18 +210,7 @@ rm -rf .testrepository %exclude %{python3_sitelib}/oslo_db/tests %endif -%if 0%{?with_python3} -%files -n python3-%{pkg_name}-tests -%{python3_sitelib}/oslo_db/tests -%endif - %changelog -* Tue Jul 19 2016 Fedora Release Engineering - 4.6.0-3 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Fri Jun 03 2016 Charalampos Stratakis 4.6.0-2 -- Provide a python 3 tests subpackage - -* Wed Mar 23 2016 Haikel Guemar 4.6.0-1 -- Update to 4.6.0 +* Thu Sep 08 2016 Haikel Guemar 4.13.2-1 +- Update to 4.13.2