[vdsm/f20] vdsm-4.14.1-2

[Douglas Schilling Landgraf]

commit 25ead705a8f014b25c0b04b375d72daebb86e57f
Author: Douglas Schilling Landgraf <dougsland at redhat.com>
Date:   Tue Jan 21 08:23:20 2014 -0500

    vdsm-4.14.1-2
    
    - vdsm.spec: Add BuildRequires to python-argparse

 ...spec-Add-BuildRequires-to-python-argparse.patch |   33 ++++++++++++++++++++
 vdsm.spec                                          |   14 ++++++++-
 2 files changed, 46 insertions(+), 1 deletions(-)
---
diff --git a/0001-vdsm.spec-Add-BuildRequires-to-python-argparse.patch b/0001-vdsm.spec-Add-BuildRequires-to-python-argparse.patch
new file mode 100644
index 0000000..12662bb
--- /dev/null
+++ b/0001-vdsm.spec-Add-BuildRequires-to-python-argparse.patch
@@ -0,0 +1,33 @@
+From 9e1e1b9bfc8d01a1504e28787e31aa4bc49832b3 Mon Sep 17 00:00:00 2001
+From: Douglas Schilling Landgraf <dougsland at redhat.com>
+Date: Tue, 21 Jan 2014 06:02:02 -0500
+Subject: [PATCH] vdsm.spec: Add BuildRequires to python-argparse
+
+EL6 build is failing because configure.ac says argparse is fatal error
+in case we don't have it in build system. This patch includes python-argparse as
+BuildRequires. On the other hand, >= F19 contains python-2.7 which has
+python-argparse integrated into the stdlib and don't generate such error.
+
+Change-Id: Ie3dc596f13e934760906f43a0f16ca6c06086878
+Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
+Reviewed-on: http://gerrit.ovirt.org/23475
+Reviewed-by: Dan Kenigsberg <danken at redhat.com>
+---
+ vdsm.spec.in |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/vdsm.spec.in b/vdsm.spec.in
+index 7912635..920c57f 100644
+--- a/vdsm.spec.in
++++ b/vdsm.spec.in
+@@ -76,6 +76,7 @@ BuildRequires: m2crypto
+ BuildRequires: python-dmidecode
+ %endif
+ %if 0%{?rhel} == 6
++BuildRequires: python-argparse
+ BuildRequires: python-ordereddict
+ %endif
+ BuildRequires: python-ethtool
+-- 
+1.7.1
+
diff --git a/vdsm.spec b/vdsm.spec
index d1254eb..1f8a2dc 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -50,7 +50,7 @@
 
 Name:           %{vdsm_name}
 Version:        4.14.1
-Release:        1%{?dist}%{?extra_release}
+Release:        2%{?dist}%{?extra_release}
 Summary:        Virtual Desktop Server Manager
 
 Group:          Applications/System
@@ -64,6 +64,10 @@ Url:            http://www.ovirt.org/wiki/Vdsm
 #  ./autogen.sh --system
 #  make VERSION={version}-{vdsm_release} dist
 Source0:        %{vdsm_name}-%{version}%{?vdsm_relttag}.tar.gz
+
+# ovirt-3.4 patches
+Patch0:         0001-vdsm.spec-Add-BuildRequires-to-python-argparse.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: gcc
@@ -89,6 +93,7 @@ BuildRequires: m2crypto
 BuildRequires: python-dmidecode
 %endif
 %if 0%{?rhel} == 6
+BuildRequires: python-argparse
 BuildRequires: python-ordereddict
 %endif
 BuildRequires: python-ethtool
@@ -601,6 +606,10 @@ Gluster plugin enables VDSM to serve Gluster functionalities.
 
 %prep
 %setup -q
+
+# ovirt-3.4 patches
+%patch0 -p1
+
 %if 0%{?rhel} == 6
 sed -i '/ su /d' vdsm/vdsm-logrotate.conf.in
 %endif
@@ -1421,6 +1430,9 @@ exit 0
 %endif
 
 %changelog
+* Tue Jan 21 2014 Douglas Schilling Landgraf <dougsland at redhat.com> - 4.14.1-2
+- vdsm.spec: Add BuildRequires to python-argparse
+
 * Mon Jan 20 2014 Douglas Schilling Landgraf <dougsland at redhat.com> - 4.14.1-1
 - Rebuild 4.14.1 from ovirt-3.4