diff --git a/0001-add-usr-share-project-dist.conf-to-the-default-confi.patch b/0001-add-usr-share-project-dist.conf-to-the-default-confi.patch index 88cac71..98f2ba1 100644 --- a/0001-add-usr-share-project-dist.conf-to-the-default-confi.patch +++ b/0001-add-usr-share-project-dist.conf-to-the-default-confi.patch @@ -1,6 +1,6 @@ -From 37b6d32f43c2f0f11a87674a8dc1278af09fdec9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?P=C3=A1draig=20Brady?= -Date: Mon, 11 Feb 2013 17:32:55 +0000 +From 9e78caadf9a668f799de1274a729d0b157a83330 Mon Sep 17 00:00:00 2001 +From: Javier Pena +Date: Fri, 2 Dec 2016 17:02:46 +0100 Subject: [PATCH] add /usr/share/$project/*-dist.conf to the default config set This will lookup /usr/share/$project/$project-dist.conf @@ -21,21 +21,28 @@ and settings from there are overridden by any from For completeness, note settings in configs from --config-dir take precedence over any of the --config-file settings above. --- - oslo_config/cfg.py | 4 ++++ - 1 file changed, 4 insertions(+) + oslo_config/cfg.py | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/oslo_config/cfg.py b/oslo_config/cfg.py -index 77fd44d..902d5a5 100644 +index b7b10bf..564341a 100644 --- a/oslo_config/cfg.py +++ b/oslo_config/cfg.py -@@ -550,6 +550,10 @@ def find_config_files(project=None, prog=None, extension='.conf'): +@@ -651,8 +651,12 @@ def _find_config_files(project, prog, extension): + prog = prog[:-3] - config_files = [] - if project: -+ config_files.append(_search_dirs(['/usr/share/%s/' % project], -+ project, '-dist%s' % extension)) -+ config_files.append(_search_dirs(['/usr/share/%s/' % project], -+ prog, '-dist%s' % extension)) - config_files.append(_search_dirs(cfg_dirs, project, extension)) - config_files.append(_search_dirs(cfg_dirs, prog, extension)) + cfg_dirs = _get_config_dirs(project) +- config_files = (_search_dirs(cfg_dirs, p, extension) +- for p in [project, prog] if p) ++ config_files = [_search_dirs(['/usr/share/%s/' % project], p, ++ '-dist%s' % extension) ++ for p in [project, prog] if p] ++ config_files_default = (_search_dirs(cfg_dirs, p, extension) ++ for p in [project, prog] if p) ++ config_files.extend([x for x in config_files_default if x]) + return [x for x in config_files if x] + +-- +2.7.4 + diff --git a/Changelog.old b/Changelog.old index 71f1ae3..3046b2a 100644 --- a/Changelog.old +++ b/Changelog.old @@ -1,3 +1,15 @@ +* Sat Feb 11 2017 Fedora Release Engineering - 2:3.17.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Dec 19 2016 Miro Hrončok - 2:3.17.0-3 +- Rebuild for Python 3.6 + +* Mon Nov 28 2016 Charalampos Stratakis 2:3.17.0-2 +- Remove obsolete python-argparse runtime requirement. + +* Tue Sep 06 2016 Haikel Guemar 2:3.17.0-1 +- Update to 3.17.0 + * Tue Jul 19 2016 Fedora Release Engineering - 2:3.9.0-2 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages diff --git a/python-oslo-config.spec b/python-oslo-config.spec index 2d16fd1..80ad4e6 100644 --- a/python-oslo-config.spec +++ b/python-oslo-config.spec @@ -9,14 +9,14 @@ Name: python-oslo-config Epoch: 2 -Version: 3.17.0 -Release: 4%{?dist} +Version: 3.22.0 +Release: 1%{?dist} Summary: OpenStack common configuration library Group: Development/Languages License: ASL 2.0 URL: https://launchpad.net/oslo -Source0: http://tarballs.openstack.org/oslo.config/oslo.config-%{upstream_version}.tar.gz +Source0: https://tarballs.openstack.org/oslo.config/oslo.config-%{upstream_version}.tar.gz Patch0001: 0001-add-usr-share-project-dist.conf-to-the-default-confi.patch @@ -38,20 +38,20 @@ Summary: OpenStack common configuration library Provides: python-%{pypi_name} = %{epoch}:%{upstream_version} Obsoletes: python-%{pypi_name} < %{epoch}:%{upstream_version} -Requires: python2-netaddr >= 0.7.12 -Requires: python2-oslo-i18n >= 2.1.0 -Requires: python2-rfc3986 >= 0.2.0 -Requires: python2-pbr -Requires: python2-setuptools -Requires: python2-six >= 1.9.0 -Requires: python2-stevedore >= 1.10.0 -Requires: python2-debtcollector >= 1.2.0 +Requires: python-netaddr >= 0.7.13 +Requires: python-oslo-i18n >= 2.1.0 +Requires: python-rfc3986 >= 0.2.2 +Requires: python-pbr +Requires: python-setuptools +Requires: python-six >= 1.9.0 +Requires: python-stevedore >= 1.17.1 +Requires: python-debtcollector >= 1.2.0 BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-oslo-i18n -BuildRequires: python2-rfc3986 -BuildRequires: python2-pbr +BuildRequires: python-setuptools +BuildRequires: python-oslo-i18n +BuildRequires: python-rfc3986 +BuildRequires: python-pbr BuildRequires: git %description -n python2-%{pypi_name} @@ -71,11 +71,11 @@ Provides: python-%{pypi_name}-doc = %{epoch}:%{upstream_version} Obsoletes: python-%{pypi_name}-doc < %{epoch}:%{upstream_version} BuildRequires: python-fixtures -BuildRequires: python2-netaddr -BuildRequires: python2-oslo-sphinx >= 2.3.0 -BuildRequires: python2-oslotest >= 1.10.0 -BuildRequires: python2-sphinx -BuildRequires: python2-stevedore +BuildRequires: python-netaddr +BuildRequires: python-oslo-sphinx >= 2.3.0 +BuildRequires: python-oslotest >= 1.10.0 +BuildRequires: python-sphinx +BuildRequires: python-stevedore %description -n python2-%{pypi_name}-doc Documentation for the oslo-config library. @@ -85,13 +85,13 @@ Documentation for the oslo-config library. Summary: OpenStack common configuration library %{?python_provide:%python_provide python3-%{pypi_name}} -Requires: python3-netaddr >= 0.7.12 +Requires: python3-netaddr >= 0.7.13 Requires: python3-oslo-i18n >= 2.1.0 -Requires: python3-rfc3986 >= 0.2.0 +Requires: python3-rfc3986 >= 0.2.2 Requires: python3-pbr Requires: python3-setuptools Requires: python3-six >= 1.9.0 -Requires: python3-stevedore >= 1.10.0 +Requires: python3-stevedore >= 1.17.1 Requires: python3-debtcollector >= 1.2.0 BuildRequires: python3-devel @@ -175,15 +175,6 @@ rm -rf .testrepository %endif %changelog -* Sat Feb 11 2017 Fedora Release Engineering - 2:3.17.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Dec 19 2016 Miro Hrončok - 2:3.17.0-3 -- Rebuild for Python 3.6 - -* Mon Nov 28 2016 Charalampos Stratakis 2:3.17.0-2 -- Remove obsolete python-argparse runtime requirement. - -* Tue Sep 06 2016 Haikel Guemar 2:3.17.0-1 -- Update to 3.17.0 +* Tue Feb 07 2017 Alfredo Moralejo 2:3.22.0-1 +- Update to 3.22.0