[python-oslo-config] Update to 1.4.0.0a3 milestone

[Alan Pevec]

commit 2e821d237d681e4f227c2da185d9496e79240230
Author: Alan Pevec <alan.pevec at redhat.com>
Date:   Thu Jul 31 23:37:09 2014 +0200

    Update to 1.4.0.0a3 milestone

 .gitignore                                         |    1 +
 ...re-project-dist.conf-to-the-default-confi.patch |    6 +-
 ...oslo.sphinx-and-remove-local-copy-of-doc-.patch | 1347 --------------------
 python-oslo-config.spec                            |   34 +-
 sources                                            |    2 +-
 5 files changed, 29 insertions(+), 1361 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1c07d37..8524d6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /oslo.config-1.2.0a2.tar.gz
 /oslo.config-1.2.0a3.tar.gz
 /oslo.config-1.2.1.tar.gz
+/oslo.config-1.4.0.0a3.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 06b22f8..cffa10b 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 e67c68fe9bcc3db355d46a7ca3347fe4826becc7 Mon Sep 17 00:00:00 2001
+From 50ae3e476a3c670e6796a5caa9dd2fd69c7ef931 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
 Date: Mon, 11 Feb 2013 17:32:55 +0000
 Subject: [PATCH] add /usr/share/$project/*-dist.conf to the default config set
@@ -25,10 +25,10 @@ take precedence over any of the --config-file settings above.
  1 file changed, 4 insertions(+)
 
 diff --git a/oslo/config/cfg.py b/oslo/config/cfg.py
-index 4354886..4b3e25d 100644
+index 555b910..c5199a1 100644
 --- a/oslo/config/cfg.py
 +++ b/oslo/config/cfg.py
-@@ -471,6 +471,10 @@ def find_config_files(project=None, prog=None, extension='.conf'):
+@@ -538,6 +538,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 5716088..3f7ebec 100644
--- a/python-oslo-config.spec
+++ b/python-oslo-config.spec
@@ -1,25 +1,30 @@
 %global sname oslo.config
+%global milestone a3
+
 
 Name:       python-oslo-config
 Epoch:      1
-Version:    1.2.1
-Release:    2%{?dist}
+Version:    1.4.0.0
+Release:    0.1.%{milestone}%{?dist}
 Summary:    OpenStack common configuration library
 
 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:    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.2.1
+# patches_base=1.4.0.0a3
 #
 Patch0001: 0001-add-usr-share-project-dist.conf-to-the-default-confi.patch
-Patch0002: 0002-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
 
 BuildArch:  noarch
 Requires:   python-setuptools
 Requires:   python-argparse
-Requires:   python-six
+Requires:   python-six >= 1.7.0
+Requires:   python-netaddr
+Requires:   python-stevedore
 
 BuildRequires: python2-devel
 BuildRequires: python-setuptools
@@ -40,20 +45,25 @@ Summary:    Documentation for OpenStack common configuration library
 Group:      Documentation
 
 BuildRequires: python-sphinx
+BuildRequires: python-oslo-sphinx
 
 %description doc
 Documentation for the oslo-config library.
 
 %prep
-%setup -q -n %{sname}-%{version}
+%setup -q -n %{sname}-%{version}%{milestone}
 
 %patch0001 -p1
-%patch0002 -p1
+
+sed -i 's/%{version}%{milestone}/%{version}/' PKG-INFO
 
 # Remove bundled egg-info
 rm -rf %{sname}.egg-info
 # let RPM handle deps
-sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py
+rm -f requirements.txt
+# make doc build compatible with python-oslo-sphinx RPM
+sed -i 's/oslosphinx/oslo.sphinx/' doc/source/conf.py
+
 
 %build
 %{__python} setup.py build
@@ -74,7 +84,8 @@ rm -fr doc/build/html/.buildinfo
 %check
 
 %files
-%doc README.rst
+%doc README.rst LICENSE
+%{_bindir}/oslo-config-generator
 %{python_sitelib}/oslo
 %{python_sitelib}/*.egg-info
 %{python_sitelib}/*-nspkg.pth
@@ -83,6 +94,9 @@ rm -fr doc/build/html/.buildinfo
 %doc LICENSE doc/build/html
 
 %changelog
+* Thu Jul 31 2014 - 1.4.0.0-0.1.a3
+- Update to 1.4.0.0a3 milestone
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 5e27fa9..e32db5e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9ba2c7d74a19b16b5b6a33ec057d7eda  oslo.config-1.2.1.tar.gz
+7ae9710139a34e65f94cba5c46658d64  oslo.config-1.4.0.0a3.tar.gz