[openstack-sahara/f20] adding patch to manifest

[Michael McCune]

commit 34cef7c8713f9f858662d68a69330d048bb9fbbe
Author: Michael McCune <mimccune at redhat.com>
Date:   Tue May 6 15:10:19 2014 -0400

    adding patch to manifest
    
    * moved alembic migrations files into manifest patch
    * added missing hdp plugin resources to manifest patch

 ...d-migrations-and-hdp-versions-to-manifest.patch |   28 ++++++++++++++++++++
 openstack-sahara.spec                              |   19 +++++++------
 2 files changed, 38 insertions(+), 9 deletions(-)
---
diff --git a/0002-add-migrations-and-hdp-versions-to-manifest.patch b/0002-add-migrations-and-hdp-versions-to-manifest.patch
new file mode 100644
index 0000000..cb9f54b
--- /dev/null
+++ b/0002-add-migrations-and-hdp-versions-to-manifest.patch
@@ -0,0 +1,28 @@
+--- MANIFEST.in	2014-04-17 10:02:06.000000000 -0400
++++ MANIFEST.in	2014-05-06 14:28:35.997635457 -0400
+@@ -4,8 +4,10 @@
+ include LICENSE
+ include sahara/db/migration/README
+ include sahara/db/migration/alembic.ini
++include sahara/db/migration/alembic_migrations/env.py
+ include sahara/db/migration/alembic_migrations/script.py.mako
+ include sahara/db/migration/alembic_migrations/versions/README
++include sahara/db/migration/alembic_migrations/versions/*.py
+ 
+ recursive-include sahara/locale *
+ 
+@@ -20,10 +22,10 @@
+ include sahara/plugins/vanilla/v2_3_0/resources/*.sh
+ include sahara/plugins/vanilla/v2_3_0/resources/*.sql
+ include sahara/plugins/vanilla/v2_3_0/resources/*.template
+-include sahara/plugins/hdp/versions/1_3_2/resources/*.template
+-include sahara/plugins/hdp/versions/1_3_2/resources/*.json
+-include sahara/plugins/hdp/versions/2_0/resources/*.template
+-include sahara/plugins/hdp/versions/2_0/resources/*.json
++include sahara/plugins/hdp/versions/version_1_3_2/resources/*.template
++include sahara/plugins/hdp/versions/version_1_3_2/resources/*.json
++include sahara/plugins/hdp/versions/version_2_0/resources/*.template
++include sahara/plugins/hdp/versions/version_2_0/resources/*.json
+ include sahara/resources/*.heat
+ include sahara/service/edp/resources/*.xml
+ include sahara/swift/resources/*.xml
diff --git a/openstack-sahara.spec b/openstack-sahara.spec
index 4df09e7..2956a7f 100644
--- a/openstack-sahara.spec
+++ b/openstack-sahara.spec
@@ -29,7 +29,7 @@
 
 Name:          openstack-sahara
 Version:       2014.1.0
-Release:       11%{?dist}
+Release:       12%{?dist}
 Provides:      openstack-savanna = %{version}-%{release}
 Obsoletes:     openstack-savanna <= 2014.1.b3-3
 Summary:       Apache Hadoop cluster management on OpenStack
@@ -38,7 +38,8 @@ URL:           https://launchpad.net/sahara
 Source0:       http://tarballs.openstack.org/sahara/sahara-%{tmp_upstream_version}.tar.gz
 Source1:       openstack-sahara-api.service
 Source2:       openstack-sahara-api.init
-Patch0001:     0001-remove-runtime-dep-on-python-pbr.patch
+Patch0001:     0001-remove-runtime-dep-on-python-pbr.sahara.patch
+Patch0002:     0002-add-migrations-and-hdp-versions-to-manifest.patch
 BuildArch:     noarch
 
 BuildRequires: python2-devel
@@ -105,6 +106,7 @@ install, use, and manage the Sahara infrastructure.
 %setup -q -n sahara-%{tmp_upstream_version}
 
 %patch0001 -p0
+%patch0002 -p0
 
 sed -i s/REDHAT_SAHARA_VERSION/%{version}/ sahara/version.py
 sed -i s/REDHAT_SAHARA_RELEASE/%{release}/ sahara/version.py
@@ -162,11 +164,6 @@ mkdir -p -m0755 %{buildroot}/%{_localstatedir}/log/sahara
 mkdir -p %{buildroot}/%{_pkgdocdir}
 cp -rp html %{buildroot}/%{_pkgdocdir}
 
-# Copy the migrations
-# these files do not get installed by setup.py because they are outside the
-# package definitions, but they are needed by sahara-db-manage.
-cp -rp sahara/db/migration/alembic_migrations %{buildroot}%{python_sitelib}/sahara/db/migration/
-
 
 %check
 # Building on koji with virtualenv requires test-requirements.txt and this
@@ -249,6 +246,10 @@ fi
 
 
 %changelog
+* Mon May 05 2014 Michael McCune <mimccune at redhat> - 2014.1.0-12
+- Patching MANIFEST.in for missing hdp plugin resources and alembic migrations
+- Removing the cp for alembic migrations
+
 * Mon May 05 2014 Michael McCune <mimccune at redhat> - 2014.1.0-11
 - Adding BuildRequire for python-sphinx
 
@@ -273,10 +274,10 @@ fi
 - Creating local variables for sahara user and group
 
 * Wed Apr 30 2014 Michael McCune <mimccune at redhat> - 2014.1.0-5
-- Adding alembic migration files
+- Adding alembic migration files, addressing BZ1094757
 
 * Wed Apr 30 2014 Michael McCune <mimccune at redhat> - 2014.1.0-4
-- Correcting bug with rhel6 init script
+- Correcting bug with rhel6 init script, addressing BZ1094755
 - Adding local variable for rhel6 tests
 
 * Thu Apr 24 2014 Michael McCune <mimccune at redhat> - 2014.1.0-3