[Linux-HA] Fix for heartbeat.spec.in (1.2.x)

[Guochun Shi]

applied in CVS. Thanks

-Guochun

At 05:09 PM 8/10/2005 -0400, you wrote:
>Hi,
>
>Is there a preferred method for creating patches? E.g preferred
>arguments to diff?
>
>Here's a patch to heartbeat.spec.in that makes ./ConfigureMe rpm work
>without bombing:
>
>[criley at criley linux-ha]$ diff -u heartbeat.spec.in
>../crileyheartbeat.spec.in
>--- heartbeat.spec.in   2005-08-10 17:04:48.000000000 -0400
>+++ ../crileyheartbeat.spec.in  2005-08-10 16:57:27.000000000 -0400
>@@ -882,9 +882,6 @@
> %dir @localstatedir@/lib/@HB_PKG@
> %dir @localstatedir@/lib/@HB_PKG@/cores
> %dir @localstatedir@/lib/@HB_PKG@/cores/root
>-%dir @localstatedir@/lib/@HB_PKG@/cores/root
>-%dir @localstatedir@/lib/@HB_PKG@/cores
>-%dir @localstatedir@/lib/@HB_PKG@/cores/root
> %attr (0700, root -) @localstatedir@/lib/@HB_PKG@/cores/root
> %dir @localstatedir@/lib/@HB_PKG@/cores/nobody
> %attr (0700, nobody -) @localstatedir@/lib/@HB_PKG@/cores/nobody
>@@ -898,6 +895,8 @@
> %doc @mandir@/man8/heartbeat.8*
> %doc @mandir@/man8/apphbd.8*
> %doc @mandir@/man1/cl_status.1*
>+%doc @mandir@/man1/hb_standby.1*
>+%doc @mandir@/man1/hb_takeover.1*
> %doc @docdir@
>
> #
>
>> -----Original Message-----
>> From: linux-ha-bounces at lists.linux-ha.org 
>> [mailto:linux-ha-bounces at lists.linux-ha.org] On Behalf Of 
>> Charles Riley
>> Sent: Wednesday, August 10, 2005 1:48 PM
>> To: linux-ha at lists.linux-ha.org
>> Subject: [Linux-HA] (no subject)
>> 
>> 
>> Hi,
>> 
>> Building the latest 1.2.x from CVS fails on RHEL3 with the following
>> error:
>> 
>> ./ConfigureMe configure
>> 
>> .. (stuff deleted)
>> 
>> checking which swig/perl version...
>> Enabling SWIG language bindings... no
>> configure: error: conditional "USE_OPENIPMI" was never 
>> defined. Usually this means the macro was only invoked conditionally.
>> 
>> I think I have tracked the problem down to the following in
>> configure.in:
>> 
>>  AC_MSG_CHECKING(For libOpenIPMI version 2 or greater)
>>       AC_TRY_COMPILE([#include <OpenIPMI/ipmiif.h>],
>>       [ #if (OPENIPMI_VERSION_MAJOR < 2 )
>>          #error "Too Old"
>>          #endif ],
>>          AC_MSG_RESULT("yes")
>>            AM_CONDITIONAL(USE_OPENIPMI, true),
>>          AC_MSG_RESULT("no"))
>> 
>> Basically if the OpenIPMI test fails, USE_OPENIPMI doesn't 
>> get defined.
>> 
>> My question is this:
>> 
>> SHOULD the build fail in the event that libOpenIPMI does not exist?
>> 
>> If not, then the following patch fixes the problem:
>> 
>> [criley at criley hadev]$ diff -u linux-ha/configure.in 
>> crileyconfigure.in
>> --- linux-ha/configure.in       2005-08-10 13:39:54.000000000 -0400
>> +++ crileyconfigure.in  2005-08-10 13:23:38.000000000 -0400
>> @@ -627,7 +627,8 @@
>>    #endif ],
>>    AC_MSG_RESULT("yes")
>>      AM_CONDITIONAL(USE_OPENIPMI, true),
>> -  AC_MSG_RESULT("no"))
>> +  AC_MSG_RESULT("no")
>> +    AM_CONDITIONAL(USE_OPENIPMI, false))
>> 
>>  AC_MSG_CHECKING(for special libxml2 includes)
>>  if test "x$XML2CONFIG" = "x"; then
>> 
>> If libOpenIPMI is a requirement, then I've got some more rpms 
>> to build, because RedHat doesn't provide/support this package 
>> (at least, not that I can find)
>> 
>> Charles
>> 
>> criley at eradimagemedical.com
>> 
>> _______________________________________________
>> Linux-HA mailing list
>> Linux-HA at lists.linux-ha.org 
>> http://lists.linux-ha.org/mailman/listinfo/linux-ha
>> 
>
>_______________________________________________
>Linux-HA mailing list
>Linux-HA at lists.linux-ha.org
>http://lists.linux-ha.org/mailman/listinfo/linux-ha