[openstack-keystone] folsom-2 milestone

[Alan Pevec]

commit 938c199eb300596e6d0a3eb546aafbb918c29b73
Author: Alan Pevec <apevec at redhat.com>
Date:   Fri Jul 6 01:20:40 2012 +0200

    folsom-2 milestone

 .gitignore                     |    2 +-
 0001-fix-man-page-build.patch  |  137 ----------------------------------------
 0002-fix-sphinx-warnings.patch |   67 -------------------
 openstack-keystone.spec        |   21 +++---
 sources                        |    2 +-
 5 files changed, 13 insertions(+), 216 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 15be487..f4b20e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/keystone-2012.2~f1.tar.gz
+/keystone-2012.2~f2.tar.gz
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index c49d2b4..43f4c46 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -1,33 +1,34 @@
 #
-# This is 2012.2 folsom-1 milestone
+# This is 2012.2 folsom-2 milestone
 #
 %global release_name folsom
 %global release_letter f
 %global milestone 1
-%global snapdate 20120523
-%global git_revno r2300
+%global snapdate 20120704
+%global git_revno r2390
 
 %global snaptag ~%{release_letter}%{milestone}~%{snapdate}.%{git_revno}
 %global with_doc %{!?_without_doc:1}%{?_without_doc:0}
 
 Name:           openstack-keystone
 Version:        2012.2
-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://keystone.openstack.org/tarballs/keystone-%{version}%{snaptag}.tar.gz
+#Source0:        http://tarballs.openstack.org/keystone/keystone-%{version}%{snaptag}.tar.gz
 Source1:        openstack-keystone.logrotate
 Source2:        openstack-keystone.service
 Source5:        openstack-keystone-sample-data
 
 Patch0:         match-egg-and-spec-requires.patch
 
-Patch0001: 0001-fix-man-page-build.patch
-Patch0002: 0002-fix-sphinx-warnings.patch
+#
+# patches_base=folsom-2
+#
 
 BuildArch:      noarch
 BuildRequires:  python2-devel
@@ -113,9 +114,6 @@ This package contains documentation for Keystone.
 
 %patch0 -p1
 
-%patch0001 -p1
-%patch0002 -p1
-
 find . \( -name .gitignore -o -name .placeholder \) -delete
 find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
 
@@ -255,6 +253,9 @@ fi
 %endif
 
 %changelog
+* Fri Jul 06 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.2.f2
+- folsom-2 milestone
+
 * Fri May 25 2012 Alan Pevec <apevec at redhat.com> 2012.2-0.1.f1
 - folsom-1 milestone
 
diff --git a/sources b/sources
index 329a3a7..99f5678 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-797f89850e20ec6ff24e65a3f4b80ec7  keystone-2012.2~f1.tar.gz
+47e23d8b846068b62d56e9114b88bef7  keystone-2012.2~f2.tar.gz