[openstack-keystone/el6-icehouse] Updated patches from el6-icehouse-patches

[Alan Pevec]

commit d3c8b2a0acb5a703ed85413c510db424a4c04938
Author: Alan Pevec <apevec at redhat.com>
Date:   Sat Jan 25 00:47:51 2014 +0100

    Updated patches from el6-icehouse-patches

 0001-remove-runtime-dep-on-python-pbr.patch        |    2 +-
 ...-parameter-values-with-keystone-dist.conf.patch |    2 +-
 ...-parallel-install-versions-of-epel-packag.patch |    4 +-
 ...x10-in-el6-does-not-have-apidoc-extension.patch |   31 ++++++++++++++++++++
 openstack-keystone.spec                            |    2 +
 5 files changed, 37 insertions(+), 4 deletions(-)
---
diff --git a/0001-remove-runtime-dep-on-python-pbr.patch b/0001-remove-runtime-dep-on-python-pbr.patch
index 51e189e..982d212 100644
--- a/0001-remove-runtime-dep-on-python-pbr.patch
+++ b/0001-remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From 53260428c1b1de6d349f094f6fde7352e03b8944 Mon Sep 17 00:00:00 2001
+From d039aa5c52f3701fe7687001ea84227110b468f7 Mon Sep 17 00:00:00 2001
 From: Alan Pevec <apevec at redhat.com>
 Date: Mon, 9 Sep 2013 00:38:42 +0200
 Subject: [PATCH] remove runtime dep on python-pbr
diff --git a/0002-sync-parameter-values-with-keystone-dist.conf.patch b/0002-sync-parameter-values-with-keystone-dist.conf.patch
index f85fdab..69e2eea 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 c00bd925ca2811f6b9c945f29be5cf5265208b72 Mon Sep 17 00:00:00 2001
+From 7a23ac82c95c09d1179baa22ff7c9dc994938f8f 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/0003-Use-updated-parallel-install-versions-of-epel-packag.patch b/0003-Use-updated-parallel-install-versions-of-epel-packag.patch
index ae91e45..e69c7ed 100644
--- a/0003-Use-updated-parallel-install-versions-of-epel-packag.patch
+++ b/0003-Use-updated-parallel-install-versions-of-epel-packag.patch
@@ -1,4 +1,4 @@
-From 0875f62db262d5e10af02ef134c966b5f037ec93 Mon Sep 17 00:00:00 2001
+From 37e84223ee944fdc11d1d68135c072c035473829 Mon Sep 17 00:00:00 2001
 From: Alan Pevec <apevec at redhat.com>
 Date: Mon, 9 Sep 2013 18:58:47 +0200
 Subject: [PATCH] Use updated parallel install versions of epel package
@@ -12,7 +12,7 @@ versions of these packages to satisfy those requirements.
  2 files changed, 31 insertions(+), 2 deletions(-)
 
 diff --git a/bin/keystone-all b/bin/keystone-all
-index 2adf940..96d12cb 100755
+index c1cef5c..63ed8bf 100755
 --- a/bin/keystone-all
 +++ b/bin/keystone-all
 @@ -32,10 +32,10 @@ if os.path.exists(os.path.join(possible_topdir,
diff --git a/0004-sphinx10-in-el6-does-not-have-apidoc-extension.patch b/0004-sphinx10-in-el6-does-not-have-apidoc-extension.patch
new file mode 100644
index 0000000..7008003
--- /dev/null
+++ b/0004-sphinx10-in-el6-does-not-have-apidoc-extension.patch
@@ -0,0 +1,31 @@
+From e0234424689de764ac242bf5d9da40212b16bb23 Mon Sep 17 00:00:00 2001
+From: Alan Pevec <apevec at redhat.com>
+Date: Sat, 25 Jan 2014 00:18:20 +0100
+Subject: [PATCH] sphinx10 in el6 does not have apidoc extension
+
+rpm build was failing with:
+Running Sphinx v1.0.8
+sh: git: command not found
+Extension error:
+Could not import extension ext.apidoc (exception: cannot import name apidoc)
+
+Change-Id: I464f8622e3973e911ba856975607da76cd50cf3b
+---
+ doc/source/conf.py | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/doc/source/conf.py b/doc/source/conf.py
+index 9dcedd8..231cfc0 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -37,10 +37,6 @@ extensions = ['sphinx.ext.autodoc',
+               'sphinx.ext.coverage',
+               'sphinx.ext.viewcode',
+               'oslo.sphinx',
+-              # NOTE(dstanek): Uncomment the [pbr] section in setup.cfg and
+-              # remove this Sphinx extension when
+-              # https://launchpad.net/bugs/1260495 is fixed.
+-              'ext.apidoc',
+               ]
+ 
+ todo_include_todos = True
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index fcba2df..b7a9244 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -28,6 +28,7 @@ Source20:       keystone-dist.conf
 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
 
 BuildArch:      noarch
 
@@ -107,6 +108,7 @@ This package contains documentation for Keystone.
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
+%patch0004 -p1
 
 sed -i 's/%{version}.b%{milestone}/%{version}/' PKG-INFO