[openstack-sahara] prepare for standard RDO github patch management

[Pádraig Brady]

commit ff847f8e1f1bcc736ccb6de12ed39c0fd22f338f
Author: Pádraig Brady <P at draigBrady.com>
Date:   Thu Jul 17 12:05:44 2014 +0100

    prepare for standard RDO github patch management

 0001-remove-runtime-dep-on-python-pbr.patch        |   15 +++++++++++++--
 ...ference-actual-plugins-shipped-in-tarball.patch |   20 ++++++++++++++++----
 openstack-sahara.spec                              |   12 ++++++++----
 3 files changed, 37 insertions(+), 10 deletions(-)
---
diff --git a/0001-remove-runtime-dep-on-python-pbr.patch b/0001-remove-runtime-dep-on-python-pbr.patch
index 18127b4..255a498 100644
--- a/0001-remove-runtime-dep-on-python-pbr.patch
+++ b/0001-remove-runtime-dep-on-python-pbr.patch
@@ -1,5 +1,16 @@
---- sahara/version.py	2014-05-05 09:18:09.682115488 -0400
-+++ sahara/version.py	2014-05-05 09:34:46.248635372 -0400
+From 55b3ea98f8886d8c2123d0dfacb0d6eaa5c98b81 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
+Date: Thu, 17 Jul 2014 11:59:16 +0100
+Subject: [PATCH] remove runtime dep on python-pbr
+
+---
+ sahara/version.py |   15 +++++++++++++--
+ 1 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/sahara/version.py b/sahara/version.py
+index ba79883..fd70c87 100644
+--- a/sahara/version.py
++++ b/sahara/version.py
 @@ -13,6 +13,17 @@
  # See the License for the specific language governing permissions and
  # limitations under the License.
diff --git a/0002-add-migrations-and-hdp-versions-to-manifest.patch b/0002-reference-actual-plugins-shipped-in-tarball.patch
similarity index 68%
rename from 0002-add-migrations-and-hdp-versions-to-manifest.patch
rename to 0002-reference-actual-plugins-shipped-in-tarball.patch
index c416f55..d5e9c38 100644
--- a/0002-add-migrations-and-hdp-versions-to-manifest.patch
+++ b/0002-reference-actual-plugins-shipped-in-tarball.patch
@@ -1,6 +1,18 @@
---- MANIFEST.in	2014-04-17 10:02:06.000000000 -0400
-+++ MANIFEST.in	2014-05-06 14:28:35.997635457 -0400
-@@ -4,8 +4,10 @@
+From 0ff3a87a05065456d589465643cb817cac4d0d83 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
+Date: Thu, 17 Jul 2014 12:01:00 +0100
+Subject: [PATCH] reference actual plugins shipped in tarball
+
+Report and analysis from Dalmais Maxence <maxence.dalmais at worldline.com>
+---
+ MANIFEST.in |   12 ++++++++----
+ 1 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/MANIFEST.in b/MANIFEST.in
+index dadbd42..6d5538b 100644
+--- a/MANIFEST.in
++++ b/MANIFEST.in
+@@ -4,8 +4,10 @@ include ChangeLog
  include LICENSE
  include sahara/db/migration/README
  include sahara/db/migration/alembic.ini
@@ -11,7 +23,7 @@
  
  recursive-include sahara/locale *
  
-@@ -20,10 +22,12 @@
+@@ -20,10 +22,12 @@ include sahara/plugins/vanilla/v2_3_0/resources/*.xml
  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
diff --git a/openstack-sahara.spec b/openstack-sahara.spec
index b4cd66c..3183f3a 100644
--- a/openstack-sahara.spec
+++ b/openstack-sahara.spec
@@ -38,10 +38,14 @@ 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
-Patch0002:     0002-add-migrations-and-hdp-versions-to-manifest.patch
 BuildArch:     noarch
 
+#
+# patches_base=2014.1
+#
+Patch0001: 0001-remove-runtime-dep-on-python-pbr.patch
+Patch0002: 0002-reference-actual-plugins-shipped-in-tarball.patch
+
 BuildRequires: python2-devel
 BuildRequires: python-setuptools
 BuildRequires: python-sphinx >= 1.1.2
@@ -105,8 +109,8 @@ install, use, and manage the Sahara infrastructure.
 %prep
 %setup -q -n sahara-%{tmp_upstream_version}
 
-%patch0001 -p0
-%patch0002 -p0
+%patch0001 -p1
+%patch0002 -p1
 
 sed -i s/REDHAT_SAHARA_VERSION/%{version}/ sahara/version.py
 sed -i s/REDHAT_SAHARA_RELEASE/%{release}/ sahara/version.py