SPECS: heartbeat.spec - BR: OpenIPMI-devel >= 2.0.3, remove hack -...

[zbyniu]

Author: zbyniu                       Date: Tue Dec 27 15:01:58 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- BR: OpenIPMI-devel >= 2.0.3, remove hack
- cts subpackage to get free from python R:

---- Files affected:
SPECS:
   heartbeat.spec (1.57 -> 1.58) 

---- Diffs:

================================================================
Index: SPECS/heartbeat.spec
diff -u SPECS/heartbeat.spec:1.57 SPECS/heartbeat.spec:1.58
--- SPECS/heartbeat.spec:1.57	Tue Dec  6 12:21:16 2005
+++ SPECS/heartbeat.spec	Tue Dec 27 16:01:52 2005
@@ -1,12 +1,12 @@
 # $Revision$, $Date$
-#%%include	/usr/lib/rpm/macros.perl
+%include	/usr/lib/rpm/macros.perl
 Summary:	Heartbeat - subsystem for High-Availability Linux
 Summary(es):	Subsistema heartbeat para Linux "High-Availability"
 Summary(pl):	Podsystem heartbeat dla systemów o podwyższonej niezawodności
 Summary(pt_BR):	Implementa sistema de monitoraçăo (heartbeats) visando Alta Disponibilidade
 Name:		heartbeat
 Version:	2.0.2
-Release:	0.4
+Release:	0.5
 License:	GPL v2+
 Group:		Applications/System
 Source0:	http://linux-ha.org/download/%{name}-%{version}.tar.gz
@@ -16,7 +16,7 @@
 Patch0:		%{name}-ac.patch
 Patch1:		%{name}-chld.patch
 URL:		http://linux-ha.org/
-BuildRequires:	OpenIPMI-devel >= 2.0.0
+BuildRequires:	OpenIPMI-devel >= 2.0.3
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gdbm-devel
@@ -31,8 +31,7 @@
 BuildRequires:	net-snmp-devel >= 5.1
 #BuildRequires:	perl-devel >= 1:5.8.1
 BuildRequires:	pkgconfig
-BuildRequires:	rpm-devel
-#BuildRequires:	rpm-perlprov
+BuildRequires:	rpm-perlprov
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.202
 BuildRequires:	swig-perl >= 1.3.25
@@ -139,10 +138,20 @@
 %description -n perl-heartbeat -l pl
 Dowiązania Perla dla Heartbeata.
 
+%package cts
+Summary:	Cluster Test Suite
+Summary(pl):	Zestaw testów klastra
+Group:		Applications/System
+Requires:	%{name} = %{version}-%{release}
+
+%description cts
+Cluster Test Suite for heartbeat.
+
+%description cts -l pl
+Zestaw testów klastra opartego o heartbeat.
+
 %prep
 %setup -q
-# Hack against new OpenIPMI (again)
-sed -i '358,401d' lib/plugins/stonith/ipmilan_command.c
 %patch0 -p1
 %patch1 -p1
 
@@ -155,6 +164,7 @@
 %{__automake}
 %configure \
 	PING=/bin/ping \
+	MAILCMD=/bin/mail \
 	MOUNT=/bin/mount \
 	FSCK=/sbin/fsck \
 	--with-initdir=/etc/rc.d/init.d \
@@ -170,6 +180,7 @@
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/var/run/heartbeat
 
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/ha.d/resource.d/ldirectord
 ln -sf %{_sbindir}/ldirectord $RPM_BUILD_ROOT%{_sysconfdir}/ha.d/resource.d/ldirectord
@@ -233,8 +244,6 @@
 %doc doc/{*.html,AUTHORS,apphbd.cf,authkeys,ha.cf,haresources,startstop}
 %attr(755,root,root) %{_libdir}/lib*.so.*.*.*
 %dir %{_libdir}/heartbeat
-%dir %{_libdir}/heartbeat/cts
-%attr(755,root,root) %{_libdir}/heartbeat/cts/*.py
 %dir %{_libdir}/heartbeat/plugins
 %dir %{_libdir}/heartbeat/plugins/*
 %attr(755,root,root) %{_libdir}/heartbeat/plugins/*/*.so
@@ -255,6 +264,7 @@
 %attr(754,root,root) /etc/rc.d/init.d/heartbeat
 %attr(755,root,root) %{_libdir}/ocf
 %dir /var/lib/heartbeat
+%dir /var/run/heartbeat
 #%%attr(750,root,haclient) %dir /var/lib/heartbeat/api
 #%%attr(1770,root,haclient) %dir /var/lib/heartbeat/casual
 #%%attr(755,hacluster,haclient) %dir /var/lib/heartbeat/ccm
@@ -312,12 +322,22 @@
 #%%attr(755,root,root) %{perl_vendorarch}/auto/heartbeat/cl_raw/cl_raw.so
 #%%{_mandir}/man3/heartbeat::*.3pm*
 
+%files cts
+%defattr(644,root,root,755)
+%doc cts/README
+%dir %{_libdir}/heartbeat/cts
+%attr(755,root,root) %{_libdir}/heartbeat/cts/*.py
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.58  2005/12/27 15:01:52  zbyniu
+- BR: OpenIPMI-devel >= 2.0.3, remove hack
+- cts subpackage to get free from python R:
+
 Revision 1.57  2005/12/06 11:21:16  zbyniu
 - up to 2.0.2; perl-heartbeat temporary commented out, because it disappeared
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/heartbeat.spec?r1=1.57&r2=1.58&f=u