[openstack-keystone/el6-icehouse] Drop remaining parallel installables

[Alan Pevec]

commit f923ffd4b64ae6c47bafd7707ff434c8797172a5
Author: Alan Pevec <apevec at redhat.com>
Date:   Mon May 5 20:46:24 2014 +0200

    Drop remaining parallel installables
    
    Use updated version of the normal packages available in RDO repo.

 ...-parameter-values-with-keystone-dist.conf.patch |    2 +-
 ...-parallel-install-versions-of-epel-packag.patch |   62 --------------------
 ...3-refactor-service-readiness-notification.patch |   16 +++---
 ...x10-in-el6-does-not-have-apidoc-extension.patch |   29 ---------
 openstack-keystone.spec                            |   34 +++++------
 5 files changed, 23 insertions(+), 120 deletions(-)
---
diff --git a/0002-sync-parameter-values-with-keystone-dist.conf.patch b/0002-sync-parameter-values-with-keystone-dist.conf.patch
index 952576a..173ecdf 100644
--- a/0002-sync-parameter-values-with-keystone-dist.conf.patch
+++ b/0002-sync-parameter-values-with-keystone-dist.conf.patch
@@ -1,4 +1,4 @@
-From cbcd4831111370c14dfea89017155eb69f87fb88 Mon Sep 17 00:00:00 2001
+From 3a1178ea75131708e80676de56e9705b9a556a31 Mon Sep 17 00:00:00 2001
 From: Alan Pevec <apevec at redhat.com>
 Date: Mon, 9 Sep 2013 15:22:20 +0200
 Subject: [PATCH] sync parameter values with keystone-dist.conf
diff --git a/0005-refactor-service-readiness-notification.patch b/0003-refactor-service-readiness-notification.patch
similarity index 95%
rename from 0005-refactor-service-readiness-notification.patch
rename to 0003-refactor-service-readiness-notification.patch
index a1dee18..439ea51 100644
--- a/0005-refactor-service-readiness-notification.patch
+++ b/0003-refactor-service-readiness-notification.patch
@@ -1,4 +1,4 @@
-From b2fa58cb6c34ff9c42e7674c945486390b2ca387 Mon Sep 17 00:00:00 2001
+From 9d9601c972745cdfa4bb44ce45fceb2beb8c70df Mon Sep 17 00:00:00 2001
 From: Alan Pevec <apevec at redhat.com>
 Date: Sun, 9 Mar 2014 23:27:46 +0100
 Subject: [PATCH] refactor service readiness notification
@@ -18,18 +18,18 @@ import and apply new oslo systemd module
  create mode 100644 keystone/openstack/common/systemd.py
 
 diff --git a/bin/keystone-all b/bin/keystone-all
-index 7683f93..07fe92e 100755
+index 315f3c1..571b733 100755
 --- a/bin/keystone-all
 +++ b/bin/keystone-all
-@@ -32,6 +32,7 @@ if os.path.exists(os.path.join(possible_topdir,
- 
- 
- from keystone.openstack.common import gettextutils
+@@ -47,6 +47,7 @@ from keystone.common import utils
+ from keystone import config
+ from keystone.openstack.common.gettextutils import _
+ from keystone.openstack.common import importutils
 +from keystone.openstack.common import systemd
+ from keystone import service
  
- from paste import deploy
  
-@@ -83,15 +84,7 @@ def serve(*servers):
+@@ -82,15 +83,7 @@ def serve(*servers):
              raise
  
      # notify calling process we are ready to serve
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index 09b08f0..c8e8583 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -7,7 +7,7 @@
 
 Name:           openstack-keystone
 Version:        2014.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        OpenStack Identity Service
 
 License:        ASL 2.0
@@ -26,22 +26,20 @@ Source21:       daemon_notify.sh
 #
 Patch0001: 0001-remove-runtime-dep-on-python-pbr.patch
 Patch0002: 0002-sync-parameter-values-with-keystone-dist.conf.patch
-Patch0003: 0003-Use-updated-parallel-install-versions-of-epel-packag.patch
-Patch0004: 0004-sphinx10-in-el6-does-not-have-apidoc-extension.patch
-Patch0005: 0005-refactor-service-readiness-notification.patch
+Patch0003: 0003-refactor-service-readiness-notification.patch
 
 BuildArch:      noarch
 
 BuildRequires:  python2-devel
-BuildRequires:  python-sphinx10
+BuildRequires:  python-sphinx >= 1.1.2
 BuildRequires:  python-oslo-sphinx
 BuildRequires:  python-pbr
 BuildRequires:  python-d2to1
 # These are required to build due to the requirements check added
-BuildRequires:  python-sqlalchemy0.7
+BuildRequires:  python-sqlalchemy >= 0.7.8
 BuildRequires:  python-webob >= 1.2.3
-BuildRequires:  python-paste-deploy1.5
-BuildRequires:  python-routes1.12
+BuildRequires:  python-paste-deploy >= 1.5.0
+BuildRequires:  python-routes >= 1.12
 
 Requires:       python-keystone = %{version}-%{release}
 Requires:       python-keystoneclient >= 1:0.6.0
@@ -71,9 +69,9 @@ Requires:       python-ldap
 Requires:       python-lxml
 Requires:       python-memcached
 Requires:       python-migrate
-Requires:       python-paste-deploy1.5
-Requires:       python-routes1.12
-Requires:       python-sqlalchemy0.7
+Requires:       python-paste-deploy >= 1.5.0
+Requires:       python-routes >= 1.12
+Requires:       python-sqlalchemy >= 0.7.8
 Requires:       python-webob >= 1.2.3
 Requires:       python-passlib
 Requires:       python-setuptools
@@ -115,8 +113,6 @@ This package contains documentation for Keystone.
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
-%patch0004 -p1
-%patch0005 -p1
 
 find . \( -name .gitignore -o -name .placeholder \) -delete
 find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
@@ -167,13 +163,8 @@ install -d -m 755 %{buildroot}%{_localstatedir}/run/keystone
 # docs generation requires everything to be installed first
 export PYTHONPATH="$( pwd ):$PYTHONPATH"
 pushd doc
-if [ -x /usr/bin/sphinx-apidoc ]; then
-    make html
-    make man
-else
-    make html SPHINXAPIDOC=echo SPHINXBUILD=sphinx-1.0-build
-    make man SPHINXAPIDOC=echo SPHINXBUILD=sphinx-1.0-build
-fi
+make html
+make man
 mkdir -p %{buildroot}%{_mandir}/man1
 install -p -D -m 644 build/man/*.1 %{buildroot}%{_mandir}/man1/
 popd
@@ -259,6 +250,9 @@ fi
 %endif
 
 %changelog
+* Mon May 05 2014 Alan Pevec <apevec at redhat.com> 2014.1-3
+- Drop parallel python packages in RDO el6
+
 * Thu Apr 17 2014 Alan Pevec <apevec at redhat.com> 2014.1-2
 - Icehouse release