commit b4852a3678313e1c303aa0b637838a2db1ba1846
Author: Alan Pevec <apevec at redhat.com>
Date: Tue Sep 10 00:04:24 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 | 2 +-
...-parameter-values-with-keystone-dist.conf.patch | 2 +-
...-parallel-install-versions-of-epel-packag.patch | 45 ++++++++++++-------
openstack-keystone.spec | 4 +-
5 files changed, 33 insertions(+), 22 deletions(-)
---
diff --git a/0001-remove-runtime-dep-on-python-pbr.patch b/0001-remove-runtime-dep-on-python-pbr.patch
index 3c5f9f7..43a23a5 100644
--- a/0001-remove-runtime-dep-on-python-pbr.patch
+++ b/0001-remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From 3b50184045190a3b0605eece06b37ff99972a083 Mon Sep 17 00:00:00 2001
+From f30c64ddccf7eeeec2bc70b001a2bf30a2085630 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-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch b/0002-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
index 4cc074d..48ab147 100644
--- a/0002-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
+++ b/0002-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
@@ -1,4 +1,4 @@
-From b47233d237dd695362975ddf3587bc327355f53d Mon Sep 17 00:00:00 2001
+From d7a1a420891bddbbc35560f48d5619cc81e2ded5 Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec at redhat.com>
Date: Mon, 9 Sep 2013 00:51:04 +0200
Subject: [PATCH] Revert "Use oslo.sphinx and remove local copy of doc theme"
diff --git a/0003-sync-parameter-values-with-keystone-dist.conf.patch b/0003-sync-parameter-values-with-keystone-dist.conf.patch
index 8c523e6..d8a9764 100644
--- a/0003-sync-parameter-values-with-keystone-dist.conf.patch
+++ b/0003-sync-parameter-values-with-keystone-dist.conf.patch
@@ -1,4 +1,4 @@
-From d55ad70e6319c50c0ddcbaadfe87fb8d00749f5d Mon Sep 17 00:00:00 2001
+From 7968a7a6c23e5e0b56eca4e0e8bb548356a68ecc 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/openstack-keystone-newdeps.patch b/0004-Use-updated-parallel-install-versions-of-epel-packag.patch
similarity index 52%
rename from openstack-keystone-newdeps.patch
rename to 0004-Use-updated-parallel-install-versions-of-epel-packag.patch
index fca468c..60ea179 100644
--- a/openstack-keystone-newdeps.patch
+++ b/0004-Use-updated-parallel-install-versions-of-epel-packag.patch
@@ -1,26 +1,37 @@
-diff -Naur keystone-2013.2.b2.orig/bin/keystone-all keystone-2013.2.b2/bin/keystone-all
---- keystone-2013.2.b2.orig/bin/keystone-all 2013-07-18 19:01:20.000000000 +0000
-+++ keystone-2013.2.b2/bin/keystone-all 2013-07-22 00:31:19.289679079 +0000
-@@ -17,7 +17,6 @@
+From 87fdcc5f0e53b6dcdcfc8dc0b10a3ebe662c9c35 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
+
+Use SQLAlchemy >= 0.7.8 WebOb >= 1.2 Routes >= 1.12.3 PasteDeploy >= 1.5.0
+and depend on the parallel installable
+versions of these packages to satisfy those requirements.
+---
+ bin/keystone-all | 4 ++--
+ keystone/__init__.py | 29 +++++++++++++++++++++++++++++
+ 2 files changed, 31 insertions(+), 2 deletions(-)
+
+diff --git a/bin/keystone-all b/bin/keystone-all
+index 02294d2..8f1fe89 100755
+--- a/bin/keystone-all
++++ b/bin/keystone-all
+@@ -31,10 +31,10 @@ if os.path.exists(os.path.join(possible_topdir,
sys.path.insert(0, possible_topdir)
-from paste import deploy
- import pbr.version
-
- from keystone.common import environment
-@@ -26,6 +25,8 @@
+-
from keystone.openstack.common import gettextutils
- from keystone.openstack.common import importutils
+from paste import deploy
+
-
- CONF = config.CONF
-
-diff -Naur keystone-2013.2.b2.orig/keystone/__init__.py keystone-2013.2.b2/keystone/__init__.py
---- keystone-2013.2.b2.orig/keystone/__init__.py 2013-07-22 00:29:30.734905980 +0000
-+++ keystone-2013.2.b2/keystone/__init__.py 2013-07-22 00:32:08.954490625 +0000
+ # NOTE(blk-u):
+ # gettextutils.install() must run to set _ before importing any modules that
+ # contain static translated strings.
+diff --git a/keystone/__init__.py b/keystone/__init__.py
+index e69de29..6af9f66 100644
+--- a/keystone/__init__.py
++++ b/keystone/__init__.py
@@ -0,0 +1,29 @@
+import sys
+import pkg_resources
@@ -41,8 +52,8 @@ diff -Naur keystone-2013.2.b2.orig/keystone/__init__.py keystone-2013.2.b2/keyst
+ # and the associated pkg_resources.working_set.entries
+ return pkg_resources.require(requirement)
+
-+replace_dist("WebOb >= 1.0")
-+replace_dist("SQLAlchemy >= 0.6.3")
++replace_dist("WebOb >= 1.2")
++replace_dist("SQLAlchemy >= 0.7.8")
+replace_dist("Routes >= 1.12.3")
+
+replace_dist("PasteDeploy >= 1.5.0")
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index 071d243..2b0aac9 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -21,7 +21,6 @@ Source3: openstack-keystone.upstart
Source5: openstack-keystone-sample-data
Source20: keystone-dist.conf
-Patch0: openstack-keystone-newdeps.patch
#
# patches_base=2013.2.b3
@@ -29,6 +28,7 @@ Patch0: openstack-keystone-newdeps.patch
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-Use-updated-parallel-install-versions-of-epel-packag.patch
BuildArch: noarch
@@ -103,11 +103,11 @@ This package contains documentation for Keystone.
%prep
%setup -q -n keystone-%{version}.b%{milestone}
-%patch0 -p1 -b .newdeps
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
+%patch0004 -p1
sed -i 's/%{version}.b%{milestone}/%{version}/' PKG-INFO
find . \( -name .gitignore -o -name .placeholder \) -delete