[openstack-keystone/f17] updated to stable essex release 2012.1.3
Alan Pevec
apevec at fedoraproject.org
Fri Oct 12 12:43:10 UTC 2012
commit e68de3b6e2f9a686cfab2edc2532e6bd2c76c422
Author: Alan Pevec <apevec at redhat.com>
Date: Fri Oct 12 14:18:00 2012 +0200
updated to stable essex release 2012.1.3
.gitignore | 2 +-
0001-fix-man-page-build.patch | 8 +-
0002-fix-sphinx-warnings.patch | 8 +-
0003-match-egg-and-spec-requires.patch | 6 +-
...authz-to-update-user-s-tenant-bug-1040626.patch | 22 --
0005-List-tokens-for-memcached-backend.patch | 166 ---------------
...elete-user-tokens-after-role-grant-revoke.patch | 142 -------------
...it-token-revocation-to-tenant-bug-1050025.patch | 212 --------------------
openstack-keystone.spec | 23 +--
sources | 2 +-
10 files changed, 22 insertions(+), 569 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 59256f8..ad6fe0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/keystone-2012.1.2.tar.gz
+/keystone-2012.1.3.tar.gz
diff --git a/0001-fix-man-page-build.patch b/0001-fix-man-page-build.patch
index 2981a61..9ea7b2e 100644
--- a/0001-fix-man-page-build.patch
+++ b/0001-fix-man-page-build.patch
@@ -1,4 +1,4 @@
-From cd0302359eef3ebd9571ecec5e909191cd704876 Mon Sep 17 00:00:00 2001
+From 6b278c69bf92c005a3d6a77ae70a952037f99afa Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec at redhat.com>
Date: Fri, 22 Jun 2012 19:39:45 +0200
Subject: [PATCH] fix man page build
@@ -8,9 +8,9 @@ sync keystone-all man page with keystone-all -h output
Change-Id: Ie136d30d0ea647082459ae35720e48742aa2b722
---
- doc/source/conf.py | 12 ----------
- doc/source/man/keystone-all.rst | 40 ++++++++++++++---------------------
- doc/source/man/keystone-manage.rst | 6 ++--
+ doc/source/conf.py | 12 ------------
+ doc/source/man/keystone-all.rst | 40 +++++++++++++++-----------------------
+ doc/source/man/keystone-manage.rst | 6 +++---
3 files changed, 19 insertions(+), 39 deletions(-)
diff --git a/doc/source/conf.py b/doc/source/conf.py
diff --git a/0002-fix-sphinx-warnings.patch b/0002-fix-sphinx-warnings.patch
index bf37c04..ccdc535 100644
--- a/0002-fix-sphinx-warnings.patch
+++ b/0002-fix-sphinx-warnings.patch
@@ -1,4 +1,4 @@
-From b4a6c16dd6dd2ce3a9689f43d358ad9874cdbd20 Mon Sep 17 00:00:00 2001
+From 07321871794b217eefa6508279b69d5b0cac46fa Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec at redhat.com>
Date: Fri, 22 Jun 2012 20:01:48 +0200
Subject: [PATCH] fix sphinx warnings
@@ -7,9 +7,9 @@ also disable building old docs
Change-Id: I0bbbb2b702a12bd9acb79f89b5b5c92cffeec779
---
- doc/source/architecture.rst | 4 ++++
- doc/source/conf.py | 2 +-
- doc/source/configuringservices.rst | 2 +-
+ doc/source/architecture.rst | 4 ++++
+ doc/source/conf.py | 2 +-
+ doc/source/configuringservices.rst | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/doc/source/architecture.rst b/doc/source/architecture.rst
diff --git a/0003-match-egg-and-spec-requires.patch b/0003-match-egg-and-spec-requires.patch
index ae5f415..02bf96b 100644
--- a/0003-match-egg-and-spec-requires.patch
+++ b/0003-match-egg-and-spec-requires.patch
@@ -1,4 +1,4 @@
-From 7048feebd68300d7859e57de0f810ab6c2f7c6cc Mon Sep 17 00:00:00 2001
+From 955201a90323f99129a6a4c1b0606f39eb332b31 Mon Sep 17 00:00:00 2001
From: Alan Pevec <apevec at redhat.com>
Date: Sat, 30 Jun 2012 01:00:25 +0200
Subject: [PATCH] match egg and spec requires
@@ -12,8 +12,8 @@ FEDORA SPECIFIC - do not send upstream!
Change-Id: I8c6a1c73c1b1c6edbf507cb5f0ba91f3f97cdd72
---
- tools/pip-requires | 8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
+ tools/pip-requires | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/tools/pip-requires b/tools/pip-requires
index 0e13534..5c5e45e 100644
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index ce0208b..d2dbc20 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -1,15 +1,15 @@
#
-# This is 2012.1.2 stable/essex release
+# This is 2012.1.3 stable/essex release
#
%global release_name essex
-%global snapdate 20120810
-%global git_revno 2230
+%global snapdate 20120926
+%global git_revno 2238
%global snaptag %{?milestone:~%{release_letter}%{milestone}}~%{snapdate}.%{git_revno}
%global with_doc %{!?_without_doc:1}%{?_without_doc:0}
Name: openstack-keystone
-Version: 2012.1.2
-Release: 4%{?dist}
+Version: 2012.1.3
+Release: 1%{?dist}
Summary: OpenStack Identity Service
License: ASL 2.0
@@ -21,15 +21,11 @@ Source2: openstack-keystone.service
Source5: openstack-keystone-sample-data
#
-# patches_base=2012.1.2
+# patches_base=2012.1.3
#
Patch0001: 0001-fix-man-page-build.patch
Patch0002: 0002-fix-sphinx-warnings.patch
Patch0003: 0003-match-egg-and-spec-requires.patch
-Patch0004: 0004-Require-authz-to-update-user-s-tenant-bug-1040626.patch
-Patch0005: 0005-List-tokens-for-memcached-backend.patch
-Patch0006: 0006-Delete-user-tokens-after-role-grant-revoke.patch
-Patch0007: 0007-Limit-token-revocation-to-tenant-bug-1050025.patch
BuildArch: noarch
BuildRequires: python2-devel
@@ -116,10 +112,6 @@ This package contains documentation for Keystone.
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
-%patch0004 -p1
-%patch0005 -p1
-%patch0006 -p1
-%patch0007 -p1
find . \( -name .gitignore -o -name .placeholder \) -delete
find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
@@ -257,6 +249,9 @@ fi
%endif
%changelog
+* Fri Oct 12 2012 Alan Pevec <apevec at redhat.com> 2012.1.3-1
+- updated to stable essex release 2012.1.3
+
* Sun Sep 16 2012 Alan Pevec <apevec at redhat.com> 2012.1.2-4
- Limit token revocation to tenant (lp#1050025)
diff --git a/sources b/sources
index e7fbdf9..d437418 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-026dfa10e37108b75b92d39cbc449bd0 keystone-2012.1.2.tar.gz
+48a1dbf650bd2b8fc095eeba701c5f56 keystone-2012.1.3.tar.gz
More information about the scm-commits
mailing list