[openstack-neutron/el6-havana] update to Havana GA

[Pádraig Brady]

commit 2713c2e12dcdddcfbf59a1a8deb36a2e0f1548f6
Author: Pádraig Brady <P at draigBrady.com>
Date:   Fri Oct 18 15:02:38 2013 +0100

    update to Havana GA
    
    Conflicts:
    
    	openstack-neutron.spec

 .gitignore             |    1 +
 openstack-neutron.spec |   12 +++++++-----
 sources                |    2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 461f3da..0abe40d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /neutron-2013.2.b2.tar.gz
 /neutron-2013.2.b3.tar.gz
 /neutron-2013.2.rc1.tar.gz
+/neutron-2013.2.tar.gz
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index c9569b5..f8a4a6e 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -5,7 +5,7 @@
 
 Name:		openstack-neutron
 Version:	2013.2
-Release:	0.12.rc1%{?dist}
+Release:	1%{?dist}
 Provides:	openstack-quantum = %{version}-%{release}
 Obsoletes:	openstack-quantum < 2013.2-0.3.b3
 
@@ -15,8 +15,7 @@ Group:		Applications/System
 License:	ASL 2.0
 URL:		http://launchpad.net/neutron/
 
-#Source0:	http://launchpad.net/neutron/%{release_name}/%{version}/+download/neutron-%{version}.tar.gz
-Source0:	http://launchpad.net/neutron/%{release_name}/%{release_name}-2/+download/neutron-%{version}.rc1.tar.gz
+Source0:	http://launchpad.net/neutron/%{release_name}/%{version}/+download/neutron-%{version}.tar.gz
 Source1:	neutron.logrotate
 Source2:	neutron-sudoers
 Source4:	neutron-server-setup
@@ -53,7 +52,7 @@ Source42:	neutron-metering-agent.upstart
 
 Source90:	neutron-dist.conf
 #
-# patches_base=2013.2.rc1
+# patches_base=2013.2
 #
 Patch0001: 0001-use-parallel-installed-versions-in-RHEL6.patch
 
@@ -415,7 +414,7 @@ IPSec.
 
 
 %prep
-%setup -q -n neutron-%{version}.rc1
+%setup -q -n neutron-%{version}
 
 %patch0001 -p1
 
@@ -955,6 +954,9 @@ fi
 
 
 %changelog
+* Fri Oct 18 2013 Pádraig Brady <pbrady at redhat.com> - 2013.2-1
+- Update to havana GA
+
 * Thu Oct 10 2013 Terry Wilson <twilson at redhat.com> - 2013.2-0.12.rc1
 - Update to havana rc1
 
diff --git a/sources b/sources
index 225c96b..21be635 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c58ec5c0a693d9eca2cb05b1f4791d58  neutron-2013.2.rc1.tar.gz
+dcdf31a94dc2161f716f587930e34be3  neutron-2013.2.tar.gz