[vdsm/f20] vdsm 4.13.3-3

[Douglas Schilling Landgraf]

commit ac0158c8a8edb3b9405ac4adca5d1953c428cbec
Author: Douglas Schilling Landgraf <dougsland at redhat.com>
Date:   Mon Feb 3 10:36:51 2014 -0500

    vdsm 4.13.3-3
    
    spec: replace requires vdsm-python-cpopen

 ...-spec-replace-requires-vdsm-python-cpopen.patch |   45 ++++++++++++++++++++
 vdsm.spec                                          |   12 ++++--
 2 files changed, 53 insertions(+), 4 deletions(-)
---
diff --git a/0006-spec-replace-requires-vdsm-python-cpopen.patch b/0006-spec-replace-requires-vdsm-python-cpopen.patch
new file mode 100644
index 0000000..6dbfc0f
--- /dev/null
+++ b/0006-spec-replace-requires-vdsm-python-cpopen.patch
@@ -0,0 +1,45 @@
+From 2d7e622fbcc9ddf4f4f828f81d9464d1bce544f7 Mon Sep 17 00:00:00 2001
+From: Douglas Schilling Landgraf <dougsland at redhat.com>
+Date: Fri, 31 Jan 2014 16:08:13 -0500
+Subject: [PATCH 1/3] spec: replace requires vdsm-python-cpopen
+
+Due dependency problems and yum bug [1] we are
+obsoleting vdsm-python-cpopen with python-cpopen to
+avoid installation problem with VDSM.
+
+[1] http://yum.baseurl.org/gitweb?p=yum.git;a=commitdiff;h=1bbf40af8548d2d3fb9deea8844770fccd67a384
+
+Change-Id: Iee2c64d489745db5d0e4a8491d7d8b16dfb1d21b
+Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
+Reviewed-on: http://gerrit.ovirt.org/23942
+Reviewed-by: Sandro Bonazzola <sbonazzo at redhat.com>
+Reviewed-by: Dan Kenigsberg <danken at redhat.com>
+---
+ vdsm.spec.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/vdsm.spec.in b/vdsm.spec.in
+index a1fa38c..1435e0a 100644
+--- a/vdsm.spec.in
++++ b/vdsm.spec.in
+@@ -242,7 +242,7 @@ BuildArch:      noarch
+ 
+ Requires: %{name}-python = %{version}-%{release}
+ Requires: %{name}-xmlrpc = %{version}-%{release}
+-Requires: %{name}-python-cpopen
++Requires: python-cpopen
+ 
+ %description cli
+ Call VDSM commands from the command line. Used for testing and debugging.
+@@ -252,7 +252,7 @@ Summary:        VDSM xmlrpc API
+ BuildArch:      noarch
+ 
+ Requires: %{name}-python = %{version}-%{release}
+-Requires: %{name}-python-cpopen
++Requires: python-cpopen
+ 
+ 
+ %description xmlrpc
+-- 
+1.7.1
+
diff --git a/vdsm.spec b/vdsm.spec
index 6d81baa..a10cad2 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -46,7 +46,7 @@
 
 Name:           %{vdsm_name}
 Version:        4.13.3
-Release:        2%{?dist}%{?extra_release}
+Release:        3%{?dist}%{?extra_release}
 Summary:        Virtual Desktop Server Manager
 
 Group:          Applications/System
@@ -66,6 +66,7 @@ Patch1:         0002-Revert-Using-old-form-of-zombiereaper.patch
 Patch2:         0003-Revert-utils-Create-AsyncProcessOperation.patch
 Patch3:         0004-Revert-iscsi-Iscsi-rescan-cleanup.patch
 Patch4:         0005-Report-conflict-when-python-cpopen-is-installed.patch
+Patch5:         0006-spec-replace-requires-vdsm-python-cpopen.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -262,7 +263,7 @@ BuildArch:      noarch
 
 Requires: %{name}-python = %{version}-%{release}
 Requires: %{name}-xmlrpc = %{version}-%{release}
-Requires: %{name}-python-cpopen
+Requires: python-cpopen
 
 %description cli
 Call VDSM commands from the command line. Used for testing and debugging.
@@ -272,7 +273,7 @@ Summary:        VDSM xmlrpc API
 BuildArch:      noarch
 
 Requires: %{name}-python = %{version}-%{release}
-Requires: %{name}-python-cpopen
+Requires: python-cpopen
 
 
 %description xmlrpc
@@ -571,7 +572,7 @@ Gluster plugin enables VDSM to serve Gluster functionalities.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-
+%patch5 -p1
 
 %if 0%{?rhel} == 6
 sed -i '/ su /d' vdsm/vdsm-logrotate.conf.in
@@ -1337,6 +1338,9 @@ exit 0
 %attr(755, root, root) %{python_sitearch}/cpopen/cpopen.so*
 
 %changelog
+* Mon Feb 03 2014 Douglas Schilling Landgraf <dougsland at redhat.com> - 4.13.3-3
+- spec: replace requires vdsm-python-cpopen
+
 * Thu Jan 23 2014 Douglas Schilling Landgraf <dougsland at redhat.com> - 4.13.3-2
 - Report conflict when python-cpopen is installed