rpms/heartbeat/devel IPaddr, NONE, 1.1 sources, 1.8, 1.9 .cvsignore, 1.8, 1.9 heartbeat.spec, 1.20, 1.21 heartbeat-2.1.2-open.patch, 1.1, NONE heartbeat-fedora-chkconfig.patch, 1.2, NONE

[Kevin Fenzi (kevin)]

Author: kevin

Update of /cvs/extras/rpms/heartbeat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30224

Modified Files:
	sources .cvsignore heartbeat.spec 
Added Files:
	IPaddr 
Removed Files:
	heartbeat-2.1.2-open.patch heartbeat-fedora-chkconfig.patch 
Log Message:
Update to 2.1.3
Add management GUI
Drop upstreamed patches
Add patch for IPAddr (bz #434653)



--- NEW FILE IPaddr ---

--- a/resources/OCF/IPaddr	Thu Jul 26 19:26:13 2007 -0600
+++ b/resources/OCF/IPaddr	Tue Feb 19 20:46:11 2008 +0100
@@ -247,9 +247,10 @@ lvs_restore_loopback() {
     CMD="OCF_RESKEY_cidr_netmask=32 OCF_RESKEY_ip=$1 OCF_RESKEY_nic=$ifname $FINDIF"
     if
       NICINFO=`eval $CMD`
+      NICINFO=`echo $NICINFO | tr -s " "`
     then
-	netmask_text=`echo "$NICINFO" | cut -f2 -d " "`
-	broadcast=`echo "$NICINFO" | cut -f3 -d " "`
+	netmask_text=`echo "$NICINFO" | cut -f3 -d " "`
+	broadcast=`echo "$NICINFO" | cut -f5 -d " "`
     else
 	echo "ERROR: $CMD failed (rc=$rc)"
 	exit $OCF_ERR_GENERIC






Index: sources
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Aug 2007 17:01:45 -0000	1.8
+++ sources	28 Feb 2008 20:24:12 -0000	1.9
@@ -1 +1 @@
-56868ab82936b3f77deb777992c4a80d  heartbeat-2.1.2.tar.gz
+bca53530a3802f7677772323047405cd  heartbeat-2.1.3.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 Aug 2007 17:01:45 -0000	1.8
+++ .cvsignore	28 Feb 2008 20:24:12 -0000	1.9
@@ -1 +1 @@
-heartbeat-2.1.2.tar.gz
+heartbeat-2.1.3.tar.gz


Index: heartbeat.spec
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/devel/heartbeat.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- heartbeat.spec	19 Feb 2008 10:15:03 -0000	1.20
+++ heartbeat.spec	28 Feb 2008 20:24:12 -0000	1.21
@@ -5,15 +5,14 @@
 %define           uname hacluster
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
-Version:          2.1.2
-Release:          4%{?dist}
+Version:          2.1.3
+Release:          1%{?dist}
 License:          GPLv2 and LGPLv2+
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
 Source0:          http://linux-ha.org/download/%{name}-%{version}.tar.gz
 Patch0:           heartbeat-fedora-pam.patch
-Patch1:           heartbeat-fedora-chkconfig.patch
-Patch2:           heartbeat-2.1.2-open.patch
+Patch1:           http://hg.linux-ha.org/dev/raw-diff/806faf36d956/resources/OCF/IPaddr
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires:    glib2-devel
 BuildRequires:    iputils
@@ -106,11 +105,20 @@
 %description devel
 Heartbeat development package
 
+%package gui
+Summary: Provides a gui interface to manage heartbeat clusters
+Group: System Environment/Daemons
+Requires: heartbeat = %{version}-%{release}
+Requires: PyXML
+Requires: pygtk2 >= 2.4
+
+%description gui
+GUI client for Heartbeat clusters
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
  
 %build
 # disable-fatal-warnings flag used to disable gcc4.x warnings of 'difference in signedness'
@@ -206,7 +214,6 @@
 %{_sysconfdir}/ha.d/rc.d
 %config(noreplace) %{_sysconfdir}/ha.d/README.config
 %{_libdir}/heartbeat
-%{_libdir}/heartbeat-gui
 %{_libdir}/libapphb.so.*
 %{_libdir}/libccmclient.so.*
 %{_libdir}/libcib.so.*
@@ -236,8 +243,8 @@
 %dir %{_var}/run/heartbeat
 %attr (2755, hacluster, haclient) %{_bindir}/cl_status
 %{_bindir}/cl_respawn
-%{_bindir}/hb_gui
-%{_datadir}/heartbeat-gui/
+%{_sbindir}/ciblint
+%{_sbindir}/hb_report
 %{_sbindir}/crmadmin
 %{_sbindir}/cibadmin
 %{_sbindir}/ccm_tool
@@ -288,12 +295,10 @@
 %doc ldirectord/ldirectord.cf
 %defattr(-,root,root,-)
 %{_sbindir}/ldirectord
-%{_sbindir}/supervise-ldirectord-config
 %config(noreplace) %{_sysconfdir}/logrotate.d/ldirectord
 %{_sysconfdir}/init.d/ldirectord
 %{_sysconfdir}/ha.d/resource.d/ldirectord
 %{_mandir}/man8/ldirectord.8*
-%{_mandir}/man8/supervise-ldirectord-config.8*
 
 %files -n stonith
 %doc doc/COPYING 
@@ -325,7 +330,19 @@
 %{_includedir}/pils/
 %{_libdir}/*.so
 
+%files gui
+%defattr(-,root,root)
+%{_libdir}/heartbeat-gui
+%{_datadir}/heartbeat-gui
+%{_bindir}/hb_gui
+
 %changelog
+* Mon Feb 25 2008 Kevin Fenzi <kevin at tummy.com> - 2.1.3-1
+- Update to 2.1.3
+- Add management GUI
+- Drop upstreamed patches
+- Add patch for IPAddr (bz #434653)
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.1.2-4
 - Autorebuild for GCC 4.3
 


--- heartbeat-2.1.2-open.patch DELETED ---


--- heartbeat-fedora-chkconfig.patch DELETED ---