From 9ca48c6f09dec01299f810a7c5b26879d96d4f03 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@fedoraproject.org>
Date: Jun 12 2009 16:57:06 +0000
Subject: Add perl(Net::IMAP::Simple::SSL) to ldirector subpackage Fix MAILCMD

    (#502443) Add patch to fix duplicate install of OCF drbd Move ldirector
    dep to subpackage (#493625) Add zlib-devel to BuildRequires (#497079)
    Add pygtk2-libglade (#497079)

---

diff --git a/heartbeat-2.1.4-duplicate-drbd.patch b/heartbeat-2.1.4-duplicate-drbd.patch
new file mode 100644
index 0000000..be8763f
--- /dev/null
+++ b/heartbeat-2.1.4-duplicate-drbd.patch
@@ -0,0 +1,11 @@
+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		\
diff --git a/heartbeat.spec b/heartbeat.spec
index 5aa4cf6..656ce88 100644
--- a/heartbeat.spec
+++ b/heartbeat.spec
@@ -6,13 +6,14 @@
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
 Version:          2.1.4
-Release:          6%{?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
@@ -27,13 +28,14 @@ BuildRequires:    libxml2-devel
 BuildRequires:    gettext
 BuildRequires:    bison
 BuildRequires:    flex
+BuildRequires:    zlib-devel
+BuildRequires:    mailx
 %if %{ENABLE_MGMT}
 BuildRequires:    gnutls-devel 
 BuildRequires:    pam-devel
 BuildRequires:    python-devel
 BuildRequires:    swig
 %endif
-Requires:         ldirectord = %{version}-%{release}
 Requires:	  PyXML
 Requires(pre):	  shadow-utils
 Requires(post):   /sbin/chkconfig
@@ -68,6 +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:  perl(Net::IMAP::Simple::SSL)
 
 %description ldirectord
 ldirectord is a stand-alone daemon to monitor services of real 
@@ -117,7 +121,7 @@ Summary: Provides a gui interface to manage heartbeat clusters
 Group: System Environment/Daemons
 Requires: heartbeat = %{version}-%{release}
 Requires: PyXML
-Requires: pygtk2 >= 2.4
+Requires: pygtk2-libglade
 
 %description gui
 GUI client for Heartbeat clusters
@@ -126,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
@@ -341,6 +346,16 @@ fi
 %{_bindir}/hb_gui
 
 %changelog
+* Fri Jun 11 2009 Kevin Fenzi <kevin@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@tummy.com> - 2.1.4-7
+- Move ldirector dep to subpackage (#493625)
+- Add zlib-devel to BuildRequires (#497079)
+- Add pygtk2-libglade (#497079)
+
 * Tue Feb 24 2009 Kevin Fenzi <kevin@tummy.com> - 2.1.4-6
 - Remove symlink thats no longer needed.