diff --git a/Changelog.old b/Changelog.old index 1570712..4b2be99 100644 --- a/Changelog.old +++ b/Changelog.old @@ -1,3 +1,18 @@ +* Mon Jul 23 2018 Matthias Runge - 3.36.0-1 +- rebase to 3.36.0 + +* Sat Jul 14 2018 Fedora Release Engineering - 3.30.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 3.30.0-3 +- Rebuilt for Python 3.7 + +* Fri Feb 09 2018 Fedora Release Engineering - 3.30.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Fri Aug 11 2017 Alfredo Moralejo 3.30.0-1 +- Update to 3.30.0 + * Sat Feb 11 2017 Fedora Release Engineering - 3.16.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/python-oslo-log.spec b/python-oslo-log.spec index 062c2b3..79ecbdc 100644 --- a/python-oslo-log.spec +++ b/python-oslo-log.spec @@ -3,9 +3,16 @@ %endif %{!?upstream_version: %global upstream_version %{version}%{?milestone}} - +%global with_doc 1 %global pypi_name oslo.log %global pkg_name oslo-log +%global common_desc \ +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). + +%global common_desc1 \ +Tests for the Oslo Log handling library. Name: python-oslo-log Version: 3.36.0 @@ -22,66 +29,85 @@ Summary: OpenStack Oslo Log library %{?python_provide:%python_provide python2-%{pkg_name}} BuildRequires: python2-devel -BuildRequires: python-pbr +BuildRequires: python2-pbr BuildRequires: git # Required for tests -BuildRequires: python-dateutil -BuildRequires: python-mock -BuildRequires: python-oslotest -BuildRequires: python-oslo-config -BuildRequires: python-oslo-serialization -BuildRequires: python-subunit +# FIXME(hguemar): required or tests will fail +# should be unnecessary with Rocky version +BuildRequires: python-unversioned-command +BuildRequires: python2-dateutil +BuildRequires: python2-mock +BuildRequires: python2-oslotest +BuildRequires: python2-oslo-context +BuildRequires: python2-oslo-config +BuildRequires: python2-oslo-serialization +BuildRequires: python2-subunit +BuildRequires: python2-testtools +# Required to compile translation files +BuildRequires: python2-babel +%if 0%{?fedora} > 0 +BuildRequires: python2-inotify +BuildRequires: python2-testrepository +BuildRequires: python2-testscenarios +%else +BuildRequires: python-inotify BuildRequires: python-testrepository BuildRequires: python-testscenarios -BuildRequires: python-testtools -BuildRequires: python-inotify -# Required to compile translation files -BuildRequires: python-babel +%endif -Requires: python-babel -Requires: python-dateutil -Requires: python-monotonic -Requires: python-six >= 1.9.0 -Requires: python-oslo-config >= 2:4.0.0 -Requires: python-oslo-context >= 2.14.0 -Requires: python-oslo-i18n >= 2.1.0 -Requires: python-oslo-utils >= 3.20.0 -Requires: python-oslo-serialization >= 1.10.0 -Requires: python-debtcollector >= 1.2.0 +Requires: python2-pbr +Requires: python2-dateutil +Requires: python2-six >= 1.10.0 +Requires: python2-oslo-config >= 2:5.1.0 +Requires: python2-oslo-context >= 2.19.2 +Requires: python2-oslo-i18n >= 3.15.3 +Requires: python2-oslo-utils >= 3.33.0 +Requires: python2-oslo-serialization >= 2.18.0 +Requires: python2-debtcollector >= 1.2.0 +%if 0%{?fedora} > 0 +Requires: python2-inotify +Requires: python2-monotonic +%else Requires: python-inotify +Requires: python-monotonic +%endif Requires: python-%{pkg_name}-lang = %{version}-%{release} %description -n python2-%{pkg_name} -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). +%{common_desc} +%if 0%{?with_doc} %package -n python-%{pkg_name}-doc Summary: Documentation for the Oslo Log handling library -BuildRequires: python-sphinx -BuildRequires: python-openstackdocstheme -BuildRequires: python-oslo-config -BuildRequires: python-oslo-utils -BuildRequires: python-oslo-context +BuildRequires: python2-sphinx +BuildRequires: python2-openstackdocstheme +BuildRequires: python2-oslo-config +BuildRequires: python2-oslo-utils %description -n python-%{pkg_name}-doc Documentation for the Oslo Log handling library. +%endif %package -n python2-%{pkg_name}-tests Summary: Tests for the Oslo Log handling library -Requires: python-%{pkg_name} = %{version}-%{release} -Requires: python-mock -Requires: python-oslotest -Requires: python-oslo-config >= 2:4.0.0 -Requires: python-subunit +Requires: python2-%{pkg_name} = %{version}-%{release} +Requires: python2-mock +Requires: python2-oslotest +Requires: python2-oslo-config >= 2:5.1.0 +Requires: python2-subunit +Requires: python2-testtools +%if 0%{?fedora} > 0 +Requires: python2-testrepository +Requires: python2-testscenarios +%else Requires: python-testrepository Requires: python-testscenarios -Requires: python-testtools +%endif %description -n python2-%{pkg_name}-tests -Tests for the Oslo Log handling library. +%{common_desc1} %if 0%{?with_python3} %package -n python3-%{pkg_name}-tests @@ -90,14 +116,14 @@ Summary: Tests for the Oslo Log handling library Requires: python3-%{pkg_name} = %{version}-%{release} Requires: python3-mock Requires: python3-oslotest -Requires: python3-oslo-config >= 2:4.0.0 +Requires: python3-oslo-config >= 2:5.1.0 Requires: python3-subunit Requires: python3-testrepository Requires: python3-testscenarios Requires: python3-testtools %description -n python3-%{pkg_name}-tests -Tests for the Oslo Log handling library. +%{common_desc1} %endif %if 0%{?with_python3} @@ -119,15 +145,15 @@ BuildRequires: python3-testscenarios BuildRequires: python3-testtools BuildRequires: python3-inotify -Requires: python3-babel +Requires: python3-pbr Requires: python3-dateutil Requires: python3-monotonic -Requires: python3-six >= 1.9.0 -Requires: python3-oslo-config >= 2:4.0.0 -Requires: python3-oslo-context >= 2.14.0 -Requires: python3-oslo-i18n >= 2.1.0 -Requires: python3-oslo-utils >= 3.20.0 -Requires: python3-oslo-serialization >= 1.10.0 +Requires: python3-six >= 1.10.0 +Requires: python3-oslo-config >= 2:5.1.0 +Requires: python3-oslo-context >= 2.19.2 +Requires: python3-oslo-i18n >= 3.15.3 +Requires: python3-oslo-utils >= 3.33.0 +Requires: python3-oslo-serialization >= 2.18.0 Requires: python3-debtcollector Requires: python3-inotify Requires: python-%{pkg_name}-lang = %{version}-%{release} @@ -139,9 +165,7 @@ external processes. %endif %description -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). +%{common_desc} %package -n python-%{pkg_name}-lang Summary: Translation files for Oslo log library @@ -160,10 +184,12 @@ rm -rf {test-,}requirements.txt %py3_build %endif +%if 0%{?with_doc} # generate html docs -# %{__python2} setup.py build_sphinx -b html +%{__python2} setup.py build_sphinx -b html # remove the sphinx-build leftovers -# rm -rf doc/build/html/.{doctrees,buildinfo} +rm -rf doc/build/html/.{doctrees,buildinfo} +%endif # Generate i18n files %{__python2} setup.py compile_catalog -d build/lib/oslo_log/locale @@ -191,11 +217,10 @@ rm -rf %{buildroot}%{python3_sitelib}/oslo_log/locale %find_lang oslo_log --all-name %check -# TODO(jpena): Temporarily skipping tests until https://review.openstack.org/430210 is merged -%{__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} @@ -208,9 +233,11 @@ rm -rf .testrepository %{_bindir}/convert-json-%{python2_version} %exclude %{python2_sitelib}/oslo_log/tests +%if 0%{?with_doc} %files -n python-%{pkg_name}-doc -# %doc doc/build/html +%doc doc/build/html %license LICENSE +%endif %files -n python2-%{pkg_name}-tests %{python2_sitelib}/oslo_log/tests @@ -236,18 +263,6 @@ rm -rf .testrepository %changelog -* Mon Jul 23 2018 Matthias Runge - 3.36.0-1 -- rebase to 3.36.0 - -* Sat Jul 14 2018 Fedora Release Engineering - 3.30.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 19 2018 Miro Hrončok - 3.30.0-3 -- Rebuilt for Python 3.7 - -* Fri Feb 09 2018 Fedora Release Engineering - 3.30.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Aug 11 2017 Alfredo Moralejo 3.30.0-1 -- Update to 3.30.0 +* Sat Feb 10 2018 RDO 3.36.0-1 +- Update to 3.36.0