From 2acf584c6887bc6a1340eb6c072f36cb51cd983f Mon Sep 17 00:00:00 2001 From: Haikel Guemar Date: Jun 16 2017 08:31:00 +0000 Subject: Merge branch 'master' into f25 --- diff --git a/.gitignore b/.gitignore index e7df91a..292dc2e 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ /oslo.log-1.11.0.tar.gz /oslo.log-3.2.0.tar.gz /oslo.log-3.3.0.tar.gz +/oslo.log-3.16.0.tar.gz +/oslo.log-3.20.1.tar.gz diff --git a/Changelog.old b/Changelog.old index b19dfa5..1570712 100644 --- a/Changelog.old +++ b/Changelog.old @@ -1,3 +1,21 @@ +* Sat Feb 11 2017 Fedora Release Engineering - 3.16.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Dec 19 2016 Miro Hrončok - 3.16.0-2 +- Rebuild for Python 3.6 + +* Tue Sep 06 2016 Haikel Guemar 3.16.0-1 +- Update to 3.16.0 + +* Tue Jul 19 2016 Fedora Release Engineering - 3.2.0-3 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Wed Jun 01 2016 Charalampos Stratakis 3.2.0-2 +- Provide a python 3 tests subpackage + +* Tue Mar 22 2016 Haikel Guemar 3.2.0-1 +- Update to 3.2.0 + * Thu Feb 04 2016 Fedora Release Engineering - 1.11.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/python-oslo-log.spec b/python-oslo-log.spec index 38c3f06..a6b8428 100644 --- a/python-oslo-log.spec +++ b/python-oslo-log.spec @@ -8,13 +8,13 @@ %global pkg_name oslo-log Name: python-oslo-log -Version: 3.3.0 +Version: 3.20.1 Release: 1%{?dist} Summary: OpenStack Oslo Log 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://tarballs.openstack.org/%{pypi_name}/%{pypi_name}-%{upstream_version}.tar.gz BuildArch: noarch %package -n python2-%{pkg_name} @@ -34,17 +34,21 @@ BuildRequires: python-testrepository BuildRequires: python-testscenarios BuildRequires: python-testtools BuildRequires: python-inotify +# Required to compile translation files +BuildRequires: python-babel Requires: python-babel Requires: python-dateutil +Requires: python-monotonic Requires: python-six >= 1.9.0 -Requires: python-oslo-config -Requires: python-oslo-context -Requires: python-oslo-i18n -Requires: python-oslo-utils -Requires: python-oslo-serialization +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.18.0 +Requires: python-oslo-serialization >= 1.10.0 Requires: python-debtcollector Requires: python-inotify +Requires: python-%{pkg_name}-lang = %{version}-%{release} %description -n python2-%{pkg_name} OpenStack logging configuration library provides standardized configuration @@ -116,14 +120,16 @@ BuildRequires: python3-inotify Requires: python3-babel Requires: python3-dateutil +Requires: python3-monotonic Requires: python3-six >= 1.9.0 -Requires: python3-oslo-config -Requires: python3-oslo-context -Requires: python3-oslo-i18n -Requires: python3-oslo-utils -Requires: python3-oslo-serialization +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.18.0 +Requires: python3-oslo-serialization >= 1.10.0 Requires: python3-debtcollector Requires: python3-inotify +Requires: python-%{pkg_name}-lang = %{version}-%{release} %description -n python3-%{pkg_name} Oslo concurrency library has utilities for safely running multi-thread, @@ -136,6 +142,12 @@ OpenStack logging configuration library provides standardized configuration for all openstack projects. It also provides custom formatters, handlers and support for context specific logging (like resource id’s etc). +%package -n python-%{pkg_name}-lang +Summary: Translation files for Oslo log library + +%description -n python-%{pkg_name}-lang +Translation files for Oslo log library + %prep %setup -q -n %{pypi_name}-%{upstream_version} # Let RPM handle the dependencies @@ -151,18 +163,38 @@ rm -rf {test-,}requirements.txt PYTHONPATH=. 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_log/locale %install -%py2_install %if 0%{?with_python3} %py3_install +mv %{buildroot}%{_bindir}/convert-json %{buildroot}%{_bindir}/convert-json-%{python3_version} +ln -s ./convert-json-%{python3_version} %{buildroot}%{_bindir}/convert-json-3 %endif +%py2_install +ln -s ./convert-json %{buildroot}%{_bindir}/convert-json-2 +ln -s ./convert-json %{buildroot}%{_bindir}/convert-json-%{python2_version} + + +# Install i18n .mo files (.po and .pot are not required) +install -d -m 755 %{buildroot}%{_datadir} +rm -f %{buildroot}%{python2_sitelib}/oslo_log/locale/*/LC_*/oslo_log*po +rm -f %{buildroot}%{python2_sitelib}/oslo_log/locale/*pot +mv %{buildroot}%{python2_sitelib}/oslo_log/locale %{buildroot}%{_datadir}/locale +%if 0%{?with_python3} +rm -rf %{buildroot}%{python3_sitelib}/oslo_log/locale +%endif + +# Find language files +%find_lang oslo_log --all-name %check -%{__python2} setup.py test +# TODO(jpena): Temporarily skipping tests until https://review.openstack.org/430210 is merged +%{__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} @@ -170,6 +202,9 @@ rm -rf .testrepository %license LICENSE %{python2_sitelib}/oslo_log %{python2_sitelib}/*.egg-info +%{_bindir}/convert-json +%{_bindir}/convert-json-2 +%{_bindir}/convert-json-%{python2_version} %exclude %{python2_sitelib}/oslo_log/tests %files -n python-%{pkg_name}-doc @@ -179,12 +214,17 @@ rm -rf .testrepository %files -n python2-%{pkg_name}-tests %{python2_sitelib}/oslo_log/tests +%files -n python-%{pkg_name}-lang -f oslo_log.lang +%license LICENSE + %if 0%{?with_python3} %files -n python3-%{pkg_name} %doc README.rst ChangeLog AUTHORS %license LICENSE %{python3_sitelib}/oslo_log %{python3_sitelib}/*.egg-info +%{_bindir}/convert-json-3 +%{_bindir}/convert-json-%{python3_version} %exclude %{python3_sitelib}/oslo_log/tests %endif @@ -195,15 +235,9 @@ rm -rf .testrepository %changelog -* Wed Sep 07 2016 Haikel Guemar 3.3.0-1 -- Update to 3.3.0 - -* Tue Jul 19 2016 Fedora Release Engineering - 3.2.0-3 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Wed Jun 01 2016 Charalampos Stratakis 3.2.0-2 -- Provide a python 3 tests subpackage +* Thu Mar 16 2017 Alfredo Moralejo 3.20.1-1 +- Update to 3.20.1 -* Tue Mar 22 2016 Haikel Guemar 3.2.0-1 -- Update to 3.2.0 +* Wed Feb 08 2017 Alfredo Moralejo 3.20.0-1 +- Update to 3.20.0 diff --git a/sources b/sources index a76997f..9f678a2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -518cbbbca193a95d68ab2b62ff84d304 oslo.log-3.3.0.tar.gz +SHA512 (oslo.log-3.20.1.tar.gz) = 9f802251177a8a822f5944729ac226e226cf7dbe94b9d5b4e5eedb7c64f6968a35810cc288b774085f16f77eaffabf752636bc51c52d50e87cc2840b76076f13