[openstack-keystone] grizzly-2 milestone

[Alan Pevec]

commit e0b76c87462924385471dbc419e61d893f9fc1ee
Author: Alan Pevec <apevec at redhat.com>
Date:   Fri Jan 11 16:12:46 2013 +0100

    grizzly-2 milestone

 .gitignore                             |    2 +-
 0001-match-egg-and-spec-requires.patch |    6 +++---
 openstack-keystone.spec                |   17 ++++++++---------
 sources                                |    2 +-
 4 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d760c5a..8c7ecbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/keystone-2013.1~g1~20121122.r2704.tar.gz
+/keystone-2013.1~g2.tar.gz
diff --git a/0001-match-egg-and-spec-requires.patch b/0001-match-egg-and-spec-requires.patch
index e4b995b..bfcd920 100644
--- a/0001-match-egg-and-spec-requires.patch
+++ b/0001-match-egg-and-spec-requires.patch
@@ -1,4 +1,4 @@
-From 10ecd2ebecbe23e8ac9d2d3c50960faba04c3282 Mon Sep 17 00:00:00 2001
+From ab969588d8731591df5c7c526c7ae6416f3387a1 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
@@ -16,13 +16,13 @@ Change-Id: I8c6a1c73c1b1c6edbf507cb5f0ba91f3f97cdd72
  1 file changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/tools/pip-requires b/tools/pip-requires
-index ae6885b..de6b799 100644
+index de4a1b9..de6b799 100644
 --- a/tools/pip-requires
 +++ b/tools/pip-requires
 @@ -1,6 +1,10 @@
  # keystone dependencies
 -pam==0.1.4
--WebOb==1.0.8
+-WebOb==1.2.3
 +# adjust deps so that generated egg-info matches Requires: in spec
 +PyPAM
 +WebOb
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index 2d86960..98e066e 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -1,32 +1,28 @@
 #
-# This is 2013.1 grizzly-1 milestone
+# This is 2013.1 grizzly-2 milestone
 #
 %global release_name grizzly
 %global release_letter g
-%global milestone 1
-%global snapdate 20121122
-%global git_revno r2704
+%global milestone 2
 
-%global snaptag ~%{release_letter}%{milestone}~%{snapdate}.%{git_revno}
 %global with_doc %{!?_without_doc:1}%{?_without_doc:0}
 
 Name:           openstack-keystone
 Version:        2013.1
-Release:        0.1.%{release_letter}%{milestone}%{?dist}
+Release:        0.2.%{release_letter}%{milestone}%{?dist}
 Summary:        OpenStack Identity Service
 
 License:        ASL 2.0
 URL:            http://keystone.openstack.org/
 #Source0:        http://launchpad.net/keystone/%{release_name}/%{version}/+download/keystone-%{version}.tar.gz
-#Source0:        http://launchpad.net/keystone/%{release_name}/%{release_name}-%{milestone}/+download/keystone-%{version}~%{release_letter}%{milestone}.tar.gz
-Source0:        http://tarballs.openstack.org/keystone/keystone-%{version}%{snaptag}.tar.gz
+Source0:        http://launchpad.net/keystone/%{release_name}/%{release_name}-%{milestone}/+download/keystone-%{version}~%{release_letter}%{milestone}.tar.gz
 Source1:        openstack-keystone.logrotate
 Source2:        openstack-keystone.service
 Source5:        openstack-keystone-sample-data
 
 
 #
-# patches_base=grizzly-1
+# patches_base=grizzly-2
 #
 Patch0001: 0001-match-egg-and-spec-requires.patch
 
@@ -213,6 +209,9 @@ fi
 %endif
 
 %changelog
+* Fri Jan 11 2013 Alan Pevec <apevec at redhat.com> 2013.1-0.2.g2
+- grizzly-2 milestone
+
 * Thu Nov 22 2012 Alan Pevec <apevec at redhat.com> 2013.1-0.1.g1
 - grizzly-1 milestone
 
diff --git a/sources b/sources
index f916503..d2c2e52 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-83fe6ff8c8a9fbe6ae7599be9f642bc3  keystone-2013.1~g1~20121122.r2704.tar.gz
+a7b6d067ff0f3ffac0d74c77ef020723  keystone-2013.1~g2.tar.gz