[diskimage-builder] svc-map requires PyYAML

[slagle]

commit a463ff250c47869c9233b1248a79cc2689e915f6
Author: James Slagle <jslagle at redhat.com>
Date:   Fri Oct 17 11:49:54 2014 -0400

    svc-map requires PyYAML

 0003-svc-map-requires-PyYAML.patch |   21 +++++++++++++++++++++
 diskimage-builder.spec             |    7 ++++++-
 2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/0003-svc-map-requires-PyYAML.patch b/0003-svc-map-requires-PyYAML.patch
new file mode 100644
index 0000000..c2a2ba7
--- /dev/null
+++ b/0003-svc-map-requires-PyYAML.patch
@@ -0,0 +1,21 @@
+From e5af5c6f8206d7a245e98bd79d3bbe0f43cc8b77 Mon Sep 17 00:00:00 2001
+From: James Slagle <jslagle at redhat.com>
+Date: Fri, 17 Oct 2014 11:46:18 -0400
+Subject: [PATCH] svc-map requires PyYAML
+
+svc-map requires PyYAML, so install it. It's not always installed on all base
+images.
+
+Change-Id: I7ce5325e8afa0047f67153baa1fc7d4a90196c88
+---
+ elements/svc-map/pre-install.d/package-installs-svc-map | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 elements/svc-map/pre-install.d/package-installs-svc-map
+
+diff --git a/elements/svc-map/pre-install.d/package-installs-svc-map b/elements/svc-map/pre-install.d/package-installs-svc-map
+new file mode 100644
+index 0000000..5500f00
+--- /dev/null
++++ b/elements/svc-map/pre-install.d/package-installs-svc-map
+@@ -0,0 +1 @@
++PyYAML
diff --git a/diskimage-builder.spec b/diskimage-builder.spec
index 01e65c5..f3af927 100644
--- a/diskimage-builder.spec
+++ b/diskimage-builder.spec
@@ -1,7 +1,7 @@
 Name:		diskimage-builder
 Summary:	Image building tools for OpenStack
 Version:	0.1.33
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Base
 URL:		https://launchpad.net/diskimage-builder
@@ -9,6 +9,7 @@ Source0:	http://tarballs.openstack.org/diskimage-builder/%{name}-%{version}.tar.
 
 Patch0001: 0001-Check-for-epel-before-installing-it.patch
 Patch0002: 0002-Move-install-bin-from-rpm-distro-to-yum.patch
+Patch0003: 0003-svc-map-requires-PyYAML.patch
 
 BuildArch: noarch
 BuildRequires: python2-devel
@@ -30,6 +31,7 @@ Requires: dib-utils
 
 %patch0001 -p1
 %patch0002 -p1
+%patch0003 -p1
 
 %build
 %{__python} setup.py build
@@ -66,6 +68,9 @@ Components of TripleO that are responsible for building disk images.
 %{_datadir}/%{name}/elements
 
 %changelog
+* Fri Oct 17 2014 James Slagle <jslagle at redhat.com> 0.1.33-4
+- svc-map requires PyYAML
+
 * Fri Oct 17 2014 James Slagle <jslagle at redhat.com> 0.1.33-3
 - Make sure file added by patch is +x