[diskimage-builder] Update to 0.1.15 and remove dib-run-parts

[Ben Nemec]

commit 12ae458637592ec2161a858410b8ce9cb7d65bc3
Author: Ben Nemec <bnemec at redhat.com>
Date:   Thu May 1 17:44:12 2014 +0000

    Update to 0.1.15 and remove dib-run-parts
    
    dib-run-parts is being moved to dib-utils, so we need to remove it
    from diskimage-builder until the upstream split happens so it
    doesn't conflict.

 .gitignore             |    1 +
 diskimage-builder.spec |   12 +++++++++++-
 sources                |    2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dc51603..72f7c0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /diskimage-builder-0.1.9.tar.gz
 /diskimage-builder-0.1.12.tar.gz
 /diskimage-builder-0.1.13.tar.gz
+/diskimage-builder-0.1.15.tar.gz
diff --git a/diskimage-builder.spec b/diskimage-builder.spec
index a1a66d8..94ba61c 100644
--- a/diskimage-builder.spec
+++ b/diskimage-builder.spec
@@ -1,6 +1,6 @@
 Name:		diskimage-builder
 Summary:	Image building tools for OpenStack
-Version:	0.1.13
+Version:	0.1.15
 Release:	1%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Base
@@ -20,6 +20,7 @@ Requires: curl
 Requires: python-argparse
 Requires: python-babel
 Requires: tar
+Requires: dib-utils
 
 %prep
 %setup -q -n %{name}-%{version}
@@ -39,6 +40,10 @@ cp -vr elements/ %{buildroot}%{_datadir}/%{name}
 # explicitly remove config-applier since it does a pip install
 rm -rf %{buildroot}%{_datadir}/%{name}/elements/config-applier
 
+# This file is being split out of diskimage-builder, so remove it to
+# avoid conflicts with the new package.
+rm -f %{buildroot}%{_bindir}/dib-run-parts
+
 %description
 Components of TripleO that are responsible for building disk images.
 
@@ -51,6 +56,11 @@ Components of TripleO that are responsible for building disk images.
 %{_datadir}/%{name}/elements
 
 %changelog
+* Wed Apr 30 2014 Ben Nemec <bnemec at redhat.com> - 0.1.15-1
+- Update to 0.1.15
+- Remove dib-run-parts from this package
+- Add dependency on dib-utils (the new home of dib-run-parts)
+
 * Wed Apr 16 2014 Ben Nemec <bnemec at redhat.com> - 0.1.13-1
 - Update to 0.1.13
 - Remove mariadb-rdo-package patch that merged upstream
diff --git a/sources b/sources
index 639550c..c0cfde1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-31856914cff2c47b66bd6086119cb05a  diskimage-builder-0.1.13.tar.gz
+60b1cf4e377feb50abd2e07acdf37dc1  diskimage-builder-0.1.15.tar.gz