[vdsm/f19] vdsm-4.10.3-11

[Douglas Schilling Landgraf]

commit e60389f4277f2a3dcf977b20d5b0f777c2aac452
Author: Douglas Schilling Landgraf <dougsland at redhat.com>
Date:   Mon Mar 25 10:25:03 2013 -0300

    vdsm-4.10.3-11
    
      - 0037-vdsm.spec-fence-agents-all.patch

 0037-vdsm.spec-fence-agents-all.patch |   59 +++++++++++++++++++++++++++++++++
 vdsm.spec                             |    7 +++-
 2 files changed, 65 insertions(+), 1 deletions(-)
---
diff --git a/0037-vdsm.spec-fence-agents-all.patch b/0037-vdsm.spec-fence-agents-all.patch
new file mode 100644
index 0000000..398c464
--- /dev/null
+++ b/0037-vdsm.spec-fence-agents-all.patch
@@ -0,0 +1,59 @@
+From ed7c81971e539e0940d3ffdfe3f913ca99cde14d Mon Sep 17 00:00:00 2001
+From: Douglas Schilling Landgraf <dougsland at redhat.com>
+Date: Fri, 22 Mar 2013 21:46:34 -0400
+Subject: [PATCH] vdsm.spec: fence-agents-all
+
+fence-agents package in version 4 replaced the package name
+to fence-agents-all. This patch will adapt vdsm spec to this change.
+
+Change-Id: Ie4e92fda50aadb8223e721d72d43ea03b9b24f2d
+Signed-off-by: Douglas Schilling Landgraf <dougsland at redhat.com>
+Reviewed-on: http://gerrit.ovirt.org/13249
+Reviewed-by: Dan Kenigsberg <danken at redhat.com>
+---
+ vdsm.spec.in | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/vdsm.spec.in b/vdsm.spec.in
+index abfdbf9..3f7397a 100644
+--- a/vdsm.spec.in
++++ b/vdsm.spec.in
+@@ -101,6 +101,7 @@ Requires: dmidecode
+ ExclusiveArch:  x86_64
+ Requires: device-mapper-multipath
+ Requires: e2fsprogs
++Requires: fence-agents-all
+ Requires: iscsi-initiator-utils
+ Requires: libvirt
+ Requires: lvm2
+@@ -118,6 +119,7 @@ Requires: libvirt >= 0.10.2-18.el6_4.2
+ Requires: iscsi-initiator-utils >= 6.2.0.872-15
+ Requires: device-mapper-multipath >= 0.4.9-52
+ Requires: e2fsprogs >= 1.41.12-11
++Requires: fence-agents
+ Requires: kernel >= 2.6.32-279.9.1
+ Requires: sanlock >= 2.3-4, sanlock-python
+ Requires: initscripts >= 9.03.31-2.el6_3.1
+@@ -127,6 +129,11 @@ Requires: lvm2 >= 2.02.95-10.el6_3.2
+ Requires: logrotate < 3.8.0
+ %endif
+ %else
++%if 0%{?fedora} >= 19
++Requires: fence-agents-all
++%else
++Requires: fence-agents
++%endif
+ # Subprocess and thread bug was found on python 2.7.2
+ Requires: python >= 2.7.3
+ Requires: qemu-kvm >= 2:0.15.0-4
+@@ -156,7 +163,6 @@ Requires: systemd >= 197-1.fc18.2
+ 
+ Requires: libvirt-python, libvirt-lock-sanlock, libvirt-client
+ Requires: psmisc >= 22.6-15
+-Requires: fence-agents
+ Requires: bridge-utils
+ Requires: sos
+ Requires: tree
+-- 
+1.8.1.4
+
diff --git a/vdsm.spec b/vdsm.spec
index 193600a..2ff3e87 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -32,7 +32,7 @@
 
 Name:           %{vdsm_name}
 Version:        4.10.3
-Release:        10%{?vdsm_relvtag}%{?dist}%{?extra_release}
+Release:        11%{?vdsm_relvtag}%{?dist}%{?extra_release}
 Summary:        Virtual Desktop Server Manager
 
 Group:          Applications/System
@@ -86,6 +86,7 @@ Patch32:        0033-gluster-Handling-Attribute-error-in-Python-2.6.patch
 Patch33:        0034-bootstrap-remove-glusterfs-packages.patch
 Patch34:        0035-gluster-set-glusterfs-dependency-version.patch
 Patch35:        0036-Do-not-delete-the-template-when-zeroing-a-dependant-.patch
+Patch36:        0037-vdsm.spec-fence-agents-all.patch
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -508,6 +509,7 @@ Gluster plugin enables VDSM to serve Gluster functionalities.
 %patch33 -p1 -b .patch33
 %patch34 -p1 -b .patch34
 %patch35 -p1 -b .patch35
+%patch36 -p1 -b .patch36
 
 %if 0%{?rhel} == 6
 sed -i '/ su /d' vdsm/vdsm-logrotate.conf.in
@@ -1098,6 +1100,9 @@ exit 0
 %{_datadir}/%{vdsm_name}/gluster/hostname.py*
 
 %changelog
+* Mon Mar 25 2013 Douglas Schilling Landgraf <dougsland at redhat.com> 4.10.3-11
+- adapt vdsm.spec to new fence-agents package name.
+
 * Thu Mar 14 2013 Federico Simoncelli <fsimonce at redhat.com> 4.10.3-10
 - gluster: Handling Attribute error in Python 2.6
 - bootstrap: remove glusterfs packages