rpms/heartbeat/devel heartbeat-2.1.4-duplicate-drbd.patch, NONE, 1.1 heartbeat.spec, 1.31, 1.32

[Kevin Fenzi]

Author: kevin

Update of /cvs/extras/rpms/heartbeat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4973

Modified Files:
	heartbeat.spec 
Added Files:
	heartbeat-2.1.4-duplicate-drbd.patch 
Log Message:
Add perl(Net::IMAP::Simple::SSL) to ldirector subpackage
Fix MAILCMD (#502443)
Add patch to fix duplicate install of OCF drbd


heartbeat-2.1.4-duplicate-drbd.patch:

--- NEW FILE heartbeat-2.1.4-duplicate-drbd.patch ---
diff -Nur Heartbeat-STABLE-2-1-STABLE-2.1.4.orig/resources/OCF/Makefile.am Heartbeat-STABLE-2-1-STABLE-2.1.4/resources/OCF/Makefile.am
--- Heartbeat-STABLE-2-1-STABLE-2.1.4.orig/resources/OCF/Makefile.am	2008-08-18 06:32:19.000000000 -0600
+++ Heartbeat-STABLE-2-1-STABLE-2.1.4/resources/OCF/Makefile.am	2009-06-11 22:49:52.000000000 -0600
@@ -51,7 +51,6 @@
 			AudibleAlarm	\
 			db2		\
 			Delay		\
-			drbd		\
 			eDir88		\
 			EvmsSCC		\
 			Evmsd		\


Index: heartbeat.spec
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/devel/heartbeat.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- heartbeat.spec	5 May 2009 04:25:06 -0000	1.31
+++ heartbeat.spec	12 Jun 2009 05:05:55 -0000	1.32
@@ -6,13 +6,14 @@
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
 Version:          2.1.4
-Release:          7%{?dist}
+Release:          8%{?dist}
 License:          GPLv2 and LGPLv2+
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
 Source0:          http://hg.linux-ha.org/lha-2.1/archive/STABLE-%{version}.tar.bz2
 Patch0:           heartbeat-fedora-pam.patch
 Patch1:           heartbeat-2.1.4-default-init.patch
+Patch2:           heartbeat-2.1.4-duplicate-drbd.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires:    glib2-devel
 BuildRequires:    iputils
@@ -28,6 +29,7 @@ BuildRequires:    gettext
 BuildRequires:    bison
 BuildRequires:    flex
 BuildRequires:    zlib-devel
+BuildRequires:    mailx
 %if %{ENABLE_MGMT}
 BuildRequires:    gnutls-devel 
 BuildRequires:    pam-devel
@@ -68,7 +70,8 @@ Requires(post):   /sbin/chkconfig
 Requires(preun):  /sbin/chkconfig
 Provides: ldirectord = %{version}-%{release}
 Obsoletes: ldirectord < 2.1.4-5
-Requires:         ldirectord = %{version}-%{release}
+Requires:  ldirectord = %{version}-%{release}
+Requires:  perl(Net::IMAP::Simple::SSL)
 
 %description ldirectord
 ldirectord is a stand-alone daemon to monitor services of real 
@@ -127,6 +130,7 @@ GUI client for Heartbeat clusters
 %setup -q -n Heartbeat-STABLE-2-1-STABLE-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
  
 %build
 ./bootstrap
@@ -342,6 +346,11 @@ fi
 %{_bindir}/hb_gui
 
 %changelog
+* Fri Jun 11 2009 Kevin Fenzi <kevin at tummy.com> - 2.1.4-8
+- Add perl(Net::IMAP::Simple::SSL) to ldirector subpackage
+- Fix MAILCMD (#502443)
+- Add patch to fix duplicate install of OCF drbd
+
 * Fri Apr 24 2009 Kevin Fenzi <kevin at tummy.com> - 2.1.4-7
 - Move ldirector dep to subpackage (#493625)
 - Add zlib-devel to BuildRequires (#497079)