packages: cluster-glue/cluster-glue.spec - stonith subpackage from heartbea...

[glen]

Author: glen                         Date: Wed Jan 13 18:35:12 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- stonith subpackage from heartbeat.spec
- heartbeat-no_ipmilan_test.patch from heartbeat.spec

---- Files affected:
packages/cluster-glue:
   cluster-glue.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/cluster-glue/cluster-glue.spec
diff -u packages/cluster-glue/cluster-glue.spec:1.6 packages/cluster-glue/cluster-glue.spec:1.7
--- packages/cluster-glue/cluster-glue.spec:1.6	Wed Jan 13 17:07:39 2010
+++ packages/cluster-glue/cluster-glue.spec	Wed Jan 13 19:35:06 2010
@@ -9,6 +9,7 @@
 # - pld deps for "docbook-dtds"
 # - tests packaged in -devel to own pkg or just rm -rf
 # - pldize ha_logd initscript (look heartbeat.init?)
+# - stonith-libs? pils?
 %define		subver	rc2
 %define		rel		0.1
 Summary:	Reusable cluster components
@@ -20,6 +21,7 @@
 URL:		http://www.clusterlabs.org/
 Source0:	http://www.linux-ha.org/w/images/3/3d/Cluster-glue-%{version}-%{subver}.tar.bz2
 # Source0-md5:	1f83b6bd83d9cae5310c32d14fecf2fd
+Patch0:		heartbeat-no_ipmilan_test.patch
 BuildRequires:	OpenIPMI-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -57,10 +59,8 @@
 Provides:	user(hacluster)
 # Directives to allow upgrade from combined heartbeat packages
 Provides:	heartbeat-pils = 3.0.0-1
-Provides:	heartbeat-stonith = 3.0.0-1
 Obsoletes:	heartbeat-common
 Obsoletes:	heartbeat-pils < 3.0.0-1
-Obsoletes:	heartbeat-stonith < 3.0.0-1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		filterout_ld	-Wl,--as-needed
@@ -92,8 +92,24 @@
 Headers and shared libraries for a useful for writing cluster managers
 such as Pacemaker.
 
+%package stonith
+Summary:	Provides an interface to Shoot The Other Node In The Head
+Summary(pl.UTF-8):	Interfejs do "odstrzelenia" drugiego węzła w klastrze
+Group:		Applications/System
+Requires:	OpenIPMI >= 2.0.3
+Provides:	heartbeat-stonith = 3.0.0-1
+Obsoletes:	heartbeat-stonith < 3.0.0-1
+
+%description stonith
+Provides an interface to Shoot The Other Node In The Head.
+
+%description stonith -l pl.UTF-8
+STONITH (Shoot The Other Node In The Head) to interfejs służący do
+"odstrzelenia" drugiego węzła w klastrze.
+
 %prep
 %setup -q -n %{name}-%{version}-%{subver}
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -145,20 +161,18 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS logd/logd.cf doc/stonith/README*
+%doc AUTHORS logd/logd.cf
 %attr(754,root,root) /etc/rc.d/init.d/logd
 
 %attr(755,root,root) %{_sbindir}/ha_logger
 %attr(755,root,root) %{_sbindir}/hb_report
 %attr(755,root,root) %{_sbindir}/lrmadmin
 %attr(755,root,root) %{_sbindir}/meatclient
-%attr(755,root,root) %{_sbindir}/stonith
 %attr(755,root,root) %{_sbindir}/sbd
 %{_mandir}/man1/ha_logger.1*
 %{_mandir}/man8/ha_logd.8*
 %{_mandir}/man8/hb_report.8*
 %{_mandir}/man8/meatclient.8*
-%{_mandir}/man8/stonith.8*
 
 %dir %{_datadir}/%{name}
 %attr(755,root,root) %{_datadir}/%{name}/ha_cf_support.sh
@@ -178,18 +192,12 @@
 %attr(755,root,root) %{_libdir}/heartbeat/plugins/RAExec/lsb.so
 %attr(755,root,root) %{_libdir}/heartbeat/plugins/RAExec/ocf.so
 
-%dir %{_libdir}/stonith
-%dir %{_libdir}/stonith/plugins
-%dir %{_libdir}/stonith/plugins/stonith2
-%{_libdir}/stonith/plugins/external
-%attr(755,root,root) %{_libdir}/stonith/plugins/stonith2/*.so
-%attr(755,root,root) %{_libdir}/stonith/plugins/stonith2/ribcl.py
-%attr(755,root,root) %{_libdir}/stonith/plugins/xen0-ha-dom0-stonith-helper
-
-%dir %{_var}/lib/heartbeat
-%dir %{_var}/lib/heartbeat/cores
-%dir %attr(700,root,root) %{_var}/lib/heartbeat/cores/root
-%dir %attr(700,hacluster,haclient) %{_var}/lib/heartbeat/cores/hacluster
+%dir /var/lib/heartbeat
+%attr(711,root,root) %dir /var/lib/heartbeat/cores
+%attr(700,root,root) %dir /var/lib/heartbeat/cores/root
+%attr(700,hacluster,root) %dir /var/lib/heartbeat/cores/hacluster
+# we don't want any files owned by nobody
+%attr(700,root,root) %dir /var/lib/heartbeat/cores/nobody
 
 %files libs
 %defattr(644,root,root,755)
@@ -251,12 +259,28 @@
 %attr(755,root,root) %{_datadir}/%{name}/lrmtest/testcases/*filter
 %attr(755,root,root) %{_datadir}/%{name}/lrmtest/testcases/*.sh
 
+%files stonith
+%doc doc/stonith/README*
+%attr(755,root,root) %{_sbindir}/stonith
+%{_mandir}/man8/stonith.8*
+%dir %{_libdir}/stonith
+%dir %{_libdir}/stonith/plugins
+%dir %{_libdir}/stonith/plugins/stonith2
+%{_libdir}/stonith/plugins/external
+%attr(755,root,root) %{_libdir}/stonith/plugins/stonith2/*.so
+%attr(755,root,root) %{_libdir}/stonith/plugins/stonith2/ribcl.py
+%attr(755,root,root) %{_libdir}/stonith/plugins/xen0-ha-dom0-stonith-helper
+
 %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.7  2010/01/13 18:35:06  glen
+- stonith subpackage from heartbeat.spec
+- heartbeat-no_ipmilan_test.patch from heartbeat.spec
+
 Revision 1.6  2010/01/13 16:07:39  glen
 - create users/groups (copy from heartbeat.spec)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cluster-glue/cluster-glue.spec?r1=1.6&r2=1.7&f=u