[openstack-sahara/f22] Updated patches from f22-patches

[Ethan Gafford]

commit 26ec81332b74c1b11e6e10d7ffc7abc9a1590be1
Author: Ethan Gafford <egafford at redhat.com>
Date:   Mon Mar 23 15:30:59 2015 -0400

    Updated patches from f22-patches
    
    - Added launch_command.py to MANIFEST.in
    - Resolves: rhbz#1184522

 ...-Include-launch_command.py-in-MANIFEST.in.patch | 23 ++++++++++++++++++++++
 openstack-sahara.spec                              |  4 ++++
 2 files changed, 27 insertions(+)
---
diff --git a/0003-Include-launch_command.py-in-MANIFEST.in.patch b/0003-Include-launch_command.py-in-MANIFEST.in.patch
new file mode 100644
index 0000000..9220b0c
--- /dev/null
+++ b/0003-Include-launch_command.py-in-MANIFEST.in.patch
@@ -0,0 +1,23 @@
+From ec4972802c254718065be687c88149a38e61e38e Mon Sep 17 00:00:00 2001
+From: Ethan Gafford <egafford at redhat.com>
+Date: Mon, 23 Mar 2015 15:26:51 -0400
+Subject: [PATCH] Include launch_command.py in MANIFEST.in
+
+Stopgap to repair Spark until next upstream Juno release.
+Resolves: rhbz#153352
+---
+ MANIFEST.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/MANIFEST.in b/MANIFEST.in
+index bd7117f..8dfc9bb 100644
+--- a/MANIFEST.in
++++ b/MANIFEST.in
+@@ -36,6 +36,7 @@ include sahara/plugins/spark/resources/*.sh
+ include sahara/plugins/spark/resources/*.template
+ include sahara/resources/*.heat
+ include sahara/service/edp/resources/*.xml
++include sahara/service/edp/resources/launch_command.py
+ include sahara/swift/resources/*.xml
+ include sahara/tests/unit/plugins/vanilla/hadoop2/resources/*.txt
+ include sahara/tests/unit/resources/*.heat
diff --git a/openstack-sahara.spec b/openstack-sahara.spec
index c57e52f..dc63e01 100644
--- a/openstack-sahara.spec
+++ b/openstack-sahara.spec
@@ -26,6 +26,7 @@ BuildArch:     noarch
 #
 Patch0001: 0001-remove-runtime-dep-on-python-pbr.patch
 Patch0002: 0002-reference-actual-plugins-shipped-in-tarball.patch
+Patch0003: 0003-Include-launch_command.py-in-MANIFEST.in.patch
 
 BuildRequires: python2-devel
 BuildRequires: python-setuptools
@@ -91,6 +92,7 @@ install, use, and manage the Sahara infrastructure.
 
 %patch0001 -p1
 %patch0002 -p1
+%patch0003 -p1
 
 sed -i s/REDHAT_SAHARA_VERSION/%{version}/ sahara/version.py
 sed -i s/REDHAT_SAHARA_RELEASE/%{release}/ sahara/version.py
@@ -210,6 +212,8 @@ exit 0
 
 %changelog
 * Mon Mar 23 2015 Ethan Gafford <egafford at redhat.com> 2015.2.2-4
+- Added launch_command.py to MANIFEST.in
+- Resolves: rhbz#1184522
 - Downgraded most dependencies for older Fedora compatibility
 - Removed pre-systemd packaging apparatus