Hello community, here is the log from the commit of package heartbeat checked in at Fri Jul 25 16:03:47 CEST 2008. -------- --- heartbeat/heartbeat.changes 2008-04-12 19:36:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/heartbeat/heartbeat.changes 2008-07-18 15:50:10.000000000 +0200 @@ -1,0 +2,7 @@ +Fri July 18 13:39:00 CEST 2008 - abeekhof@suse.de + +- Merge with upstream (dev tree: 95b9cf7578f4) +- Stonithd has been moved into Pacemaker +- Build with --enable-libc-malloc instead of Heartbeat's home grown allocator + +-------------------------------------------------------------------- Old: ---- heartbeat-bootstrap.patch lrmd-return-rc.diff lrm-true-rc.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ heartbeat.spec ++++++ --- /var/tmp/diff_new_pack.z31038/_old 2008-07-25 16:03:15.000000000 +0200 +++ /var/tmp/diff_new_pack.z31038/_new 2008-07-25 16:03:15.000000000 +0200 @@ -25,7 +25,7 @@ Name: heartbeat Summary: The Heartbeat Subsystem for High-Availability Linux Version: 2.1.3 -Release: 1 +Release: 28 License: GPL v2 or later; LGPL v2.1 or later Url: http://linux-ha.org/ %if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version} @@ -38,9 +38,6 @@ Source2: heartbeat.rpmlintrc Patch1: heartbeat-doc-directory.diff Patch2: heartbeat-cmi-indication-temporary-fix.diff -Patch4: lrmd-return-rc.diff -Patch5: lrm-true-rc.diff -Patch7: heartbeat-bootstrap.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-core = %{version}-%{release} Requires: %{name}-resources = %{version}-%{release} @@ -352,9 +349,6 @@ %setup -n heartbeat %patch1 -p0 %patch2 -p0 -%patch4 -p1 -%patch5 -p1 -%patch7 -p0 %if 0%{?suse_version} cp $RPM_SOURCE_DIR/heartbeat.suse.in ./heartbeat/init.d/heartbeat.in %endif @@ -393,7 +387,7 @@ --with-group-name=%{gname} --with-ccmuser-name=%{uname} \ --with-group-id=%{uid} --with-ccmuser-id=%{uid} \ --with-hapkgversion=%{version} \ - --enable-glib-malloc \ + --enable-libc-malloc \ --enable-pretty \ %if %without_fatal_warnings --enable-fatal-warnings=no \ @@ -593,11 +587,8 @@ %{_libdir}/libccmclient.so.* %{_libdir}/librecoverymgr.so.* %{_libdir}/heartbeat/plugins/AppHBNotification -%{_libdir}/libstonithd.so.* -%{_libdir}/heartbeat/plugins/RAExec/stonith** /sbin/rcheartbeat %{_libdir}/heartbeat/apphbd -%{_libdir}/heartbeat/stonithd %{_bindir}/cl_respawn %attr (2555, root, haclient) %{_bindir}/cl_status %doc %{_mandir}/man1/cl_status.1* @@ -640,13 +631,11 @@ %{_libdir}/heartbeat/findif %{_libdir}/heartbeat/ha_logd %{_libdir}/heartbeat/ha_logger -%exclude %{_libdir}/heartbeat/haresources2cib.* %{_libdir}/heartbeat/lrmadmin %{_libdir}/heartbeat/lrmd %{_libdir}/heartbeat/ocf-returncodes %{_libdir}/heartbeat/ocf-shellfuncs %{_libdir}/heartbeat/plugins/RAExec -%exclude %{_libdir}/heartbeat/plugins/RAExec/stonith* %{_libdir}/heartbeat/send_arp %{_libdir}/heartbeat/utillib.sh %doc %{_mandir}/man8/apphbd.8* @@ -682,30 +671,27 @@ %{_libdir}/liblrm*.so %{_libdir}/libpils*.so %{_libdir}/libplumb*.so -%{_libdir}/libplumbgpl*.so %{_libdir}/libapphb*.so %{_libdir}/libstonith*.so -%exclude %{_libdir}/libstonithd*.so #%{_datadir}/heartbeat/logtest %{_libdir}/heartbeat/logtest %{_datadir}/heartbeat/lrmtest +%{_datadir}/heartbeat/ra-api-1.dtd %exclude %{_libdir}/heartbeat/lrmtest +%exclude %{_libdir}/heartbeat/ra-api-1.dtd %files devel %defattr(-,root,root) #%doc %{_datadir}/doc/%{name}-%{version} %{_includedir}/saf/ %{_includedir}/ocf/ -%{_includedir}/heartbeat/fencing %{_includedir}/heartbeat/HBauth.h %{_includedir}/heartbeat/HBcomm.h %{_includedir}/heartbeat/hb_api.h %{_includedir}/heartbeat/recoverymgr.h -%exclude %{_includedir}/heartbeat/mgmt %{_libdir}/libccmclient*.so %{_libdir}/libclm*.so %{_libdir}/libhbclient*.so -%{_libdir}/libstonithd*.so %{_libdir}/librecoverymgr*.so %{_libdir}/heartbeat/quorumdtest %{_libdir}/heartbeat/clmtest @@ -717,18 +703,16 @@ %{_libdir}/heartbeat/apphbtest %{_libdir}/heartbeat/base64_md5_test %{_libdir}/heartbeat/ccm_testclient -%{_datadir}/heartbeat/stonithdtest %{_datadir}/heartbeat/cts %{_datadir}/heartbeat/BasicSanityCheck %{_datadir}/heartbeat/TestHeartbeatComm -%exclude %{_libdir}/heartbeat/stonithdtest %files resources %defattr(-,root,root) %dir /usr/lib/ocf -%dir /usr/lib/ocf/resource.d -%dir /usr/lib/ocf/resource.d/heartbeat -/usr/lib/ocf/resource.d/heartbeat +#%dir /usr/lib/ocf/resource.d +%exclude %{_sysconfdir}/ha.d/resource.d/ldirectord +/usr/lib/ocf/resource.d ########################################################### # Files for ldirectord @@ -748,6 +732,10 @@ %config(noreplace) %{_sysconfdir}/logrotate.d/ldirectord %changelog +* Fri Jul 18 2008 abeekhof@suse.de +- Merge with upstream (dev tree: 95b9cf7578f4) +- Stonithd has been moved into Pacemaker +- Build with --enable-libc-malloc instead of Heartbeat's home grown allocator * Sat Apr 12 2008 abeekhof@suse.de - Merge with upstream (dev tree: 2fd7a214a161) - CRM now maintained as the pacemaker project ++++++ heartbeat.tar.gz ++++++ ++++ 173165 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org