packages: resource-agents/resource-agents.spec - up to 3.9.2-1

[mguevara]

Author: mguevara                     Date: Mon Oct 24 22:46:22 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 3.9.2-1

---- Files affected:
packages/resource-agents:
   resource-agents.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: packages/resource-agents/resource-agents.spec
diff -u packages/resource-agents/resource-agents.spec:1.13 packages/resource-agents/resource-agents.spec:1.14
--- packages/resource-agents/resource-agents.spec:1.13	Wed Jul 20 00:43:46 2011
+++ packages/resource-agents/resource-agents.spec	Tue Oct 25 00:46:17 2011
@@ -1,15 +1,14 @@
 # $Revision$, $Date$
-%define		gitrel	gc06b6f3
-%define		gitrel2	c06b6f3
+%define		gitrel	b735277
 Summary:	Reusable cluster resource scripts
 Name:		resource-agents
-Version:	1.0.4
-Release:	2
+Version:	3.9.2
+Release:	1
 License:	GPL v2+; LGPL v2.1+
 Group:		Daemons
 URL:		http://www.linux-ha.org/
-Source0:	https://download.github.com/ClusterLabs-%{name}-agents-%{version}-0-%{gitrel}.tar.gz
-# Source0-md5:	732754ad75e02712f12f7aa911711a6b
+Source0:	https://github.com/ClusterLabs/resource-agents/tarball/v3.9.2
+# Source0-md5:	3b5790e8041f2a459d8a0ff310682bfe
 Source1:	ldirectord.init
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -56,7 +55,7 @@
 See 'ldirectord -h' and linux-ha/doc/ldirectord for more information.
 
 %prep
-%setup -q -n ClusterLabs-%{name}-%{gitrel2}
+%setup -q -n ClusterLabs-%{name}-%{gitrel}
 
 %build
 %{__libtoolize}
@@ -90,12 +89,6 @@
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ldirectord
 cp -a ldirectord/ldirectord.cf $RPM_BUILD_ROOT%{_sysconfdir}/ha.d
 
-# Backwards compatibility for older resource agents
-for i in ocf-binaries ocf-directories ocf-returncodes ocf-shellfuncs; do
-	ln -s %{_libdir}/ocf/lib/heartbeat/$i \
-		$RPM_BUILD_ROOT%{_libdir}/ocf/resource.d/heartbeat/.$i
-done
-
 # Dont package static libs or compiled python
 find $RPM_BUILD_ROOT -name '*.a' -type f -print0 | xargs -0 rm -f
 find $RPM_BUILD_ROOT -name '*.la' -type f -print0 | xargs -0 rm -f
@@ -126,22 +119,38 @@
 %attr(755,root,root) %{_libdir}/heartbeat/sfex_daemon
 %attr(755,root,root) %{_libdir}/heartbeat/findif
 %attr(755,root,root) %{_libdir}/heartbeat/tickle_tcp
-%dir %{_libdir}/ocf
-%{_libdir}/ocf/lib
-%dir %{_libdir}/ocf/resource.d
-%dir %{_libdir}/ocf/resource.d/heartbeat
-%{_libdir}/ocf/resource.d/heartbeat/.ocf-*
-%attr(755,root,root) %{_libdir}/ocf/resource.d/heartbeat/*
 %{_datadir}/resource-agents
 %attr(755,root,root) %{_sbindir}/ocf-tester
 %attr(755,root,root) %{_sbindir}/ocft
 %attr(755,root,root) %{_sbindir}/sfex_init
 %attr(755,root,root) %{_sbindir}/sfex_stat
-%{_mandir}/man7/*.7*
-%{_mandir}/man8/ocf-tester.8*
+%attr(755,root,root) %{_sbindir}/rhev-check.sh
 %{_sysconfdir}/ha.d/shellfuncs
 %{_includedir}/heartbeat/agent_config.h
 %attr(1755,root,root) /var/run/resource-agents
+%dir %{_datadir}/cluster
+%dir %{_datadir}/cluster/utils
+%dir %{_datadir}/cluster/relaxng
+%dir %{_prefix}/lib/ocf
+%dir %{_prefix}/lib/ocf/resource.d
+%dir %{_prefix}/lib/ocf/resource.d/heartbeat
+%dir %{_prefix}/lib/ocf/lib
+%dir %{_prefix}/lib/ocf/lib/heartbeat
+%attr(755,root,root) %{_prefix}/lib/ocf/resource.d/heartbeat/*
+%attr(755,root,root) %{_datadir}/cluster/*.sh
+%{_datadir}/cluster/*.metadata
+%{_datadir}/cluster/SAP*
+%{_datadir}/cluster/svclib_nfslock
+%{_datadir}/cluster/ocf-shellfuncs
+%{_datadir}/cluster/relaxng/*
+%attr(755,root,root) %{_datadir}/cluster/utils/*
+%{_prefix}/lib/ocf/resource.d/heartbeat/.ocf-*
+%{_prefix}/lib/ocf/lib/heartbeat/ocf-*
+%{_prefix}/lib/ocf/resource.d/redhat
+%{_mandir}/man7/*.7*
+%{_mandir}/man8/ocf-tester.8*
+%{_mandir}/man8/sfex_init.8*
+
 
 %files -n ldirectord
 %defattr(644,root,root,755)
@@ -158,6 +167,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2011/10/24 22:46:17  mguevara
+- up to 3.9.2-1
+
 Revision 1.13  2011/07/19 22:43:46  mmazur
 - one more dir I forgot
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/resource-agents/resource-agents.spec?r1=1.13&r2=1.14&f=u