[openstack-keystone/el6-havana: 3/3] Updated patches from el6-havana-patches

[Alan Pevec]

commit b71f0c83d2a1f2f63b7538281c40ec34453105fd
Author: Alan Pevec <apevec at redhat.com>
Date:   Fri Oct 18 03:11:52 2013 +0200

    Updated patches from el6-havana-patches

 0001-remove-runtime-dep-on-python-pbr.patch        |    2 +-
 ...oslo.sphinx-and-remove-local-copy-of-doc-.patch |  176 --------------------
 ...-parameter-values-with-keystone-dist.conf.patch |    2 +-
 ...-parallel-install-versions-of-epel-packag.patch |    4 +-
 ...-httpd-keystone.py-to-httpd-keystone.wsgi.patch |  152 -----------------
 openstack-keystone.spec                            |    8 +-
 6 files changed, 6 insertions(+), 338 deletions(-)
---
diff --git a/0001-remove-runtime-dep-on-python-pbr.patch b/0001-remove-runtime-dep-on-python-pbr.patch
index 00e746f..8ca00cb 100644
--- a/0001-remove-runtime-dep-on-python-pbr.patch
+++ b/0001-remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From c72a9700547a22f7b909ab5bfc3385adde3d59fa Mon Sep 17 00:00:00 2001
+From 9407b8ca7aa5474ddcdaaf203f52858ff4c75d7e 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/0003-sync-parameter-values-with-keystone-dist.conf.patch b/0002-sync-parameter-values-with-keystone-dist.conf.patch
similarity index 96%
rename from 0003-sync-parameter-values-with-keystone-dist.conf.patch
rename to 0002-sync-parameter-values-with-keystone-dist.conf.patch
index 888c77e..010b9d1 100644
--- a/0003-sync-parameter-values-with-keystone-dist.conf.patch
+++ b/0002-sync-parameter-values-with-keystone-dist.conf.patch
@@ -1,4 +1,4 @@
-From 99f1e1f6bfd791f4ed922cbd97980994135f5076 Mon Sep 17 00:00:00 2001
+From 1ded7d36f5e673abb8c37fce2ffd898bd8e844ca 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-Use-updated-parallel-install-versions-of-epel-packag.patch b/0003-Use-updated-parallel-install-versions-of-epel-packag.patch
similarity index 95%
rename from 0005-Use-updated-parallel-install-versions-of-epel-packag.patch
rename to 0003-Use-updated-parallel-install-versions-of-epel-packag.patch
index 144a7f6..18df4e6 100644
--- a/0005-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 d74f55101e1db3577032bbd722e7891b6533b931 Mon Sep 17 00:00:00 2001
+From 835e45f1d94844adb3795d350e5cf2b71dd8de9b 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 02294d2..8f1fe89 100755
+index 1e6aecb..b08ac0a 100755
 --- a/bin/keystone-all
 +++ b/bin/keystone-all
 @@ -31,10 +31,10 @@ if os.path.exists(os.path.join(possible_topdir,
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index 319748c..fb93549 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -24,10 +24,8 @@ Source20:       keystone-dist.conf
 # patches_base=2013.2
 #
 Patch0001: 0001-remove-runtime-dep-on-python-pbr.patch
-Patch0002: 0002-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
-Patch0003: 0003-sync-parameter-values-with-keystone-dist.conf.patch
-Patch0004: 0004-rename-httpd-keystone.py-to-httpd-keystone.wsgi.patch
-Patch0005: 0005-Use-updated-parallel-install-versions-of-epel-packag.patch
+Patch0002: 0002-sync-parameter-values-with-keystone-dist.conf.patch
+Patch0003: 0003-Use-updated-parallel-install-versions-of-epel-packag.patch
 
 BuildArch:      noarch
 
@@ -107,8 +105,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' {} \;