[python-django-savanna/el6] Pre-release to go w/ pre-release of savanna-api

matt matt at fedoraproject.org
Thu Sep 12 20:16:34 UTC 2013


commit 7f615e0f9041f12cd9811e276ed5340d26c7e29d
Author: Matthew Farrellee <matt at redhat.com>
Date:   Thu Sep 12 16:16:06 2013 -0400

    Pre-release to go w/ pre-release of savanna-api

 .gitignore                 |    1 +
 python-django-savanna.spec |   23 +++++++++++++++--------
 sources                    |    2 +-
 3 files changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c87eab2..c826f83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /savannadashboard-0.2.tar.gz
+/savanna-dashboard-0.3.a9.gb8f32f9.tar.gz
diff --git a/python-django-savanna.spec b/python-django-savanna.spec
index a473b4c..ff03285 100644
--- a/python-django-savanna.spec
+++ b/python-django-savanna.spec
@@ -1,10 +1,15 @@
+%define master .a9.gb8f32f9
+
 Name:          python-django-savanna
-Version:       0.2
-Release:       2%{?dist}
+Version:       0.3
+Release:       0.1%{?master}%{?dist}
 Summary:       Savanna project dashboard
 License:       ASL 2.0
 URL:           https://launchpad.net/savanna
-Source0:       http://tarballs.openstack.org/savanna-dashboard/savannadashboard-%{version}.tar.gz
+# For unreleased builds,
+#  curl -o savanna-dashboard-%%{version}%%{master}.tar.gz http://tarballs.openstack.org/savanna-dashboard/savanna-dashboard-master.tar.gz
+Source0:       savanna-dashboard-%{version}%{master}.tar.gz
+#Source0:       http://tarballs.openstack.org/savanna-dashboard/savannadashboard-%%{version}.tar.gz
 BuildArch:     noarch
  
 BuildRequires: python2-devel
@@ -20,11 +25,10 @@ Savanna plugin for the OpenStack Dashboard.
 
 
 %prep
-%setup -q -n savannadashboard-%{version}
-rm -rf savannadashboard.egg-info
+%setup -q -n savanna-dashboard-%{version}%{?master}
+rm -rf savanna_dashboard.egg-info
 rm -f tools/pip-requires
-sed -i '/setuptools-git/d' setup.py
-sed -i 's,\*.html,templates/\*/\*.html,' setup.py
+sed -i 's,\*\*.html,\*/\*.html,' MANIFEST.in
 
 
 %build
@@ -38,10 +42,13 @@ sed -i 's,\*.html,templates/\*/\*.html,' setup.py
 %files
 #TODO: %%doc LICENSE
 %{python_sitelib}/savannadashboard
-%{python_sitelib}/savannadashboard-%{version}-py?.?.egg-info
+%{python_sitelib}/savanna_dashboard-%{version}%{?master}-py?.?.egg-info
 
 
 %changelog
+* Thu Sep 12 2013 Matthew Farrellee <matt at redhat> - 0.3-0.1.a9.gb8f32f9
+- Pre-release of 0.3 dashboard to go with pre-release of savanna-api service
+
 * Sun Aug 25 2013 Matthew Farrellee <matt at redhat> - 0.2-2
 - Include template files
 
diff --git a/sources b/sources
index 4b22c9d..8134b53 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-828874dac812be08b739219b22a37291  savannadashboard-0.2.tar.gz
+740cb75566b5111f06eaeabe7fa21ca7  savanna-dashboard-0.3.a9.gb8f32f9.tar.gz


More information about the scm-commits mailing list