rpms/heartbeat/EL-5 heartbeat-2.1.4-default-init.patch, NONE, 1.1 sources, 1.7, 1.8 .cvsignore, 1.7, 1.8 heartbeat.spec, 1.12, 1.13 heartbeat-fedora-ccmuser.patch, 1.1, NONE heartbeat-fedora-chkconfig.patch, 1.2, NONE

Tue Mar 3 01:26:58 UTC 2009

Author: kevin

Update of /cvs/extras/rpms/heartbeat/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29187

Modified Files:
	sources .cvsignore heartbeat.spec 
Added Files:
	heartbeat-2.1.4-default-init.patch 
Removed Files:
	heartbeat-fedora-ccmuser.patch 
	heartbeat-fedora-chkconfig.patch 
Log Message:
2.1.4 for epel5


heartbeat-2.1.4-default-init.patch:

--- NEW FILE heartbeat-2.1.4-default-init.patch ---
diff -Nur Heartbeat-STABLE-2-1-STABLE-2.1.4.orig/heartbeat/init.d/heartbeat.in Heartbeat-STABLE-2-1-STABLE-2.1.4/heartbeat/init.d/heartbeat.in
--- Heartbeat-STABLE-2-1-STABLE-2.1.4.orig/heartbeat/init.d/heartbeat.in	2008-08-18 06:32:19.000000000 -0600
+++ Heartbeat-STABLE-2-1-STABLE-2.1.4/heartbeat/init.d/heartbeat.in	2008-12-01 20:23:23.000000000 -0700
@@ -12,7 +12,7 @@
 #		We don't hate anyone, and like for everyone to use
 #		our software, no matter what OS or distribution you're using.
 #
-# chkconfig: 2345 @HB_INITSTARTPRI@ @HB_INITSTOPPRI@
+# chkconfig: - @HB_INITSTARTPRI@ @HB_INITSTOPPRI@
 # description: Startup script high-availability services.
 # processname: heartbeat
 # pidfile: @localstatedir@/run/heartbeat.pid


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	21 Jan 2007 20:05:01 -0000	1.7
+++ sources	3 Mar 2009 01:26:27 -0000	1.8
@@ -1 +1 @@
-39d7d12d2a7d5c98d1e3f8ae7977a3e6  heartbeat-2.0.8.tar.gz
+2e53a9996beb1ff7611d3f7300586951  STABLE-2.1.4.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	21 Jan 2007 20:05:01 -0000	1.7
+++ .cvsignore	3 Mar 2009 01:26:27 -0000	1.8
@@ -1 +1 @@
-heartbeat-2.0.8.tar.gz
+STABLE-2.1.4.tar.bz2


Index: heartbeat.spec
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/EL-5/heartbeat.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- heartbeat.spec	9 Feb 2007 09:54:56 -0000	1.12
+++ heartbeat.spec	3 Mar 2009 01:26:27 -0000	1.13
@@ -5,14 +5,14 @@
 %define           uname hacluster
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
-Version:          2.0.8
-Release:          2%{?dist}
-License:          GPL/LGPL
+Version:          2.1.4
+Release:          6%{?dist}
+License:          GPLv2 and LGPLv2+
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
-Source0:          http://linux-ha.org/download/%{name}-%{version}.tar.gz
+Source0:          http://hg.linux-ha.org/lha-2.1/archive/STABLE-%{version}.tar.bz2
 Patch0:           heartbeat-fedora-pam.patch
-Patch1:           heartbeat-fedora-chkconfig.patch
+Patch1:           heartbeat-2.1.4-default-init.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires:    glib2-devel
 BuildRequires:    iputils
@@ -21,18 +21,21 @@
 BuildRequires:    net-snmp-devel >= 5.4
 BuildRequires:    bzip2-devel 
 BuildRequires:    ncurses-devel
+BuildRequires:    openssl-devel
+BuildRequires:    libtool
+BuildRequires:    libxml2-devel
+BuildRequires:    gettext
+BuildRequires:    bison
+BuildRequires:    flex
 %if %{ENABLE_MGMT}
 BuildRequires:    gnutls-devel 
 BuildRequires:    pam-devel
 BuildRequires:    python-devel
 BuildRequires:    swig
 %endif
-Requires:         stonith = %{version}-%{release}
-Requires:         pils = %{version}-%{release}
 Requires:         ldirectord = %{version}-%{release}
-Requires:         pygtk2 >= 2.4
-Requires(pre):    fedora-usermgmt
-Requires(postun): fedora-usermgmt
+Requires:	  PyXML
+Requires(pre):	  shadow-utils
 Requires(post):   /sbin/chkconfig
 Requires(preun):  /sbin/chkconfig
 %if %{ENABLE_MGMT}
@@ -57,37 +60,42 @@
         - "ping" heartbeats (for routers, switches, etc.)
            (to be used for breaking ties in 2-node systems)
 
-%package -n ldirectord
+%package ldirectord
 Summary:          Monitor daemon for maintaining high availability resources
 Group:            System Environment/Daemons
 Requires:         ipvsadm
 Requires(post):   /sbin/chkconfig
 Requires(preun):  /sbin/chkconfig
+Provides: ldirectord = %{version}-%{release}
+Obsoletes: ldirectord < 2.1.4-5
 
-%description -n ldirectord
+%description ldirectord
 ldirectord is a stand-alone daemon to monitor services of real 
 for virtual services provided by The Linux Virtual Server
 (http://www.linuxvirtualserver.org/). It is simple to install 
 and works with the heartbeat code (http://www.linux-ha.org/).
 
-%package -n stonith
-Requires:       pils = %{version}-%{release}
+%package stonith
 Requires:       net-snmp-libs
 Summary:        Provides an interface to Shoot The Other Node In The Head 
 Group:          System Environment/Daemons
+Provides: stonith = %{version}-%{release}
+Obsoletes: stonith < 2.1.4-5
 
-%description -n stonith
-The STONITH module (a.k.a. STOMITH) provides an extensible interface
+%description stonith
+The STONITH module (a.k.a. STONITH) provides an extensible interface
 for remotely powering down a node in the cluster.  The idea is quite simple:
 When the software running on one machine wants to make sure another
 machine in the cluster is not using a resource, pull the plug on the other 
 machine. It's simple and reliable, albeit admittedly brutal.
 
-%package -n pils
+%package pils
 Summary:        Provides a general plugin and interface loading library
 Group:          System Environment/Daemons
+Provides: pils = %{version}-%{release}
+Obsoletes: pils < 2.1.4-5
 
-%description -n pils
+%description pils
 PILS is an generalized and portable open source Plugin and Interface Loading 
 System. PILS was developed as part of the Open Cluster Framework reference 
 implementation, and is designed to be directly usable by a wide variety of 
@@ -104,15 +112,27 @@
 %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
+%setup -q -n Heartbeat-STABLE-2-1-STABLE-%{version}
 %patch0 -p1
 %patch1 -p1
  
 %build
+./bootstrap
 # disable-fatal-warnings flag used to disable gcc4.x warnings of 'difference in signedness'
 CFLAGS=${RPM_OPT_FLAGS} \
 %configure \
+  --with-ocf-root=%{_datadir}/ocf \
   --disable-fatal-warnings \
   --disable-static \
 %if %{ENABLE_MGMT}
@@ -120,16 +140,17 @@
 %else
   --disable-mgmt
 %endif
-make
+
+# get rid of rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-(
-  cd $RPM_BUILD_ROOT/etc/ha.d/resource.d
-  ln -s /usr/sbin/ldirectord ldirectord
-)
 
 # cleanup
 [ -d $RPM_BUILD_ROOT/usr/man ] && rm -rf $RPM_BUILD_ROOT/usr/man
@@ -142,55 +163,61 @@
 chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs
 chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat-gui/pymgmt.py
 
+# fix some wrong line endings issues
+sed -i 's/\r//' $RPM_BUILD_ROOT/%{_datadir}/ocf/resource.d/heartbeat/SAPDatabase
+sed -i 's/\r//' $RPM_BUILD_ROOT/%{_datadir}/ocf/resource.d/heartbeat/SAPInstance
+
+%find_lang haclient
+
 %clean
-if [ -n "${RPM_BUILD_ROOT}"  -a "${RPM_BUILD_ROOT}" != "/" ]; then
-  rm -rf $RPM_BUILD_ROOT
-fi
-rm -rf $RPM_BUILD_DIR/heartbeat-%{version}
+rm -rf $RPM_BUILD_ROOT
 
 %pre
-/usr/sbin/fedora-groupadd %{uid} -r %{gname} &>/dev/null || :
-/usr/sbin/fedora-useradd %{uid} -r -s /sbin/nologin -d /var/lib/heartbeat/cores/hacluster -M \
-        -c 'heartbeat user' -g %{gname} %{uname} &>/dev/null || :
+getent group %{gname} >/dev/null || groupadd -r %{gname}
+getent passwd %{uname} >/dev/null || \
+useradd -r -g %{gname} -d /var/lib/heartbeat/cores/hacluster -s /sbin/nologin \
+-c "heartbeat user" %{uname}
+exit 0
 
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add heartbeat
 
+%postun -p /sbin/ldconfig
+
 %preun
 if [ $1 = 0 ] ; then
     /sbin/service heartbeat stop
     /sbin/chkconfig --del heartbeat
 fi
 
-%postun 
-if [ "$1" -ge "1" ] ; then
-    /sbin/service heartbeat restart
-fi
 /sbin/ldconfig
-test "$1" != 0 || /usr/sbin/fedora-userdel  %{uname} &>/dev/null || :
-test "$1" != 0 || /usr/sbin/fedora-groupdel %{gname} &>/dev/null || :
 
-%post -n ldirectord
+%post ldirectord
 /sbin/chkconfig --add ldirectord
 
-%preun -n ldirectord
+%postun ldirectord -p /sbin/ldconfig
+
+%preun ldirectord
 /sbin/chkconfig --del ldirectord
 
-%post -n stonith -p /sbin/ldconfig
+%post stonith -p /sbin/ldconfig
+
+%postun stonith -p /sbin/ldconfig
 
-%postun -n stonith -p /sbin/ldconfig
+%post pils -p /sbin/ldconfig
 
-%files
+%postun pils -p /sbin/ldconfig
+
+%files -f haclient.lang
 %doc %{_datadir}/doc/%{name}-%{version}
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %dir %{_sysconfdir}/ha.d
 %{_sysconfdir}/ha.d/harc
 %config(noreplace) %{_sysconfdir}/ha.d/shellfuncs
 %{_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.*
@@ -204,7 +231,10 @@
 %{_libdir}/libplumbgpl.so.*
 %{_libdir}/librecoverymgr.so.*
 %{_libdir}/libstonithd.so.*
-%{_prefix}/lib/ocf
+%{_libdir}/libpe_rules.so.*
+%{_libdir}/libpe_status.so.*
+%{_datadir}/heartbeat/
+%{_datadir}/ocf/
 %{_sysconfdir}/ha.d/resource.d/
 %exclude %{_sysconfdir}/ha.d/resource.d/ldirectord
 %{_sysconfdir}/init.d/heartbeat
@@ -217,6 +247,8 @@
 %dir %{_var}/run/heartbeat
 %attr (2755, hacluster, haclient) %{_bindir}/cl_status
 %{_bindir}/cl_respawn
+%{_sbindir}/ciblint
+%{_sbindir}/hb_report
 %{_sbindir}/crmadmin
 %{_sbindir}/cibadmin
 %{_sbindir}/ccm_tool
@@ -233,6 +265,8 @@
 %{_sbindir}/attrd_updater
 %{_sbindir}/crm_failcount
 %{_sbindir}/ocf-tester
+%{_sbindir}/ha_logger
+%{_sbindir}/ptest
 %dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/ccm
 %dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/crm
 %dir %attr (755, hacluster, haclient) %{_var}/lib/heartbeat/crm
@@ -257,44 +291,41 @@
 %{_libdir}/libhbmgmtcommon.so.*
 %{_libdir}/libhbmgmttls.so.*
 %config(noreplace) %{_sysconfdir}/pam.d/hbmgmtd
-%{_datadir}/locale/zh_CN/LC_MESSAGES/haclient.mo
 %endif
 
-%files -n ldirectord
+%files ldirectord
 %doc doc/COPYING 
 %doc doc/README
 %doc ldirectord/ldirectord.cf
-%defattr(-,root,root)
+%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
+%files stonith
 %doc doc/COPYING 
 %doc doc/README
-%defattr(-,root,root)
-%{_libdir}/*.so.*
+%defattr(-,root,root,-)
+%{_libdir}/libstonith.so.*
 %{_libdir}/stonith/
 %{_sbindir}/stonith
 %{_sbindir}/meatclient
 %{_mandir}/man8/stonith.8*
 %{_mandir}/man8/meatclient.8*
 
-%files -n pils
+%files pils
 %doc doc/COPYING 
 %doc doc/README
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 /usr/include/pils
 %{_libdir}/libpils.*
 %{_libdir}/pils/
 
 %files devel
 %doc %{_datadir}/doc/%{name}-%{version}
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %{_includedir}/heartbeat/
 %{_includedir}/clplumbing/
 %{_includedir}/saf/
@@ -303,7 +334,79 @@
 %{_includedir}/pils/
 %{_libdir}/*.so
 
+%files gui
+%defattr(-,root,root)
+%{_libdir}/heartbeat-gui
+%{_datadir}/heartbeat-gui
+%{_bindir}/hb_gui
+
 %changelog
+* Tue Feb 24 2009 Kevin Fenzi <kevin at tummy.com> - 2.1.4-6
+- Remove symlink thats no longer needed. 
+
+* Mon Feb 23 2009 Kevin Fenzi <kevin at tummy.com> - 2.1.4-5
+- Remove fedora-usermgmt
+- Change subpackage names to match all the other heartbeat packages out there.
+
+* Sat Jan 17 2009 Kevin Fenzi <kevin at tummy.com> - 2.1.4-4
+- Main package shouldn't require pygtk2 (#480157)
+
+* Fri Jan 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.1.4-3
+- rebuild with new openssl
+
+* Thu Dec 04 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.1.4-2
+- Rebuild for Python 2.6
+
+* Mon Dec 01 2008 Kevin Fenzi <kevin at tummy.com> - 2.1.4-1
+- Update to 2.1.4
+- Drop upstreamed patch
+- Add patch to disable init script by default (#441286)
+
+* Mon Dec 01 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.1.3-4
+- Rebuild for Python 2.6
+
+* Tue Oct 21 2008 Lon Hohberger <lhh at redhat.com> - 2.1.3-3
+- Fix requires line to include PyXML (#467807)
+
+* Wed Jun 25 2008 Tomas Mraz <tmraz at redhat.com> - 2.1.3-2
+- rebuild with new gnutls
+
+* 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
+
+* Fri Dec 07 2007 Release Engineering <rel-eng at fedoraproject dot org> - 2.1.2-3
+- Rebuild for deps
+
+* Tue Aug 29 2007 Kevin Fenzi <kevin at tummy.com> - 2.1.2-2
+- Update sources
+
+* Tue Aug 29 2007 Kevin Fenzi <kevin at tummy.com> - 2.1.2-1
+- Upgrade to 2.1.2
+- Update license tag for new guidelines. 
+- Patch open function issues. 
+
+* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.0.8-4
+- Rebuild for selinux ppc32 issue.
+
+* Tue Jun 26 2007 Kevin Fenzi <kevin at tummy.com> - 2.0.8-3
+- Add openssl-devel BuildRequires
+- Remove restart from postun (bz #223949)
+- Fix up Requires (bz #245704)
+- Remove duplicate libraries in subpackages (bz #245704)
+- Add smp_mflags
+- Fix typo in stonith subpackage description
+- Simplify clean section. 
+- Use find_lang macro
+- Fix some multilib issues with ocf dir (bz #228165)
+- Kill rpath
+- Add ldconfig to postun
+
 * Fri Feb  9 2007 Joost Soeterbroek <joost.soeterbroek at gmail.com> - 2.0.8-2
 - change condrestart -> restart (bz #223949)
 


--- heartbeat-fedora-ccmuser.patch DELETED ---


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


