[vdsm/f19] Applying direct to Fedora spec the fence-agents changes

[Douglas Schilling Landgraf]

commit 93cd2ad8f41d5fa159eaa6a8cc3b785b87a0aea4
Author: Douglas Schilling Landgraf <dougsland at redhat.com>
Date:   Tue Mar 26 10:34:13 2013 -0400

    Applying direct to Fedora spec the fence-agents changes

 vdsm.spec |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/vdsm.spec b/vdsm.spec
index 2ff3e87..3137936 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -32,7 +32,7 @@
 
 Name:           %{vdsm_name}
 Version:        4.10.3
-Release:        11%{?vdsm_relvtag}%{?dist}%{?extra_release}
+Release:        12%{?vdsm_relvtag}%{?dist}%{?extra_release}
 Summary:        Virtual Desktop Server Manager
 
 Group:          Applications/System
@@ -88,7 +88,6 @@ 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)
 
 BuildRequires: python
@@ -147,6 +146,7 @@ Requires: dmidecode
 ExclusiveArch:  x86_64
 Requires: device-mapper-multipath
 Requires: e2fsprogs
+Requires: fence-agents-all
 Requires: iscsi-initiator-utils
 Requires: libvirt
 Requires: lvm2
@@ -164,6 +164,7 @@ Requires: libvirt >= 0.9.10-21.el6_3.5
 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
@@ -173,6 +174,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
@@ -199,7 +205,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
@@ -1100,6 +1105,9 @@ exit 0
 %{_datadir}/%{vdsm_name}/gluster/hostname.py*
 
 %changelog
+* Mon Mar 26 2013 Douglas Schilling Landgraf <dougsland at redhat.com> 4.10.3-12
+- Applying direct to spec the fence-agents changes and removing the patch.
+
 * Mon Mar 25 2013 Douglas Schilling Landgraf <dougsland at redhat.com> 4.10.3-11
 - adapt vdsm.spec to new fence-agents package name.