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

[Alan Pevec]

commit 68f47234fdec85af83f621896087e24cb423c99e
Author: Alan Pevec <apevec at redhat.com>
Date:   Wed Dec 18 13:07:52 2013 +0100

    Updated patches from el6-havana-patches

 0001-remove-runtime-dep-on-python-pbr.patch        |    2 +-
 ...-parameter-values-with-keystone-dist.conf.patch |    2 +-
 ...role-assignment-adds-role-using-LDAP-assi.patch |   72 --------------------
 ...-parallel-install-versions-of-epel-packag.patch |    2 +-
 openstack-keystone.spec                            |    4 +-
 5 files changed, 4 insertions(+), 78 deletions(-)
---
diff --git a/0001-remove-runtime-dep-on-python-pbr.patch b/0001-remove-runtime-dep-on-python-pbr.patch
index 2f4f440..1755e95 100644
--- a/0001-remove-runtime-dep-on-python-pbr.patch
+++ b/0001-remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From 9407b8ca7aa5474ddcdaaf203f52858ff4c75d7e Mon Sep 17 00:00:00 2001
+From ff93e5322bed5f3ab7c449949fb37e754726e2fd 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 010b9d1..3b8af08 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 1ded7d36f5e673abb8c37fce2ffd898bd8e844ca Mon Sep 17 00:00:00 2001
+From e811d52d6b550d36505036daf2c855cd3f341fee 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/0004-Use-updated-parallel-install-versions-of-epel-packag.patch b/0003-Use-updated-parallel-install-versions-of-epel-packag.patch
similarity index 97%
rename from 0004-Use-updated-parallel-install-versions-of-epel-packag.patch
rename to 0003-Use-updated-parallel-install-versions-of-epel-packag.patch
index 013d77d..9d238d0 100644
--- a/0004-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 13a39cfb9a06c814aacc24fa4b10946804c07f1c Mon Sep 17 00:00:00 2001
+From 15f842e10e341e23b8f82240c5a52ff1609935cf 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
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index 0e7e602..dd5d198 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -25,8 +25,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-Fix-remove-role-assignment-adds-role-using-LDAP-assi.patch
-Patch0004: 0004-Use-updated-parallel-install-versions-of-epel-packag.patch
+Patch0003: 0003-Use-updated-parallel-install-versions-of-epel-packag.patch
 
 BuildArch:      noarch
 
@@ -106,7 +105,6 @@ This package contains documentation for Keystone.
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
-%patch0004 -p1
 
 find . \( -name .gitignore -o -name .placeholder \) -delete
 find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;