Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: linux-ha by davidlee from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: linux-ha by davidlee from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Mon, 10 Jul 2006 08:20:44 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
heartbeat.spec.in configure.in
Log Message:
fix bug 1364: should restrict rpm-based commands to rpm-based systems
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat.spec.in,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -3 -r1.184 -r1.185
--- heartbeat.spec.in 5 Jul 2006 03:51:54 -0000 1.184
+++ heartbeat.spec.in 10 Jul 2006 14:20:43 -0000 1.185
@@ -1,4 +1,4 @@
-# $Id: heartbeat.spec.in,v 1.184 2006/07/05 03:51:54 horms Exp $
+# $Id: heartbeat.spec.in,v 1.185 2006/07/10 14:20:43 davidlee Exp $
%define _unpackaged_files_terminate_build 1
%define _missing_doc_files_terminate_build 1
@@ -17,7 +17,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildPrereq: glib-devel, @UCDSNMPDEVEL@, perl, iputils, /usr/bin/ssh,
openssl-devel, libnet
# libnet available from www.ultramonkey.org and others
-Requires: sysklogd, heartbeat-stonith = %{version}-%{release}, heartbeat-pils
= %{version}-%{release}, @MGMT_RUNTIME_REQUIRES@
+Requires: sysklogd, heartbeat-stonith = %{version}-%{release}, heartbeat-pils
= %{version}-%{release}, @RPM_MGMT_RUNTIME_REQUIRES@
BuildRequires: libgcrypt-devel
%package ldirectord
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.533
retrieving revision 1.534
diff -u -3 -r1.533 -r1.534
--- configure.in 3 Jul 2006 05:47:08 -0000 1.533
+++ configure.in 10 Jul 2006 14:20:43 -0000 1.534
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.533 $) dnl cvs revision
+AC_REVISION($Revision: 1.534 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -2370,16 +2370,19 @@
AM_CONDITIONAL(MGMT_BUILD, test "x${enable_mgmt}" != "xno")
if test "x${enable_mgmt}" != "xno"; then
AC_DEFINE_UNQUOTED(MGMT_ENABLED, 1, Define to 1 if the mgmt is enabled.)
+ dnl If this system might be RPM-based, then adjust some RPM-build details
+ if test x"${RPM}" != x""; then
dnl FIXME: a flawy solution but no better one now
- if rpm -q python-gtk > /dev/null; then
- MGMT_RUNTIME_REQUIRES="libglade2, python-gtk";
- else
- MGMT_RUNTIME_REQUIRES="libglade2, pygtk2";
- fi
+ if rpm -q python-gtk > /dev/null; then
+ RPM_MGMT_RUNTIME_REQUIRES="libglade2, python-gtk";
+ else
+ RPM_MGMT_RUNTIME_REQUIRES="libglade2, pygtk2";
+ fi
+ fi
else
- MGMT_RUNTIME_REQUIRES=
+ RPM_MGMT_RUNTIME_REQUIRES=
fi
-AC_SUBST(MGMT_RUNTIME_REQUIRES)
+AC_SUBST(RPM_MGMT_RUNTIME_REQUIRES)
AC_MSG_NOTICE([whether to enable the management tool... ${enable_mgmt}])
------------------------------
Message: 2
Date: Mon, 10 Jul 2006 08:25:32 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by davidlee from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : davidlee
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
fix bug 1364 (cont.): ensure we cover all 'if ...' bases
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.534
retrieving revision 1.535
diff -u -3 -r1.534 -r1.535
--- configure.in 10 Jul 2006 14:20:43 -0000 1.534
+++ configure.in 10 Jul 2006 14:25:32 -0000 1.535
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.534 $) dnl cvs revision
+AC_REVISION($Revision: 1.535 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -2378,6 +2378,8 @@
else
RPM_MGMT_RUNTIME_REQUIRES="libglade2, pygtk2";
fi
+ else
+ RPM_MGMT_RUNTIME_REQUIRES=
fi
else
RPM_MGMT_RUNTIME_REQUIRES=
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 32, Issue 38
********************************************
