[python-django-sahara] updating version

[Michael McCune]

commit b6549cb560568b7a6e2a134261ecdba5cadcbf71
Author: Michael McCune <mimccune at redhat.com>
Date:   Tue Apr 22 16:24:20 2014 -0400

    updating version
    
    * changing version from 2014.rc1 to 2014.1
    * adding a local variable to help with version names

 python-django-sahara.spec |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)
---
diff --git a/python-django-sahara.spec b/python-django-sahara.spec
index b20f48d..21d6051 100644
--- a/python-django-sahara.spec
+++ b/python-django-sahara.spec
@@ -4,15 +4,23 @@
 %{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %endif
 
+# This variable is defined to help with the transition from version 2014.1.rc1
+# to 2014.1. With the package version set to 2014.1, the Obsoletes directive
+# will produce self-obsoletion warnings related to 2014.1 < 2014.1.rc1 for some
+# tools. This can be seen by running `$ rpmdev-vercmp 2014.1 2014.1.rc1`.
+# TODO mimccune remove this variable once the upstream version has moved past
+# 2014.1
+%global tmp_upstream_version 2014.1
+
 Name:          python-django-sahara
-Version:       2014.1.rc1
-Release:       2%{?dist}
+Version:       2014.1.0
+Release:       1%{?dist}
 Provides:      python-django-savanna = %{version}-%{release}
 Obsoletes:     python-django-savanna <= 2014.1.b3-3
 Summary:       Sahara project dashboard
 License:       ASL 2.0
 URL:           https://launchpad.net/sahara
-Source0:       http://tarballs.openstack.org/sahara-dashboard/sahara-dashboard-%{version}.tar.gz
+Source0:       http://tarballs.openstack.org/sahara-dashboard/sahara-dashboard-%{tmp_upstream_version}.tar.gz
 BuildArch:     noarch
 
 BuildRequires: python-pbr
@@ -29,7 +37,7 @@ Sahara plugin for the OpenStack Dashboard.
 
 
 %prep
-%setup -q -n sahara-dashboard-%{version}
+%setup -q -n sahara-dashboard-%{tmp_upstream_version}
 rm -rf sahara_dashboard.egg-info
 rm -f tools/pip-requires
 
@@ -48,10 +56,13 @@ rm -f tools/pip-requires
 %files
 %doc LICENSE ChangeLog README.rst
 %{python_sitelib}/saharadashboard
-%{python_sitelib}/sahara_dashboard-%{version}-py?.?.egg-info
+%{python_sitelib}/sahara_dashboard-%{tmp_upstream_version}-py?.?.egg-info
 
 
 %changelog
+* Tue Apr 22 2014 Michael McCune <mimccune at redhat> - 2014.1.0-1
+- 2014.1 release
+
 * Mon Apr 21 2014 Michael McCune <mimccune at redhat> - 2014.1.rc1-2
 - Adding backward compatibility for __python2 macro