[openstack-swift/el6-havana] Update to Havana GA

[Pádraig Brady]

commit d411454ed4dae9996e9beddf20a95a29b9c9b903
Author: Pádraig Brady <P at draigBrady.com>
Date:   Fri Oct 18 12:33:01 2013 +0100

    Update to Havana GA
    
    Conflicts:
    
    	openstack-swift.spec

 .gitignore           |    1 +
 openstack-swift.spec |   13 +++++++++----
 sources              |    2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fbc7dd3..aedce0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /swift-1.9.0.tar.gz
 /swift-1.9.1.tar.gz
 /swift-1.10.0.rc1.tar.gz
+/swift-1.10.0.tar.gz
diff --git a/openstack-swift.spec b/openstack-swift.spec
index 5c75abe..4a68d10 100644
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@ -4,13 +4,13 @@
 
 Name:             openstack-swift
 Version:          1.10.0
-Release:          0.2.rc1%{?dist}
+Release:          2%{?dist}
 Summary:          OpenStack Object Storage (Swift)
 
 Group:            Development/Languages
 License:          ASL 2.0
 URL:              http://launchpad.net/swift
-Source0:          http://launchpad.net/swift/havana/%{version}/+download/swift-%{version}.rc1.tar.gz
+Source0:          http://launchpad.net/swift/havana/%{version}/+download/swift-%{version}.tar.gz
 Source1:          %{name}-functions
 Source2:          %{name}-account.init
 Source22:         account-server.conf
@@ -48,7 +48,7 @@ Source600:        %{name}-proxy.upstart
 Source7:          swift.conf
 
 #
-# patches_base=1.10.0.rc1
+# patches_base=1.10.0
 #
 Patch0001: 0001-Use-updated-parallel-install-versions-of-el6-package.patch
 Patch0002: 0002-Add-fixes-for-building-the-doc-package.patch
@@ -165,7 +165,7 @@ in clusters for reliable, redundant, and large-scale storage of static objects.
 This package contains documentation files for %{name}.
 
 %prep
-%setup -q -n swift-%{version}.rc1
+%setup -q -n swift-%{version}
 
 %patch0001 -p1
 %patch0002 -p1
@@ -504,6 +504,11 @@ fi
 %doc LICENSE doc/build/html
 
 %changelog
+* Fri Oct 18 2013 Pádraig Brady <pbrady at redhat.com> 1.10.0-2
+- Update to Havana GA
+- Fix service startup issue due to bad depencency checking (#1020449)
+- Fix version reporting
+
 * Wed Oct 09 2013 <pbrady at redhat.com> 1.10.0-0.2.rc1
 - add swift home directory for signing_dir, bz#967631
 - Make status print correct identity, bz#917657
diff --git a/sources b/sources
index 91d3842..698b4af 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-62140db23d00128fe50e76722ceca118  swift-1.10.0.rc1.tar.gz
+834f1deb03b35d6b1f93b728cd258d8d  swift-1.10.0.tar.gz