[diskimage-builder/f19] Removed data_files from setup.cfg to work with older pbr
Jeff Peeler
jpeeler at fedoraproject.org
Fri Sep 6 17:28:05 UTC 2013
commit 406234c1b336f7ecf8c7349ecb4d3c7f91dafdab
Author: Jeff Peeler <jpeeler at redhat.com>
Date: Fri Sep 6 13:26:42 2013 -0400
Removed data_files from setup.cfg to work with older pbr
diskimage-builder.spec | 9 ++++++++-
remove_data_files.patch | 15 +++++++++++++++
2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/diskimage-builder.spec b/diskimage-builder.spec
index 7b6bb9f..6aceb21 100644
--- a/diskimage-builder.spec
+++ b/diskimage-builder.spec
@@ -1,12 +1,14 @@
Name: diskimage-builder
Summary: Image building tools for OpenStack
Version: 0.0.1
-Release: 5%{?dist}
+Release: 6%{?dist}
License: ASL 2.0
Group: System Environment/Base
URL: https://launchpad.net/diskimage-builder
Source0: http://tarballs.openstack.org/diskimage-builder/%{name}-%{version}.tar.gz
+Patch0: remove_data_files.patch
+
BuildArch: noarch
BuildRequires: python2-devel
BuildRequires: python-setuptools
@@ -20,6 +22,8 @@ Requires: curl
%prep
%setup -q -n %{name}-%{version}
+# pbr < 0.5.20 does not support file globbing
+%patch0 -p1
%build
%{__python} setup.py build
@@ -48,6 +52,9 @@ Components of TripleO that are responsible for building disk images.
%{_datadir}/%{name}/elements
%changelog
+* Fri Sep 6 2013 Jeff Peeler <jpeeler at redhat.com> 0.0.1-6
+- added file globbing removal patch
+
* Thu Sep 5 2013 Jeff Peeler <jpeeler at redhat.com> 0.0.1-5
- rebase to a495079695e914fa7ec93292497bfc2471f41510
- Source moved from stackforge to openstack
diff --git a/remove_data_files.patch b/remove_data_files.patch
new file mode 100644
index 0000000..f63edbb
--- /dev/null
+++ b/remove_data_files.patch
@@ -0,0 +1,15 @@
+diff --git a/setup.cfg b/setup.cfg
+index 295590c..0bcab9c 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -24,10 +24,6 @@ scripts =
+ bin/disk-image-get-kernel
+ bin/element-info
+ bin/ramdisk-image-create
+-data_files =
+- share/diskimage-builder/elements = elements/*
+- share/diskimage-builder/lib = lib/*
+- share/diskimage-builder/scripts = scripts/*
+
+ [global]
+ setup-hooks =
More information about the scm-commits
mailing list