[python-django-savanna/el6] wip

matt matt at fedoraproject.org
Mon Oct 14 20:02:33 UTC 2013


commit 11b88bc1e81124b677f0c2ba2a6677ebda27b9b2
Author: Matthew Farrellee <matt at redhat.com>
Date:   Fri Oct 11 15:46:37 2013 -0400

    wip

 dashboard-sans-jobs.patch  |   12 ------------
 python-django-savanna.spec |   20 +++++++++-----------
 2 files changed, 9 insertions(+), 23 deletions(-)
---
diff --git a/python-django-savanna.spec b/python-django-savanna.spec
index 812a5e6..7087872 100644
--- a/python-django-savanna.spec
+++ b/python-django-savanna.spec
@@ -1,16 +1,11 @@
-%define master .a10.g87e1e22
-
 Name:          python-django-savanna
 Version:       0.3
-Release:       0.1%{?master}%{?dist}
+%define suf    .rc3
+Release:       0.2%{?master}%{?dist}
 Summary:       Savanna project dashboard
 License:       ASL 2.0
 URL:           https://launchpad.net/savanna
-# 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
-Patch0:        dashboard-sans-jobs.patch
+Source0:       http://tarballs.openstack.org/savanna-dashboard/savanna-dashboard-%{version}%{?suf}.tar.gz
 BuildArch:     noarch
 
 BuildRequires: python-pbr
@@ -18,6 +13,7 @@ BuildRequires: python2-devel
 BuildRequires: python-setuptools
 
 Requires: python-django-horizon
+Requires: python-savannaclient >= 0.3
 
 Provides: django-savanna = %{version}-%{release}
 
@@ -27,8 +23,7 @@ Savanna plugin for the OpenStack Dashboard.
 
 
 %prep
-%setup -q -n savanna-dashboard-%{version}%{?master}
-%patch0
+%setup -q -n savanna-dashboard-%{version}%{?suf}
 rm -rf savanna_dashboard.egg-info
 rm -f tools/pip-requires
 sed -i 's,\*\*.html,\*/\*.html,' MANIFEST.in
@@ -46,10 +41,13 @@ sed -i 's/0.5.21/0.5.19/' setup.py
 %files
 #TODO: %%doc LICENSE
 %{python_sitelib}/savannadashboard
-%{python_sitelib}/savanna_dashboard-%{version}%{?master}-py?.?.egg-info
+%{python_sitelib}/savanna_dashboard-%{version}%{?suf}-py?.?.egg-info
 
 
 %changelog
+* Fri Oct 11 2013 Matthew Farrellee <matt at redhat> - 0.3-0.2
+- 0.3 rc3 build
+
 * 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
 


More information about the scm-commits mailing list