SPECS: heartbeat.spec - up to 2.0.6, cleanups

[zbyniu]

Author: zbyniu                       Date: Sat Aug 12 23:49:16 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 2.0.6, cleanups

---- Files affected:
SPECS:
   heartbeat.spec (1.62 -> 1.63) 

---- Diffs:

================================================================
Index: SPECS/heartbeat.spec
diff -u SPECS/heartbeat.spec:1.62 SPECS/heartbeat.spec:1.63
--- SPECS/heartbeat.spec:1.62	Mon Jun 26 02:02:34 2006
+++ SPECS/heartbeat.spec	Sun Aug 13 01:49:11 2006
@@ -5,12 +5,12 @@
 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.5
+Version:	2.0.6
 Release:	0.1
 License:	GPL v2+
 Group:		Applications/System
 Source0:	http://linux-ha.org/download/%{name}-%{version}.tar.gz
-# Source0-md5:	209228b2948cfa4762a3a66454c6cc35
+# Source0-md5:	15f0ded68b8b6ef0bf75ebd06c0cbb04
 Source1:	%{name}.init
 Source2:	ldirectord.init
 Patch0:		%{name}-ac.patch
@@ -29,13 +29,11 @@
 BuildRequires:	libxml2-devel
 BuildRequires:	lm_sensors-devel
 BuildRequires:	net-snmp-devel >= 5.1
-#BuildRequires:	perl-devel >= 1:5.8.1
 BuildRequires:	pkgconfig
 BuildRequires:	rpm-perlprov
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.202
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	swig-perl >= 1.3.25
-PreReq:		rc-scripts
 Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
@@ -44,6 +42,7 @@
 Requires(post,postun):	/sbin/ldconfig
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
+Requires:	rc-scripts
 Requires:	syslogdaemon
 Provides:	group(haclient)
 Provides:	user(hacluster)
@@ -126,18 +125,6 @@
 %description static -l pl
 Biblioteki statyczne heartbeat.
 
-%package -n perl-heartbeat
-Summary:	Perl binding for Heartbeat
-Summary(pl):	Dowiązania Perla dla Heartbeata
-Group:		Development/Languages/Perl
-Requires:	%{name} = %{version}-%{release}
-
-%description -n perl-heartbeat
-Perl binding for Heartbeat.
-
-%description -n perl-heartbeat -l pl
-Dowiązania Perla dla Heartbeata.
-
 %package cts
 Summary:	Cluster Test Suite
 Summary(pl):	Zestaw testów klastra
@@ -170,7 +157,6 @@
 	--with-initdir=/etc/rc.d/init.d \
 	--enable-lrm \
 	--enable-crm \
-	--enable-perl-vendor \
 	--enable-snmp-subagent
 
 %{__make}
@@ -209,24 +195,12 @@
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add heartbeat
+%service %{name} restart
 
 %preun
-Uninstall_PPP_hack() {
-	file2hack=/etc/ppp/ip-up.local
-	echo "NOTE: Restoring /$file2hack"
-	MARKER="Heartbeat"
-	ed -s $file2hack <<-!EOF 2>/dev/null
-H
-g/ $MARKER\$/d
-w
-!EOF
-}
-
 if [ "$1" = "0" ]; then
+	%service -q %{name} stop
 	/sbin/chkconfig --del heartbeat
-	if [ ! -x /etc/ppp/ip-up.heart ]; then
-		Uninstall_PPP_hack
-	fi
 fi
 
 %postun
@@ -276,7 +250,7 @@
 /var/lib/heartbeat/cores
 %attr(755,root,root) %{_bindir}/cl_respawn
 %attr(2755,root,haclient) %{_bindir}/cl_status
-%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_sbindir}/[a-i]*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/ha.d/haresources
 %attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/ha.d/authkeys
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/ha.d/ha.cf
@@ -313,16 +287,6 @@
 %defattr(644,root,root,755)
 %{_libdir}/*.a
 
-%files -n perl-heartbeat
-%defattr(644,root,root,755)
-# Perl binding disappeared, temporary comment
-#%%{perl_vendorarch}/heartbeat
-#%%dir %{perl_vendorarch}/auto/heartbeat
-#%%dir %{perl_vendorarch}/auto/heartbeat/cl_raw
-#%%{perl_vendorarch}/auto/heartbeat/cl_raw/cl_raw.bs
-#%%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
@@ -335,6 +299,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.63  2006/08/12 23:49:11  zbyniu
+- up to 2.0.6, cleanups
+
 Revision 1.62  2006/06/26 00:02:34  adamg
 - updated to 2.0.5
 
================================================================

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