Hello community,
here is the log from the commit of package heartbeat
checked in at Sat Aug 30 02:50:19 CEST 2008.
--------
--- heartbeat/heartbeat.changes 2008-07-18 15:50:10.000000000 +0200
+++ heartbeat/heartbeat.changes 2008-08-20 19:49:52.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Aug 20 19:48:00 CEST 2008 - abeekhof@suse.de
+
+- Merge with upstream (dev tree: 138224137a3f)
+- Sanitize spec file
+- Upstream removed dead code
+
+-------------------------------------------------------------------
Old:
----
heartbeat-cmi-indication-temporary-fix.diff
heartbeat.rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ heartbeat.spec ++++++
--- /var/tmp/diff_new_pack.M24611/_old 2008-08-30 02:47:42.000000000 +0200
+++ /var/tmp/diff_new_pack.M24611/_new 2008-08-30 02:47:42.000000000 +0200
@@ -1,10 +1,17 @@
#
-# spec file for package heartbeat (Version 2.1.3)
+# spec file for package heartbeat (Version 2.99.0)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -16,37 +23,37 @@
%define without_fatal_warnings 1
%define start_at_boot 0
%define stop_start_script 0
+%define SSLeay perl-Net-SSLeay
%define gname haclient
%define uname hacluster
%define uid 90
%define nogroup nobody
-%define SSLeay perl-Net-SSLeay
+%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version}
+%define pkg_group System Environment/Daemons
+%else
+%define pkg_group Productivity/Clustering/HA
+%endif
Name: heartbeat
Summary: The Heartbeat Subsystem for High-Availability Linux
-Version: 2.1.3
-Release: 28
+Version: 2.99.0
+Release: 1
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}
-Group: Productivity/Clustering/HA
-%else
Group: Productivity/Clustering/HA
-%endif
Source: heartbeat.tar.gz
Source1: heartbeat.suse.in
-Source2: heartbeat.rpmlintrc
Patch1: heartbeat-doc-directory.diff
-Patch2: heartbeat-cmi-indication-temporary-fix.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: %{name}-core = %{version}-%{release}
+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
AutoReqProv: on
%if 0%{?fedora_version}
Requires(post): /sbin/chkconfig
Requires(preun):/sbin/chkconfig
%endif
-Requires: /bin/ping perl-TimeDate
%if 0%{?suse_version}
Requires: python-xml python-gtk
BuildRequires: OpenIPMI-devel bison fdupes flex gdbm-devel libnet python-xml
@@ -98,9 +105,8 @@
%endif
%else
# Hack to avoid needing to install a kernel on Mandriva just to build pacemaker
-#Requires: iptables
+Requires: iptables
%endif
-BuildRequires: curl-devel e2fsprogs-devel glib2-devel gnutls-devel iputils libxml2-devel lynx net-snmp-devel pam-devel python-devel swig
#BuildRequires: python-gtk-devel tcpd-devel
#!BuildIgnore: -iptables
%if %build_cmpi
@@ -168,20 +174,16 @@
Sun Jiang Dong
(See doc/AUTHORS)
-%package core
+%package common
License: GPL v2 or later; LGPL v2.1 or later
Summary: Common heartbeat components
-%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version}
-Group: Productivity/Clustering/HA
-%else
Group: Productivity/Clustering/HA
-%endif
# We need these when upgading from the old package structure
-Obsoletes: %{name} < %{version}-%{release}
-Obsoletes: %{name}-pils < %{version}-%{release}
-Obsoletes: %{name}-stonith < %{version}-%{release}
-#Provides: %{name}-pils = %{version}-%{release}
-#Provides: %{name}-stonith = %{version}-%{release}
+Obsoletes: %{name} < 2.99
+Obsoletes: %{name}-pils < 2.99
+Obsoletes: %{name}-stonith < 2.99
+Provides: %{name}-pils = 2.1.4
+Provides: %{name}-stonith = 2.1.4
Provides: heartbeat:%{_libdir}/libapphb.so.*
Provides: heartbeat:%{_libdir}/liblrm.so.*
Provides: heartbeat:%{_libdir}/libplumb.so.*
@@ -190,7 +192,7 @@
Provides: heartbeat:%{_sbindir}/ha_logger
Provides: heartbeat:%{_sbindir}/ocf-tester
-%description core
+%description common
Clustering components provided by the Heartbeat project that are
generally useful regardless of which cluster stack is being used.
@@ -211,18 +213,18 @@
Sun Jiang Dong
(See doc/AUTHORS)
-%package core-devel
+%package common-devel
License: GPL v2 or later; LGPL v2.1 or later
-Summary: Developmental files for common heartbeat components
-%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version}
-Group: Productivity/Clustering/HA
-%else
+Summary: Common heartbeat components
Group: Productivity/Clustering/HA
-%endif
-%description core-devel
-Header files and shared libraries needed for developing programs based
-on the common clustering components provided by the Heartbeat project.
+%description common-devel
+Clustering components provided by the Heartbeat project that are
+generally useful regardless of which cluster stack is being used.
+
+Include a local (non-cluster-aware) resource manager, a basic
+(non-cluster-aware) STONITH framework and some useful libraries for
+asyncronous, non-blocking IPC and using gmainloop().
@@ -240,11 +242,7 @@
%package ldirectord
License: GPL v2 or later
Summary: A Monitoring Daemon for Maintaining High Availability Resources
-%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version}
Group: Productivity/Clustering/HA
-%else
-Group: Productivity/Clustering/HA
-%endif
Requires: %{SSLeay} perl-libwww-perl ipvsadm
Obsoletes: heartbeat-ldirectd
%if 0%{?fedora_version}
@@ -274,11 +272,7 @@
%package cmpi
License: GPL v2 or later; LGPL v2.1 or later
Summary: Heartbeat CIM Provider
-%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version}
-Group: Productivity/Clustering/HA
-%else
Group: Productivity/Clustering/HA
-%endif
%description cmpi
This package provides the CIM provider for managing heartbeat via
@@ -302,11 +296,7 @@
%package devel
License: GPL v2 or later; LGPL v2.1 or later
Summary: The Heartbeat Subsystem for High-Availability Linux
-%if 0%{?fedora_version} || 0%{?centos_version} || 0%{?rhel_version}
Group: Productivity/Clustering/HA
-%else
-Group: Productivity/Clustering/HA
-%endif
Requires: %{name} = %{version}-%{release}
%description devel
@@ -348,7 +338,6 @@
###########################################################
%setup -n heartbeat
%patch1 -p0
-%patch2 -p0
%if 0%{?suse_version}
cp $RPM_SOURCE_DIR/heartbeat.suse.in ./heartbeat/init.d/heartbeat.in
%endif
@@ -401,9 +390,6 @@
--disable-crm
export MAKE="make %{?jobs:-j%jobs}"
make %{?jobs:-j%jobs}
-# make
-# No longer needed, we supply our own.
-rm rc.config.heartbeat
###########################################################
%install
@@ -441,7 +427,7 @@
rm -rf $RPM_BUILD_DIR/heartbeat-%{version}
###########################################################
-%pre
+%pre common
%if 0%{?fedora_version}
/usr/sbin/fedora-groupadd %{uid} -r %{gname} &>/dev/null || :
/usr/sbin/fedora-useradd %{uid} -r -s /sbin/nologin -d %{_var}/lib/heartbeat/cores/%{uname} -M \
@@ -467,10 +453,10 @@
#
###########################################################
-%post core
+%post common
/sbin/ldconfig
-%postun core
+%postun common
/sbin/ldconfig
%post
@@ -523,16 +509,15 @@
%defattr(-,root,root)
%{_libdir}/heartbeat/mach_down
%{_libdir}/heartbeat/mlock
-%{_libdir}/heartbeat/recoverymgrd
%{_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/quorumd
%{_libdir}/heartbeat/plugins/test
%{_libdir}/heartbeat/plugins/tiebreaker
-%{_libdir}/heartbeat/quorumd
+#%{_libdir}/heartbeat/quorumd
%{_libdir}/heartbeat/ha_*
%{_libdir}/heartbeat/hb_*
%{_libdir}/heartbeat/heartbeat
@@ -552,7 +537,6 @@
%{_datadir}/heartbeat/req_resource
%{_libdir}/heartbeat/dopd
%{_libdir}/heartbeat/drbd-peer-outdater
-%exclude %{_sbindir}/ciblint
# Exclude pointless compatability symlinks
#%exclude %{_libdir}/heartbeat/SNMPAgentSanityCheck
%exclude %{_libdir}/heartbeat/TestHeartbeatComm
@@ -585,8 +569,6 @@
%{_libdir}/libclm.so.*
%{_libdir}/libhbclient.so.*
%{_libdir}/libccmclient.so.*
-%{_libdir}/librecoverymgr.so.*
-%{_libdir}/heartbeat/plugins/AppHBNotification
/sbin/rcheartbeat
%{_libdir}/heartbeat/apphbd
%{_bindir}/cl_respawn
@@ -607,7 +589,7 @@
%{_datadir}/doc/packages/heartbeat/ha.cf
###########################################################
-%files core
+%files common
%defattr(-,root,root)
%doc doc/README
%doc doc/COPYING
@@ -615,6 +597,7 @@
%dir %{_libdir}/heartbeat/plugins
%dir %{_datadir}/heartbeat
%dir %{_datadir}/doc/packages/heartbeat
+%{_sysconfdir}/ha.d/shellfuncs
%{_sbindir}/stonith
%{_sbindir}/meatclient
%{_sbindir}/ha_logger
@@ -654,7 +637,7 @@
%dir %attr (0700, nobody, %{nogroup}) %{_var}/lib/heartbeat/cores/nobody
%dir %attr (0700, %{uname}, %{gname}) %{_var}/lib/heartbeat/cores/%{uname}
-%files core-devel
+%files common-devel
%defattr(-,root,root)
%dir %{_includedir}/heartbeat
%{_includedir}/pils
@@ -676,9 +659,7 @@
#%{_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)
@@ -688,12 +669,10 @@
%{_includedir}/heartbeat/HBauth.h
%{_includedir}/heartbeat/HBcomm.h
%{_includedir}/heartbeat/hb_api.h
-%{_includedir}/heartbeat/recoverymgr.h
%{_libdir}/libccmclient*.so
%{_libdir}/libclm*.so
%{_libdir}/libhbclient*.so
-%{_libdir}/librecoverymgr*.so
-%{_libdir}/heartbeat/quorumdtest
+#%{_libdir}/heartbeat/quorumdtest
%{_libdir}/heartbeat/clmtest
%{_libdir}/heartbeat/api_test
%{_libdir}/heartbeat/ipctest
@@ -710,9 +689,10 @@
%files resources
%defattr(-,root,root)
%dir /usr/lib/ocf
-#%dir /usr/lib/ocf/resource.d
-%exclude %{_sysconfdir}/ha.d/resource.d/ldirectord
-/usr/lib/ocf/resource.d
+%dir /usr/lib/ocf/resource.d
+/usr/lib/ocf/resource.d/heartbeat
+%exclude %{_libdir}/heartbeat/ra-api-1.dtd
+%{_datadir}/heartbeat/ra-api-1.dtd
###########################################################
# Files for ldirectord
@@ -732,6 +712,10 @@
%config(noreplace) %{_sysconfdir}/logrotate.d/ldirectord
%changelog
+* Wed Aug 20 2008 abeekhof@suse.de
+- Merge with upstream (dev tree: 138224137a3f)
+- Sanitize spec file
+- Upstream removed dead code
* Fri Jul 18 2008 abeekhof@suse.de
- Merge with upstream (dev tree: 95b9cf7578f4)
- Stonithd has been moved into Pacemaker
++++++ heartbeat.tar.gz ++++++
++++ 52993 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