Hello community, here is the log from the commit of package heartbeat checked in at Tue Nov 14 00:25:08 CET 2006. -------- --- heartbeat/heartbeat.changes 2006-10-30 20:01:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/heartbeat/heartbeat.changes 2006-11-13 23:10:06.000000000 +0100 @@ -1,0 +2,9 @@ +Mon Nov 13 22:53:35 CET 2006 - olh@suse.de + +- remove build dependency on iptables + iptables depends on kernel-source + everything yast related depends on heartbeat, via evms + fixes also /usr/lib/ocf/resource.d/heartbeat/IPaddr2 +- move suse_update_config from prep to build section + +------------------------------------------------------------------- New: ---- heartbeat.reduce-buildrequires.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ heartbeat.spec ++++++ --- /var/tmp/diff_new_pack.2KrmMb/_old 2006-11-14 00:24:47.000000000 +0100 +++ /var/tmp/diff_new_pack.2KrmMb/_new 2006-11-14 00:24:47.000000000 +0100 @@ -12,6 +12,10 @@ Name: heartbeat BuildRequires: OpenIPMI-devel curl-devel e2fsprogs-devel glib2-devel gnutls-devel iputils libnet libxml2-devel lynx lzo-devel net-snmp-devel openwbem-devel pam-devel python-devel python-gtk-devel python-xml swig tcpd-devel +# packages not neededd at compile time +# disable temporary during 'quilt setup' +BuildRequires: -iptables +# end %define sanity_check 0 %define with_extra_warnings 0 %define with_debugging 0 @@ -19,7 +23,7 @@ %define sanity_check_aborts_build 0 Summary: The Heartbeat Subsystem for High-Availability Linux Version: 2.0.7 -Release: 22 +Release: 30 License: GNU General Public License (GPL) - all versions, GNU Library General Public License v. 2.0 and 2.1 (LGPL) URL: http://linux-ha.org/ Group: Productivity/Clustering/HA @@ -33,6 +37,7 @@ Patch1: heartbeat-doc-directory.diff Patch2: heartbeat-cmi-indication-temporary-fix.diff Patch3: heartbeat-compatibility-level.diff +Patch42: heartbeat.reduce-buildrequires.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Autoreqprov: on %package ldirectord @@ -174,11 +179,12 @@ %patch1 -p0 %patch2 -p0 %patch3 -p0 -cp $RPM_SOURCE_DIR/heartbeat.suse.in ./heartbeat/init.d/heartbeat.in -%{?suse_update_config:%{suse_update_config -f}} +%patch42 -p1 ########################################################### %build +cp $RPM_SOURCE_DIR/heartbeat.suse.in ./heartbeat/init.d/heartbeat.in +%{?suse_update_config:%{suse_update_config -f}} # TODO: revisit -all CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS} -fstack-protector-all" %if %with_extra_warnings @@ -437,6 +443,12 @@ %{_libdir}/pils %changelog -n heartbeat +* Mon Nov 13 2006 - olh@suse.de +- remove build dependency on iptables + iptables depends on kernel-source + everything yast related depends on heartbeat, via evms + fixes also /usr/lib/ocf/resource.d/heartbeat/IPaddr2 +- move suse_update_config from prep to build section * Mon Oct 30 2006 - lmb@suse.de - Merge with upstream (dev tree, 94243820b011). - resource_stickiness attribute on groups accepted not all possible ++++++ heartbeat.reduce-buildrequires.patch ++++++ heartbeat requires iptables only at runtime, not at compile time iptables depends on kernel-source the whole distro depends on heartbeat --- configure.in | 1 - resources/OCF/IPaddr2.in | 2 +- resources/OCF/portblock.in | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) Index: heartbeat-2.0/configure.in =================================================================== --- heartbeat-2.0.orig/configure.in +++ heartbeat-2.0/configure.in @@ -424,7 +424,6 @@ AC_PATH_PROGS(MDADM, mdadm, /sbin/mdadm) AC_PATH_PROGS(LIBNETCONFIG, libnet-config) AC_PATH_PROGS(GETENT, getent) AC_PATH_PROGS(IP2UTIL, ip) -AC_PATH_PROGS(IPTABLES, iptables) AC_PATH_PROGS(XML2CONFIG, xml2-config) AC_PATH_PROGS(REBOOT, reboot) AC_SUBST(REBOOT) Index: heartbeat-2.0/resources/OCF/IPaddr2.in =================================================================== --- heartbeat-2.0.orig/resources/OCF/IPaddr2.in +++ heartbeat-2.0/resources/OCF/IPaddr2.in @@ -65,7 +65,7 @@ HA_VARRUNDIR=@localstatedir@/run/@HB_PKG@ IP2UTIL="@IP2UTIL@" -IPTABLES="@IPTABLES@" +IPTABLES=/usr/sbin/iptables MODPROBE="@MODPROBE@" SENDARP=$HA_BIN/send_arp FINDIF=$HA_BIN/findif Index: heartbeat-2.0/resources/OCF/portblock.in =================================================================== --- heartbeat-2.0.orig/resources/OCF/portblock.in +++ heartbeat-2.0/resources/OCF/portblock.in @@ -22,7 +22,7 @@ HA_VARRUNDIR=@localstatedir@/run/@HB_PKG@ CMD=`basename $0` -iptables=`which iptables` +iptables=/usr/sbin/iptables usage() { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org