From 37b5ef1f3fd6f4d1e80a32f353785b58d4ca96bf Mon Sep 17 00:00:00 2001
From: Alan Pevec <alan.pevec@redhat.com>
Date: Feb 23 2015 22:11:15 +0000
Subject: Update to upstream 1.7.0


---

diff --git a/.gitignore b/.gitignore
index 1f62019..ed567bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /oslo.config-1.4.0.0a3.tar.gz
 /oslo.config-1.4.0.0a5.tar.gz
 /oslo.config-1.4.0.tar.gz
+/oslo.config-1.7.0.tar.gz
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 cffa10b..6d6cea3 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,4 +1,4 @@
-From 50ae3e476a3c670e6796a5caa9dd2fd69c7ef931 Mon Sep 17 00:00:00 2001
+From 3f4f1731d84a950718c68d0a6069e482f96c93e1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady@redhat.com>
 Date: Mon, 11 Feb 2013 17:32:55 +0000
 Subject: [PATCH] add /usr/share/$project/*-dist.conf to the default config set
@@ -21,14 +21,14 @@ 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 ++++
+ oslo_config/cfg.py | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/oslo/config/cfg.py b/oslo/config/cfg.py
-index 555b910..c5199a1 100644
---- a/oslo/config/cfg.py
-+++ b/oslo/config/cfg.py
-@@ -538,6 +538,10 @@ def find_config_files(project=None, prog=None, extension='.conf'):
+diff --git a/oslo_config/cfg.py b/oslo_config/cfg.py
+index b51b4ec..735d9fb 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'):
  
      config_files = []
      if project:
diff --git a/python-oslo-config.spec b/python-oslo-config.spec
index 84c5fe4..d30e021 100644
--- a/python-oslo-config.spec
+++ b/python-oslo-config.spec
@@ -7,7 +7,7 @@
 
 Name:       python-oslo-config
 Epoch:      2
-Version:    1.4.0
+Version:    1.7.0
 Release:    1%{?dist}
 Summary:    OpenStack common configuration library
 
@@ -15,19 +15,16 @@ Group:      Development/Languages
 License:    ASL 2.0
 URL:        https://launchpad.net/oslo
 Source0:    https://pypi.python.org/packages/source/o/%{sname}/%{sname}-%{version}.tar.gz
-#Source0:    http://tarballs.openstack.org/oslo.config/%{sname}-%{version}%{milestone}.tar.gz
 
-#
-# patches_base=1.4.0
-#
 Patch0001: 0001-add-usr-share-project-dist.conf-to-the-default-confi.patch
 
 BuildArch:  noarch
 Requires:   python-setuptools
 Requires:   python-argparse
-Requires:   python-six >= 1.7.0
+Requires:   python-six >= 1.9.0
 Requires:   python-netaddr
 Requires:   python-stevedore
+Requires:   python-pbr
 
 BuildRequires: python2-devel
 BuildRequires: python-setuptools
@@ -48,7 +45,7 @@ Summary:    Documentation for OpenStack common configuration library
 Group:      Documentation
 
 BuildRequires: python-sphinx
-BuildRequires: python-oslo-sphinx
+BuildRequires: python-oslo-sphinx >= 2.3.0
 
 %description doc
 Documentation for the oslo-config library.
@@ -77,12 +74,8 @@ parsing library from the Oslo project.
 
 %patch0001 -p1
 
-# Remove bundled egg-info
-rm -rf %{sname}.egg-info
 # let RPM handle deps
 rm -f requirements.txt
-# make doc build compatible with python-oslo-sphinx RPM
-sed -i 's/oslosphinx/oslo.sphinx/' doc/source/conf.py
 
 %if 0%{?with_python3}
 rm -rf %{py3dir}
@@ -127,6 +120,7 @@ rm -fr doc/build/html/.buildinfo
 %files
 %doc README.rst LICENSE
 %{_bindir}/oslo-config-generator
+%{python2_sitelib}/oslo_config
 %{python2_sitelib}/oslo
 %{python2_sitelib}/*.egg-info
 %{python2_sitelib}/*-nspkg.pth
@@ -138,12 +132,16 @@ rm -fr doc/build/html/.buildinfo
 %files -n python3-oslo-config
 %doc README.rst LICENSE
 %{_bindir}/python3-oslo-config-generator
+%{python3_sitelib}/oslo_config
 %{python3_sitelib}/oslo
 %{python3_sitelib}/*.egg-info
 %{python3_sitelib}/*-nspkg.pth
 %endif
 
 %changelog
+* Mon Feb 23 2015 Alan Pevec <alan.pevec@redhat.com> 2:1.7.0-1
+- Update to upstream 1.7.0
+
 * Sat Sep 20 2014 Alan Pevec <apevec@redhat.com> - 2:1.4.0
 - Final 1.4.0 release, Epoch bumped to make 1.4.0 win over 1.4.0.0
 
diff --git a/sources b/sources
index 699e8e1..b08e7e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-55bc1515401b92252685c94d556a7257  oslo.config-1.4.0.tar.gz
+b840751ac363b01ac7747c8e406ecfd4  oslo.config-1.7.0.tar.gz