[openstack-savanna] Intermediate version, works with pbr 0.5.19

matt matt at fedoraproject.org
Sun Sep 1 20:10:27 UTC 2013


commit 09829dcc1263e586884820d146bfa6794771782a
Author: Matthew Farrellee <matt at redhat.com>
Date:   Wed Aug 28 22:37:40 2013 -0400

    Intermediate version, works with pbr 0.5.19

 openstack-savanna.spec |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/openstack-savanna.spec b/openstack-savanna.spec
index 2faa2c0..7a1b905 100644
--- a/openstack-savanna.spec
+++ b/openstack-savanna.spec
@@ -1,6 +1,6 @@
 Name:          openstack-savanna
-Version:       0.2
-Release:       3%{?dist}
+Version:       0.3.a195.g6699fe9
+Release:       1%{?dist}
 Summary:       Apache Hadoop cluster management on OpenStack
 License:       ASL 2.0
 URL:           https://launchpad.net/savanna
@@ -12,6 +12,7 @@ BuildRequires: python2-devel
 BuildRequires: python-setuptools
 BuildRequires: python-sphinx
 BuildRequires: python-sphinxcontrib-httpdomain
+BuildRequires: python-pbr >= 0.5.19
 # Need systemd-units for _unitdir macro
 BuildRequires: systemd-units
 # Needed by check
@@ -43,8 +44,9 @@ clusters on OpenStack.
 
 %prep
 %setup -q -n savanna-%{version}
-rm -f tools/pip-requires
-sed -i '/setuptools-git/d' setup.py
+sed -i 's/0.5.21/0.5.19/' setup.py
+# The data_files glob appears broken in pbr 0.5.19, so be explicit
+sed -i 's,etc/savanna/\*,etc/savanna/savanna.conf.sample etc/savanna/savanna.conf.sample-full,' setup.cfg
 
 
 %build


More information about the scm-commits mailing list