From af6f3ae80b4fc8704655c1f3fd6a68d01ccda353 Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec@redhat.com>
Date: Aug 20 2013 18:54:31 +0000
Subject: Look also for $prog-dist.conf for glance-manage


rhbz#997290

---

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
new file mode 100644
index 0000000..4836c5d
--- /dev/null
+++ b/0001-add-usr-share-project-dist.conf-to-the-default-confi.patch
@@ -0,0 +1,41 @@
+From d8754a26b5dc4ed622a6f71da21f9f8d9bff3246 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
+
+This will lookup /usr/share/$project/$project-dist.conf
+and /usr/share/$project/$prog-dist.conf
+in the correct precedence order by default.
+For example from command line utils which don't specify
+the --config-file option.  Note if daemon init scripts
+explicitly specify a --config-file then they must specify
+all required.
+
+For reference the precedence order is that later --config-file
+options will override settings from previous ones.
+So when no --config-file option is specified, we insert
+the "dist" config file as the first to be parsed,
+and settings from there are overridden by any from
+/etc/$project/$project.conf and /etc/$prog.conf respectively.
+
+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(+)
+
+diff --git a/oslo/config/cfg.py b/oslo/config/cfg.py
+index bf8613a..7cd1257 100644
+--- a/oslo/config/cfg.py
++++ b/oslo/config/cfg.py
+@@ -463,6 +463,10 @@ def find_config_files(project=None, prog=None, extension='.conf'):
+ 
+     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))
+ 
diff --git a/0001-add-usr-share-project-project-dist.conf-to-the-defau.patch b/0001-add-usr-share-project-project-dist.conf-to-the-defau.patch
deleted file mode 100644
index b443016..0000000
--- a/0001-add-usr-share-project-project-dist.conf-to-the-defau.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 97606faeb64d8d95d66b9c5230611bf9144f2de8 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/$project-dist.conf to the default
- config set
-
-This will lookup /usr/share/$project/$project-dist.conf
-in the correct precedence order by default.
-For example from command line utils which don't specify
-the --config-file option.  Note if daemon init scripts
-explicitly specify a --config-file then they must specify
-all required.
-
-For reference the precedence order is that later --config-file
-options will override settings from previous ones.
-So when no --config-file option is specified, we insert
-the "dist" config file as the first to be parsed,
-and settings from there are overridden by any from
-/etc/$project/$project.conf and /etc/$prog.conf respectively.
-
-For completeness, note settings in configs from --config-dir
-take precedence over any of the --config-file settings above.
----
- oslo/config/cfg.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/oslo/config/cfg.py b/oslo/config/cfg.py
-index 7214025..1930c4e 100644
---- a/oslo/config/cfg.py
-+++ b/oslo/config/cfg.py
-@@ -456,6 +456,8 @@ def find_config_files(project=None, prog=None, extension='.conf'):
- 
-     config_files = []
-     if project:
-+        config_files.append(_search_dirs(['/usr/share/%s/' % project],
-+                                         project, '-dist%s' % extension))
-         config_files.append(_search_dirs(cfg_dirs, project, extension))
-     config_files.append(_search_dirs(cfg_dirs, prog, extension))
- 
--- 
-1.7.11.7
-
diff --git a/python-oslo-config.spec b/python-oslo-config.spec
index f1c7e44..affa2db 100644
--- a/python-oslo-config.spec
+++ b/python-oslo-config.spec
@@ -4,14 +4,17 @@
 Name:       python-oslo-config
 Epoch:      1
 Version:    1.2.0
-Release:    0.4.%{milestone}%{?dist}
+Release:    0.5.%{milestone}%{?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/%{sname}-%{version}%{milestone}.tar.gz
-Patch0:     0001-add-usr-share-project-project-dist.conf-to-the-defau.patch
+#
+# patches_base=1.2.0a3
+#
+Patch0001: 0001-add-usr-share-project-dist.conf-to-the-default-confi.patch
 
 BuildArch:  noarch
 Requires:   python-setuptools
@@ -44,7 +47,7 @@ Documentation for the oslo-config library.
 %prep
 %setup -q -n %{sname}-%{version}%{milestone}
 
-%patch0 -p1
+%patch0001 -p1
 
 sed -i 's/%{version}%{milestone}/%{version}/' PKG-INFO
 
@@ -81,6 +84,9 @@ rm -fr doc/build/html/.buildinfo
 %doc LICENSE doc/build/html
 
 %changelog
+* Tue Aug 20 2013 apevec@redhat.com 1.2.0-0.5.a3
+- Look also for $prog-dist.conf for glance-manage
+
 * Thu Aug 8 2013 pbrady@redhat.com - 1:1.2.0-0.4.a3
 - Look for /usr/share/$project/$project-dist.conf by default