Hello community,
here is the log from the commit of package heartbeat for openSUSE:Factory
checked in at Fri Feb 11 01:31:57 CET 2011.
--------
--- heartbeat/heartbeat.changes 2010-11-23 10:45:04.000000000 +0100
+++ /mounts/work_src_done/STABLE/heartbeat/heartbeat.changes 2011-02-07 14:10:08.000000000 +0100
@@ -1,0 +2,11 @@
+Mon Feb 7 14:09:54 CET 2011 - ro@suse.de
+
+- add buildrequires for libglue-devel
+
+-------------------------------------------------------------------
+Mon Feb 7 13:07:44 CET 2011 - ro@suse.de
+
+- update to current version STABLE-3.0.4
+- drop ldirectord subpackage (now in resource-agents)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
heartbeat-am111.diff
heartbeat.tar.gz
ldirectord.suse.in
New:
----
STABLE-3.0.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ heartbeat.spec ++++++
--- /var/tmp/diff_new_pack.TKrpJQ/_old 2011-02-11 01:31:25.000000000 +0100
+++ /var/tmp/diff_new_pack.TKrpJQ/_new 2011-02-11 01:31:25.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package heartbeat (Version 2.99.3)
+# spec file for package heartbeat
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -36,21 +36,20 @@
Name: heartbeat
Summary: The Heartbeat Subsystem for High-Availability Linux
-Version: 2.99.3
-Release: 22
+Version: 3.0.4
+Release: 1
License: GPLv2+ ; LGPLv2.1+
Url: http://linux-ha.org/
Group: Productivity/Clustering/HA
-Source: heartbeat.tar.gz
+Source: STABLE-3.0.4.tar.bz2
Source1: heartbeat.suse.in
-Source2: ldirectord.suse.in
Source100: heartbeat.rpmlintrc
-Patch0: heartbeat-am111.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-common = %{version}-%{release}
Requires: %{name}-resources = %{version}-%{release}
Requires: /bin/ping perl-TimeDate
BuildRequires: curl-devel e2fsprogs-devel glib2-devel iputils libxml2-devel lynx python
+BuildRequires: docbook-xsl-stylesheets libglue-devel libxslt
AutoReqProv: on
%if 0%{?fedora_version}
Requires(post): /sbin/chkconfig
@@ -210,14 +209,14 @@
Sun Jiang Dong
(See doc/AUTHORS)
-%package -n libheartbeat2
+%package -n libapphb2
License: GPLv2+ ; LGPLv2.1+
Summary: The Heartbeat Subsystem for High-Availability Linux
Group: Productivity/Clustering/HA
-Obsoletes: %{name}-pils < 2.99
-Obsoletes: %{name}-stonith < 2.99
+Provides: libheartbeat2 = %{version}
+Obsoletes: libheartbeat2 <= %{version}
-%description -n libheartbeat2
+%description -n libapphb2
heartbeat is a sophisticated multinode resource manager for High
Availability clusters.
@@ -252,13 +251,15 @@
Sun Jiang Dong
(See doc/AUTHORS)
-%package -n libheartbeat-devel
+%package -n libapphb-devel
License: GPLv2+ ; LGPLv2.1+
Summary: The Heartbeat Subsystem for High-Availability Linux
Group: Productivity/Clustering/HA
-Requires: libheartbeat2 = %{version}-%{release}
+Requires: libapphb2 = %{version}-%{release}
+Provides: libheartbeat-devel = %{version}
+Obsoletes: libheartbeat-devel <= %{version}
-%description -n libheartbeat-devel
+%description -n libapphb-devel
heartbeat is a sophisticated multinode resource manager for High
Availability clusters.
@@ -293,36 +294,6 @@
Sun Jiang Dong
(See doc/AUTHORS)
-%package ldirectord
-License: GPLv2+
-Summary: A Monitoring Daemon for Maintaining High Availability Resources
-Group: Productivity/Clustering/HA
-Requires: %{SSLeay} perl-libwww-perl ipvsadm
-%if 0%{?suse_version}
-Requires: logrotate
-%endif
-%if 0%{?fedora_version}
-Requires(post): /sbin/chkconfig
-Requires(preun):/sbin/chkconfig
-%endif
-
-%description ldirectord
-The Linux Director Daemon (ldirectord) was written by Jacob Rief.
-
-
-ldirectord is a stand alone daemon for monitoring the services on real
-servers. Currently, HTTP, HTTPS, and FTP services are supported.
-lditrecord is simple to install and works with the heartbeat code
-(http://www.linux-ha.org/).
-
-See 'ldirectord -h' and linux-ha/doc/ldirectord for more information.
-
-
-
-Authors:
---------
- Jacob Rief
-
%if %build_cmpi
%package cmpi
@@ -354,7 +325,7 @@
Summary: The Heartbeat Subsystem for High-Availability Linux
Group: Productivity/Clustering/HA
Requires: %{name} = %{version}-%{release}
-Requires: libheartbeat-devel = %{version}-%{release}
+Requires: libapphb-devel = %{version}-%{release}
%description devel
heartbeat is a sophisticated multinode resource manager for High
@@ -393,11 +364,9 @@
%prep
###########################################################
-%setup -n heartbeat
-%patch0 -p1
+%setup -n Heartbeat-3-0-STABLE-%{version} -q
%if 0%{?suse_version}
cp $RPM_SOURCE_DIR/heartbeat.suse.in ./heartbeat/init.d/heartbeat.in
-cp $RPM_SOURCE_DIR/ldirectord.suse.in ./ldirectord/init.d/ldirectord.in
%endif
%{?suse_update_config:%{suse_update_config -f}}
###########################################################
@@ -457,29 +426,18 @@
###########################################################
#make DESTDIR=$RPM_BUILD_ROOT install-strip
make DESTDIR=$RPM_BUILD_ROOT install
-(
- cd $RPM_BUILD_ROOT/etc/ha.d/resource.d
- ln -s %{_sbindir}/ldirectord ldirectord
-) || true
test -d $RPM_BUILD_ROOT/sbin || mkdir $RPM_BUILD_ROOT/sbin
(
cd $RPM_BUILD_ROOT/sbin
ln -s /etc/init.d/heartbeat rcheartbeat
- ln -sf /etc/init.d/ldirectord rcldirectord
- ln -sf /etc/init.d/logd rclogd
) || true
# Cleanup
[ -d $RPM_BUILD_ROOT/usr/man ] && rm -rf $RPM_BUILD_ROOT/usr/man
[ -d $RPM_BUILD_ROOT/usr/share/libtool ] && rm -rf $RPM_BUILD_ROOT/usr/share/libtool
find $RPM_BUILD_ROOT -name '*.a' -type f -print0 | xargs -0 rm -f
find $RPM_BUILD_ROOT -name '*.la' -type f -print0 | xargs -0 rm -f
-chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/ocf-shellfuncs
-chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs
-# EVMS2 is finally gone from 11.1 and later, no need to include
-# confusing RAs.
-%if 0%{?suse_version} > 1100
-rm -f $RPM_BUILD_ROOT/usr/lib/ocf/resource.d/heartbeat/Evms*
-%endif
+install -d $RPM_BUILD_ROOT/usr/share/doc/packages
+mv $RPM_BUILD_ROOT/usr/share/doc/heartbeat $RPM_BUILD_ROOT/usr/share/doc/packages
###########################################################
%clean
@@ -562,46 +520,23 @@
test "$1" != 0 || /usr/sbin/fedora-groupdel %{gname} || :
%endif
###########################################################
-%if 0%{?suse_version}
-%preun ldirectord
- %stop_on_removal ldirectord
-%endif
-%if 0%{?fedora_version}
+%post -n libapphb2 -p /sbin/ldconfig
-%preun ldirectord
-%if %{stop_start_script}
- /sbin/chkconfig --del ldirectord
-%endif
-%endif
-%if 0%{?fedora_version}
-
-%post ldirectord
- /sbin/chkconfig --add ldirectord
-%endif
-
-%post -n libheartbeat2 -p /sbin/ldconfig
-
-%postun -n libheartbeat2 -p /sbin/ldconfig
+%postun -n libapphb2 -p /sbin/ldconfig
%files
###########################################################
%defattr(-,root,root)
-%{_libdir}/heartbeat/mach_down
%{_libdir}/heartbeat/mlock
-%{_libdir}/heartbeat/req_resource
%{_libdir}/heartbeat/plugins/HBauth
%{_libdir}/heartbeat/plugins/HBcomm
%{_libdir}/heartbeat/plugins/HBcompress
%{_libdir}/heartbeat/plugins/quorum
-#%{_libdir}/heartbeat/plugins/quorumd
-%{_libdir}/heartbeat/plugins/test
%{_libdir}/heartbeat/plugins/tiebreaker
-#%{_libdir}/heartbeat/quorumd
%{_libdir}/heartbeat/heartbeat
%{_libdir}/heartbeat/ipfail
%{_libdir}/heartbeat/ccm
-%{_libdir}/heartbeat/ResourceManager
%{_datadir}/heartbeat/ResourceManager
%{_datadir}/heartbeat/ha_config
%{_datadir}/heartbeat/ha_propagate
@@ -615,31 +550,11 @@
%{_datadir}/heartbeat/req_resource
%{_libdir}/heartbeat/dopd
%{_libdir}/heartbeat/drbd-peer-outdater
-# Exclude pointless compatability symlinks
-#%exclude %{_libdir}/heartbeat/SNMPAgentSanityCheck
-%exclude %{_libdir}/heartbeat/TestHeartbeatComm
-%exclude %{_libdir}/heartbeat/BasicSanityCheck
-#%exclude %{_libdir}/heartbeat/ResourceManager
-%exclude %{_libdir}/heartbeat/lrmtest
-%exclude %{_libdir}/heartbeat/cts
-%exclude %{_libdir}/heartbeat/hb_setweight
-%exclude %{_libdir}/heartbeat/hb_standby
-%exclude %{_libdir}/heartbeat/hb_takeover
-%exclude %{_libdir}/heartbeat/mach_down
-%exclude %{_libdir}/heartbeat/req_resource
-%exclude %{_libdir}/heartbeat/hb_addnode
-%exclude %{_libdir}/heartbeat/hb_delnode
-%exclude %{_libdir}/heartbeat/ha_config
-%exclude %{_libdir}/heartbeat/ha_logger
-%exclude %{_libdir}/heartbeat/hb_setsite
-%exclude %{_libdir}/heartbeat/ha_propagate
%ghost %dir %{_var}/run/heartbeat
%dir %{_var}/lib/heartbeat
-%dir %{_var}/lib/heartbeat/cores
%ghost %dir %attr (0755, %{uname}, %{gname}) %{_var}/run/heartbeat/ccm
%{_sysconfdir}/ha.d
%exclude %{_sysconfdir}/ha.d/resource.d
-%exclude %{_sysconfdir}/ha.d/shellfuncs
%{_sysconfdir}/init.d/heartbeat
%config(noreplace) %{_sysconfdir}/logrotate.d/heartbeat
%{_libdir}/libclm.so.*
@@ -650,29 +565,23 @@
%{_bindir}/cl_respawn
%attr (2555, root, haclient) %{_bindir}/cl_status
%doc %{_mandir}/man1/cl_status.1*
-%doc %{_mandir}/man1/ha_logger.1*
%doc %{_mandir}/man1/hb_addnode.1*
%doc %{_mandir}/man1/hb_delnode.1*
%doc %{_mandir}/man1/hb_standby.1*
%doc %{_mandir}/man1/hb_takeover.1*
+%doc %{_mandir}/man5/authkeys.5*
+%doc %{_mandir}/man5/ha.cf.5*
%doc %{_mandir}/man8/heartbeat.8*
-%doc %{_datadir}/doc/packages/heartbeat/*.txt
-%doc %{_datadir}/doc/packages/heartbeat/*.html
%doc %{_datadir}/doc/packages/heartbeat/README
+%doc %{_datadir}/doc/packages/heartbeat/apphbd.cf
%doc %{_datadir}/doc/packages/heartbeat/authkeys
-%doc %{_datadir}/doc/packages/heartbeat/startstop
%doc %{_datadir}/doc/packages/heartbeat/haresources
%doc %{_datadir}/doc/packages/heartbeat/ha.cf
###########################################################
-%files -n libheartbeat2
+%files -n libapphb2
%defattr(-,root,root)
-%{_libdir}/libstonith.so.*
-%{_libdir}/libpils.so.*
%{_libdir}/libapphb.so.*
-%{_libdir}/liblrm.so.*
-%{_libdir}/libplumb.so.*
-%{_libdir}/libplumbgpl.so.*
%files common
%defattr(-,root,root)
@@ -681,92 +590,43 @@
%dir %{_datadir}/heartbeat
%dir %{_datadir}/doc/packages/heartbeat
%dir %{_sysconfdir}/ha.d
-%{_sysconfdir}/ha.d/shellfuncs
-%{_sysconfdir}/init.d/logd
-/sbin/rclogd
-%{_sbindir}/stonith
-%{_sbindir}/meatclient
-%{_sbindir}/ha_logger
-%{_sbindir}/hb_report
-%{_sbindir}/hb_report
-%{_libdir}/stonith
-%{_libdir}/pils
-%{_libdir}/heartbeat/ha_logd
-%{_libdir}/heartbeat/ha_logger
-%{_libdir}/heartbeat/lrmadmin
-%{_libdir}/heartbeat/lrmd
-%{_libdir}/heartbeat/plugins/RAExec
-%exclude %{_libdir}/heartbeat/utillib.sh
-%exclude %{_libdir}/heartbeat/openais_conf_support.sh
-%exclude %{_libdir}/heartbeat/ha_cf_support.sh
%doc %{_mandir}/man8/apphbd.8*
-%doc %{_mandir}/man8/stonith.8*
-%doc %{_mandir}/man8/meatclient.8*
-%doc %{_mandir}/man8/ha_logd.8*
%doc %{_datadir}/doc/packages/heartbeat/AUTHORS
%exclude %doc %{_datadir}/doc/packages/heartbeat/README
%doc %{_datadir}/doc/packages/heartbeat/COPYING
%doc %{_datadir}/doc/packages/heartbeat/COPYING.LGPL
%exclude %{_datadir}/doc/packages/heartbeat/ChangeLog
-%{_datadir}/doc/packages/heartbeat/logd.cf
-%{_datadir}/heartbeat/utillib.sh
-%{_datadir}/heartbeat/ha_cf_support.sh
-%{_datadir}/heartbeat/openais_conf_support.sh
%{_datadir}/doc/packages/heartbeat/apphbd.cf
%ghost %dir %{_var}/run/heartbeat
%ghost %dir %attr (0755, %{uname}, %{gname}) %{_var}/run/heartbeat/ccm
-%dir %attr (0700, root, root) %{_var}/lib/heartbeat/cores/root
-%dir %attr (0700, nobody, %{nogroup}) %{_var}/lib/heartbeat/cores/nobody
-%dir %attr (0700, %{uname}, %{gname}) %{_var}/lib/heartbeat/cores/%{uname}
-%files -n libheartbeat-devel
+%files -n libapphb-devel
%defattr(-,root,root)
%dir %{_includedir}/heartbeat
-%{_includedir}/pils
-%{_includedir}/stonith
-%{_includedir}/clplumbing
-%{_includedir}/heartbeat/lrm
%{_includedir}/heartbeat/apphb.h
%{_includedir}/heartbeat/apphb_notify.h
%{_includedir}/heartbeat/HBauth.h
%{_includedir}/heartbeat/HBcomm.h
-%{_includedir}/heartbeat/ha_msg.h
-%{_includedir}/heartbeat/compress.h
%{_includedir}/heartbeat/hb_config.h
%{_includedir}/heartbeat/heartbeat.h
-%{_includedir}/heartbeat/replace_uuid.h
-%{_libdir}/liblrm*.so
-%{_libdir}/libpils*.so
-%{_libdir}/libplumb*.so
%{_libdir}/libapphb*.so
-%{_libdir}/libstonith*.so
-#%{_datadir}/heartbeat/logtest
-%{_libdir}/heartbeat/logtest
-%{_datadir}/heartbeat/lrmtest
-%exclude %{_libdir}/heartbeat/lrmtest
%files devel
%defattr(-,root,root)
-#%doc %{_datadir}/doc/%{name}-%{version}
%{_includedir}/saf/
%{_includedir}/ocf/
%{_includedir}/heartbeat/hb_api.h
%exclude %{_libdir}/libclm*.so
%exclude %{_libdir}/libhbclient*.so
%exclude %{_libdir}/libccmclient*.so
-#%{_libdir}/heartbeat/quorumdtest
%{_libdir}/heartbeat/clmtest
%{_libdir}/heartbeat/api_test
-%{_libdir}/heartbeat/ipctest
-%{_libdir}/heartbeat/ipctransientclient
-%{_libdir}/heartbeat/ipctransientserver
-%{_libdir}/heartbeat/transient-test.sh
%{_libdir}/heartbeat/apphbtest
-%{_libdir}/heartbeat/base64_md5_test
%{_libdir}/heartbeat/ccm_testclient
%{_datadir}/heartbeat/BasicSanityCheck
%{_datadir}/heartbeat/TestHeartbeatComm
%dir %{_datadir}/heartbeat/cts
+%dir %{_datadir}/heartbeat/cts
%{_datadir}/heartbeat/cts/LSBDummy
%{_datadir}/heartbeat/cts/README
%{_datadir}/heartbeat/cts/getpeinputs.sh
@@ -776,37 +636,7 @@
%files resources
%defattr(-,root,root)
-%dir /usr/lib/ocf
-%dir /usr/lib/ocf/resource.d
%{_sysconfdir}/ha.d/resource.d
-%exclude %{_sysconfdir}/ha.d/resource.d/ldirectord
-/usr/lib/ocf/resource.d/heartbeat
-%{_libdir}/heartbeat/send_arp
-%{_libdir}/heartbeat/findif
-%{_libdir}/heartbeat/ocf-returncodes
-%{_libdir}/heartbeat/ocf-shellfuncs
-%{_libdir}/heartbeat/sfex_daemon
-%{_sbindir}/sbd
-%{_sbindir}/ocf-tester
-%{_sbindir}/sfex_init
-%{_datadir}/heartbeat/ra-api-1.dtd
-%exclude %{_libdir}/heartbeat/ra-api-1.dtd
-###########################################################
-# Files for ldirectord
-
-%files ldirectord
###########################################################
-%defattr(-,root,root)
-%doc doc/README
-%doc doc/COPYING
-%doc ldirectord/ldirectord.cf
-%doc %{_mandir}/man8/ldirectord.8*
-#%doc %{_mandir}/man8/supervise-ldirectord-config.8*
-%{_sbindir}/ldirectord
-/sbin/rcldirectord
-#%{_sbindir}/supervise-ldirectord-config
-%{_sysconfdir}/init.d/ldirectord
-%{_sysconfdir}/ha.d/resource.d/ldirectord
-%config(noreplace) %{_sysconfdir}/logrotate.d/ldirectord
%changelog
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org