diff --git a/.gitignore b/.gitignore index 171f618..a495ac6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /oslo.log-1.8.0.tar.gz /oslo.log-1.10.0.tar.gz /oslo.log-1.11.0.tar.gz +/oslo.log-3.2.0.tar.gz diff --git a/Changelog.old b/Changelog.old new file mode 100644 index 0000000..b19dfa5 --- /dev/null +++ b/Changelog.old @@ -0,0 +1,25 @@ +* Thu Feb 04 2016 Fedora Release Engineering - 1.11.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Sep 18 2015 Alan Pevec 1.11.0-1 +- Update to upstream 1.11.0 + +* Thu Sep 03 2015 Alan Pevec 1.10.0-1 +- Update to upstream 1.10.0 + +* Wed Aug 05 2015 Alan Pevec 1.8.0-1 +- Update to upstream 1.8.0 + +* Mon Jun 29 2015 Alan Pevec 1.5.0-1 +- Update to upstream 1.5.0 + +* Thu Jun 18 2015 Fedora Release Engineering - 1.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Mar 26 2015 Haïkel Guémar - 1.0.0-1 +- Upstream 1.0.0 +- Based on Derek Higgins spec from Delorean + +* Tue Mar 22 2016 Haikel Guemar 3.2.0- +- Update to 3.2.0 + diff --git a/python-oslo-log.spec b/python-oslo-log.spec index 549d16b..4ac52be 100644 --- a/python-oslo-log.spec +++ b/python-oslo-log.spec @@ -1,9 +1,15 @@ -%{!?_licensedir:%global license %%doc} +%if 0%{?fedora} >= 24 +%global with_python3 1 +%endif + +%{!?upstream_version: %global upstream_version %{version}%{?milestone}} + %global pypi_name oslo.log +%global pkg_name oslo-log Name: python-oslo-log -Version: 1.11.0 -Release: 2%{?dist} +Version: 3.2.0 +Release: 1%{?dist} Summary: OpenStack Oslo Log library License: ASL 2.0 @@ -11,25 +17,41 @@ URL: http://launchpad.net/oslo Source0: https://pypi.python.org/packages/source/o/%{pypi_name}/%{pypi_name}-%{version}.tar.gz BuildArch: noarch +%package -n python2-%{pkg_name} +Summary: OpenStack Oslo Log library +%{?python_provide:%python_provide python2-%{pkg_name}} + BuildRequires: python2-devel BuildRequires: python-pbr +# Required for tests +BuildRequires: python-dateutil +BuildRequires: python-mock +BuildRequires: python-oslotest +BuildRequires: python-oslo-config +BuildRequires: python-oslo-serialization +BuildRequires: python-subunit +BuildRequires: python-testrepository +BuildRequires: python-testscenarios +BuildRequires: python-testtools +BuildRequires: python-inotify Requires: python-babel +Requires: python-dateutil Requires: python-six >= 1.9.0 -Requires: python-iso8601 Requires: python-oslo-config Requires: python-oslo-context Requires: python-oslo-i18n Requires: python-oslo-utils Requires: python-oslo-serialization Requires: python-debtcollector +Requires: python-inotify -%description +%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). -%package doc +%package -n python-%{pkg_name}-doc Summary: Documentation for the Oslo Log handling library BuildRequires: python-sphinx @@ -38,59 +60,118 @@ BuildRequires: python-oslo-config BuildRequires: python-oslo-utils BuildRequires: python-oslo-context -%description doc +%description -n python-%{pkg_name}-doc Documentation for the Oslo Log handling library. +%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 +Requires: python-subunit +Requires: python-testrepository +Requires: python-testscenarios +Requires: python-testtools + +%description -n python2-%{pkg_name}-tests +Tests for the Oslo Log handling library. + +%if 0%{?with_python3} +%package -n python3-%{pkg_name} +Summary: OpenStack Oslo Log library +%{?python_provide:%python_provide python3-%{pkg_name}} + +BuildRequires: python3-devel +BuildRequires: python3-pbr +# Required for tests +BuildRequires: python3-dateutil +BuildRequires: python3-mock +BuildRequires: python3-oslotest +BuildRequires: python3-oslo-config +BuildRequires: python3-oslo-serialization +BuildRequires: python3-subunit +BuildRequires: python3-testrepository +BuildRequires: python3-testscenarios +BuildRequires: python3-testtools +BuildRequires: python3-inotify + +Requires: python3-babel +Requires: python3-dateutil +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-debtcollector +Requires: python3-inotify + +%description -n python3-%{pkg_name} +Oslo concurrency library has utilities for safely running multi-thread, +multi-process applications using locking mechanisms and for running +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). %prep -%setup -q -n %{pypi_name}-%{version} +%setup -q -n %{pypi_name}-%{upstream_version} # Let RPM handle the dependencies -rm -f requirements.txt - +rm -rf {test-,}requirements.txt %build -%{__python2} setup.py build +%py2_build +%if 0%{?with_python3} +%py3_build +%endif # generate html docs -sphinx-build doc/source html +PYTHONPATH=. sphinx-build doc/source html # remove the sphinx-build leftovers rm -rf html/.{doctrees,buildinfo} - %install -%{__python2} setup.py install --skip-build --root %{buildroot} - - -%files +%py2_install +%if 0%{?with_python3} +%py3_install +%endif + +%check +%{__python2} setup.py test +%if 0%{?with_python3} +rm -rf .testrepository +%{__python3} setup.py test +%endif + +%files -n python2-%{pkg_name} %doc README.rst ChangeLog AUTHORS %license LICENSE %{python2_sitelib}/oslo_log %{python2_sitelib}/*.egg-info +%exclude %{python2_sitelib}/oslo_log/tests -%files doc +%files -n python-%{pkg_name}-doc %doc html %license LICENSE -%changelog -* Thu Feb 04 2016 Fedora Release Engineering - 1.11.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Sep 18 2015 Alan Pevec 1.11.0-1 -- Update to upstream 1.11.0 - -* Thu Sep 03 2015 Alan Pevec 1.10.0-1 -- Update to upstream 1.10.0 - -* Wed Aug 05 2015 Alan Pevec 1.8.0-1 -- Update to upstream 1.8.0 - -* Mon Jun 29 2015 Alan Pevec 1.5.0-1 -- Update to upstream 1.5.0 +%files -n python2-%{pkg_name}-tests +%{python2_sitelib}/oslo_log/tests -* Thu Jun 18 2015 Fedora Release Engineering - 1.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild +%if 0%{?with_python3} +%files -n python3-%{pkg_name} +%doc README.rst ChangeLog AUTHORS +%license LICENSE +%{python3_sitelib}/oslo_log +%{python3_sitelib}/*.egg-info +%exclude %{python3_sitelib}/oslo_log/tests +%endif -* Thu Mar 26 2015 Haïkel Guémar - 1.0.0-1 -- Upstream 1.0.0 -- Based on Derek Higgins spec from Delorean +%changelog +* Tue Mar 22 2016 Haikel Guemar 3.2.0- +- Update to 3.2.0 diff --git a/sources b/sources index f34595b..7cbd001 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d51e0e13e7f95d1568d953c97d38448 oslo.log-1.11.0.tar.gz +449f480fb373bee22e3b4b9b7597eb14 oslo.log-3.2.0.tar.gz