diff --git a/.gitignore b/.gitignore index 1490397..29d0246 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /oslo.config-3.17.0.tar.gz /oslo.config-3.22.0.tar.gz /oslo.config-4.11.1.tar.gz +/oslo.config-5.2.0.tar.gz diff --git a/python-oslo-config.spec b/python-oslo-config.spec index 6fa7f6f..4fb5520 100644 --- a/python-oslo-config.spec +++ b/python-oslo-config.spec @@ -9,14 +9,14 @@ Name: python-oslo-config Epoch: 2 -Version: 4.11.1 -Release: 3%{?dist} +Version: 5.2.0 +Release: 1%{?dist} Summary: OpenStack common configuration library Group: Development/Languages License: ASL 2.0 -URL: https://launchpad.net/oslo -Source0: https://tarballs.openstack.org/oslo.config/oslo.config-%{upstream_version}.tar.gz +URL: https://launchpad.net/%{sname} +Source0: https://tarballs.openstack.org/%{sname}/%{sname}-%{upstream_version}.tar.gz Patch0001: 0001-add-usr-share-project-dist.conf-to-the-default-confi.patch @@ -35,14 +35,19 @@ parsing library from the Oslo project. Summary: OpenStack common configuration library %{?python_provide:%python_provide python2-%{pypi_name}} -Requires: python2-netaddr >= 0.7.13 -Requires: python2-oslo-i18n >= 2.1.0 +Requires: python2-oslo-i18n >= 3.15.3 Requires: python2-rfc3986 >= 0.3.1 Requires: python2-pbr -Requires: python2-six >= 1.9.0 +Requires: python2-six >= 1.10.0 Requires: python2-stevedore >= 1.20.0 Requires: python2-debtcollector >= 1.2.0 +%if 0%{?fedora} > 0 +Requires: python2-netaddr >= 0.7.18 Requires: python2-pyyaml >= 3.10 +%else +Requires: python-netaddr >= 0.7.18 +Requires: PyYAML >= 3.10 +%endif BuildRequires: python2-devel BuildRequires: python2-setuptools @@ -65,12 +70,17 @@ Summary: Documentation for OpenStack common configuration library %{?python_provide:%python_provide python2-%{pypi_name}-doc} BuildRequires: python2-fixtures -BuildRequires: python2-netaddr BuildRequires: python2-openstackdocstheme BuildRequires: python2-oslotest >= 1.10.0 BuildRequires: python2-sphinx BuildRequires: python2-stevedore +%if 0%{?fedora} > 0 +BuildRequires: python2-netaddr BuildRequires: python2-pyyaml +%else +BuildRequires: python-netaddr +BuildRequires: PyYAML +%endif %description -n python2-%{pypi_name}-doc Documentation for the oslo-config library. @@ -80,11 +90,11 @@ Documentation for the oslo-config library. Summary: OpenStack common configuration library %{?python_provide:%python_provide python3-%{pypi_name}} -Requires: python3-netaddr >= 0.7.13 -Requires: python3-oslo-i18n >= 2.1.0 +Requires: python3-netaddr >= 0.7.18 +Requires: python3-oslo-i18n >= 3.15.3 Requires: python3-rfc3986 >= 0.3.1 Requires: python3-pbr -Requires: python3-six >= 1.9.0 +Requires: python3-six >= 1.10.0 Requires: python3-stevedore >= 1.20.0 Requires: python3-debtcollector >= 1.2.0 Requires: python3-PyYAML >= 3.10 @@ -100,7 +110,7 @@ BuildRequires: python3-fixtures BuildRequires: python3-netaddr BuildRequires: python3-openstackdocstheme BuildRequires: python3-oslotest >= 1.10.0 -BuildRequires: python3-six >= 1.9.0 +BuildRequires: python3-six >= 1.10.0 BuildRequires: python3-stevedore BuildRequires: python3-PyYAML @@ -136,9 +146,9 @@ mv %{buildroot}%{_bindir}/oslo-config-generator \ %endif %{__python2} setup.py install -O1 --skip-build --root %{buildroot} -# %{__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} %check # Tests disabled because of https://review.openstack.org/#/c/334858 @@ -157,7 +167,7 @@ rm -rf .testrepository %{python2_sitelib}/*.egg-info %files -n python2-%{pypi_name}-doc -# %doc doc/build/html +%doc doc/build/html %license LICENSE %if 0%{?with_python3} @@ -170,16 +180,6 @@ rm -rf .testrepository %endif %changelog -* Fri Feb 09 2018 Fedora Release Engineering - 2:4.11.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Jan 26 2018 Iryna Shcherbina - 2:4.11.1-2 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Thu Sep 28 2017 rdo-trunk 2:4.11.1-1 -- Update to 4.11.1 - -* Fri Aug 11 2017 Alfredo Moralejo 2:4.11.0-1 -- Update to 4.11.0 +* Sat Feb 10 2018 RDO 2:5.2.0-1 +- Update to 5.2.0 diff --git a/sources b/sources index 136eb6a..7bcc740 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (oslo.config-4.11.1.tar.gz) = c7087080ef336d8aaf262a968495afd599f83528a7eefe6d9d13a819ca4d198964550d516abf4bb674eb4bb95c42e278b65cc9bb8e90ef3d6010e24959d393be +SHA512 (oslo.config-5.2.0.tar.gz) = fa3323926f7f7b1a79e4823dfc102027cb466728500980d9f079c2098c93006b4fdeebb2f09bda41512dc854f5dfe080b727fa2d63910e6fc609d69fab87596c