diff --git a/.gitignore b/.gitignore index 4a5abc6..1490397 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /oslo.config-3.9.0.tar.gz /oslo.config-3.17.0.tar.gz /oslo.config-3.22.0.tar.gz +/oslo.config-4.11.1.tar.gz diff --git a/python-oslo-config.spec b/python-oslo-config.spec index 97d96cc..a80180b 100644 --- a/python-oslo-config.spec +++ b/python-oslo-config.spec @@ -9,8 +9,8 @@ Name: python-oslo-config Epoch: 2 -Version: 3.22.0 -Release: 2%{?dist} +Version: 4.11.1 +Release: 1%{?dist} Summary: OpenStack common configuration library Group: Development/Languages @@ -34,18 +34,15 @@ parsing library from the Oslo project. %package -n python2-%{pypi_name} Summary: OpenStack common configuration library %{?python_provide:%python_provide python2-%{pypi_name}} -# python_provide does not exist in CBS Cloud buildroot -Provides: python-%{pypi_name} = %{epoch}:%{upstream_version} -Obsoletes: python-%{pypi_name} < %{epoch}:%{upstream_version} Requires: python-netaddr >= 0.7.13 Requires: python-oslo-i18n >= 2.1.0 -Requires: python-rfc3986 >= 0.2.2 +Requires: python-rfc3986 >= 0.3.1 Requires: python-pbr -Requires: python-setuptools Requires: python-six >= 1.9.0 -Requires: python-stevedore >= 1.17.1 +Requires: python-stevedore >= 1.20.0 Requires: python-debtcollector >= 1.2.0 +Requires: PyYAML >= 3.10 BuildRequires: python2-devel BuildRequires: python-setuptools @@ -66,16 +63,14 @@ parsing library from the Oslo project. %package -n python2-%{pypi_name}-doc Summary: Documentation for OpenStack common configuration library %{?python_provide:%python_provide python2-%{pypi_name}-doc} -# python_provide does not exist in CBS Cloud buildroot -Provides: python-%{pypi_name}-doc = %{epoch}:%{upstream_version} -Obsoletes: python-%{pypi_name}-doc < %{epoch}:%{upstream_version} BuildRequires: python-fixtures BuildRequires: python-netaddr -BuildRequires: python-oslo-sphinx >= 2.3.0 +BuildRequires: python-openstackdocstheme BuildRequires: python-oslotest >= 1.10.0 BuildRequires: python-sphinx BuildRequires: python-stevedore +BuildRequires: PyYAML %description -n python2-%{pypi_name}-doc Documentation for the oslo-config library. @@ -87,12 +82,12 @@ Summary: OpenStack common configuration library Requires: python3-netaddr >= 0.7.13 Requires: python3-oslo-i18n >= 2.1.0 -Requires: python3-rfc3986 >= 0.2.2 +Requires: python3-rfc3986 >= 0.3.1 Requires: python3-pbr -Requires: python3-setuptools Requires: python3-six >= 1.9.0 -Requires: python3-stevedore >= 1.17.1 +Requires: python3-stevedore >= 1.20.0 Requires: python3-debtcollector >= 1.2.0 +Requires: python3-PyYAML >= 3.10 BuildRequires: python3-devel BuildRequires: python3-oslo-i18n @@ -103,10 +98,11 @@ BuildRequires: git # Required for tests BuildRequires: python3-fixtures BuildRequires: python3-netaddr -BuildRequires: python3-oslo-sphinx >= 2.3.0 +BuildRequires: python3-openstackdocstheme BuildRequires: python3-oslotest >= 1.10.0 BuildRequires: python3-six >= 1.9.0 BuildRequires: python3-stevedore +BuildRequires: python3-PyYAML %description -n python3-%{pypi_name} The Oslo project intends to produce a python library containing @@ -140,10 +136,9 @@ mv %{buildroot}%{_bindir}/oslo-config-generator \ %endif %{__python2} setup.py install -O1 --skip-build --root %{buildroot} -export PYTHONPATH="$( pwd ):$PYTHONPATH" -pushd doc -sphinx-build -b html -d build/doctrees source build/html -popd +# %{__python2} setup.py build_sphinx -b html +# remove the sphinx-build leftovers +# rm -rf doc/build/html/.{doctrees,buildinfo} %check # Tests disabled because of https://review.openstack.org/#/c/334858 @@ -162,7 +157,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} @@ -175,9 +170,9 @@ rm -rf .testrepository %endif %changelog -* Thu Jul 27 2017 Fedora Release Engineering - 2:3.22.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild +* Thu Sep 28 2017 rdo-trunk 2:4.11.1-1 +- Update to 4.11.1 -* Tue Feb 07 2017 Alfredo Moralejo 2:3.22.0-1 -- Update to 3.22.0 +* Fri Aug 11 2017 Alfredo Moralejo 2:4.11.0-1 +- Update to 4.11.0 diff --git a/sources b/sources index 56553f9..136eb6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (oslo.config-3.22.0.tar.gz) = 2bc8b18f32baffc91a06b2b94b0adbe36c921d89b2737328689cec6646a0f8c34d9e015b330001ccdfcb606b381a27adeaa8da9461eee701f63f0edf963f43b8 +SHA512 (oslo.config-4.11.1.tar.gz) = c7087080ef336d8aaf262a968495afd599f83528a7eefe6d9d13a819ca4d198964550d516abf4bb674eb4bb95c42e278b65cc9bb8e90ef3d6010e24959d393be