[openstack-keystone] Icehouse release

[Alan Pevec]

commit a73fcf7b7a9443fac476c0c79f9c510eb2544e44
Author: Alan Pevec <apevec at redhat.com>
Date:   Thu Apr 17 18:15:22 2014 +0200

    Icehouse release

 .gitignore              |    7 +------
 openstack-keystone.spec |   17 ++++++++---------
 sources                 |    2 +-
 3 files changed, 10 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a427de7..c6d04e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1 @@
-/keystone-2013.2.tar.gz
-/keystone-2014.1.b1.tar.gz
-/keystone-2014.1.b2.tar.gz
-/keystone-2014.1.b3.tar.gz
-/keystone-2014.1.rc1.tar.gz
-/keystone-2014.1.rc2.tar.gz
+/keystone-2014.1.tar.gz
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index fe141b8..cb2edc9 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -1,20 +1,18 @@
 #
-# This is 2014.1 RC2
+# This is 2014.1 Icehouse release
 #
 %global release_name icehouse
-%global milestone rc2
 
 %global with_doc %{!?_without_doc:1}%{?_without_doc:0}
 
 Name:           openstack-keystone
 Version:        2014.1
-Release:        0.9.%{milestone}%{?dist}
+Release:        1%{?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}.%{milestone}.tar.gz
+Source0:        http://launchpad.net/keystone/%{release_name}/%{version}/+download/keystone-%{version}.tar.gz
 Source1:        openstack-keystone.logrotate
 Source2:        openstack-keystone.service
 Source5:        openstack-keystone-sample-data
@@ -22,7 +20,7 @@ Source20:       keystone-dist.conf
 
 
 #
-# patches_base=2014.1.rc2
+# patches_base=2014.1
 #
 Patch0001: 0001-remove-runtime-dep-on-python-pbr.patch
 Patch0002: 0002-sync-parameter-values-with-keystone-dist.conf.patch
@@ -97,14 +95,12 @@ This package contains documentation for Keystone.
 %endif
 
 %prep
-%setup -q -n keystone-%{version}.%{milestone}
+%setup -q -n keystone-%{version}
 
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
 
-sed -i 's/%{version}.%{milestone}/%{version}/' PKG-INFO
-
 find . \( -name .gitignore -o -name .placeholder \) -delete
 find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
 # Remove bundled egg-info
@@ -226,6 +222,9 @@ fi
 %endif
 
 %changelog
+* Thu Apr 17 2014 Alan Pevec <apevec at redhat.com> 2014.1-1
+- Icehouse release
+
 * Fri Apr 11 2014 Alan Pevec <apevec at redhat.com> 2014.1-0.9.rc2
 - icehouse rc2
 
diff --git a/sources b/sources
index df7d7af..f24ef02 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-04b3747e8af244770438ad153b8a3c19  keystone-2014.1.rc2.tar.gz
+f8179fdbf64c9e50d66a3729b5cf8502  keystone-2014.1.tar.gz