diff --git a/.gitignore b/.gitignore index 72f7c0e..69ad0d2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /diskimage-builder-0.1.12.tar.gz /diskimage-builder-0.1.13.tar.gz /diskimage-builder-0.1.15.tar.gz +/Remove-fixfiles-from-rpm-distro-finalize.patch diff --git a/diskimage-builder.spec b/diskimage-builder.spec index 135f793..0394834 100644 --- a/diskimage-builder.spec +++ b/diskimage-builder.spec @@ -1,12 +1,15 @@ Name: diskimage-builder Summary: Image building tools for OpenStack Version: 0.1.15 -Release: 2%{?dist} +Release: 3%{?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 +# https://review.openstack.org/#/c/103451/ +Patch0001: Remove-fixfiles-from-rpm-distro-finalize.patch + BuildArch: noarch BuildRequires: python2-devel BuildRequires: python-setuptools @@ -25,6 +28,8 @@ Requires: dib-utils %prep %setup -q -n %{name}-%{version} +%patch0001 -p1 + %build %{__python} setup.py build @@ -56,6 +61,9 @@ Components of TripleO that are responsible for building disk images. %{_datadir}/%{name}/elements %changelog +* Wed Jul 02 2014 James Slagle - 0.1.15-3 +- Add patch Remove-fixfiles-from-rpm-distro-finalize.patch + * Sat Jun 07 2014 Fedora Release Engineering - 0.1.15-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index c0cfde1..9a029f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -60b1cf4e377feb50abd2e07acdf37dc1 diskimage-builder-0.1.15.tar.gz +37f77ec7e6302e20dc2d50e415715724 Remove-fixfiles-from-rpm-distro-finalize.patch