packages: resource-agents/resource-agents.spec - more file and directory fi...

[mmazur]

Author: mmazur                       Date: Tue Jul 19 21:39:25 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- more file and directory fixes; should work now

---- Files affected:
packages/resource-agents:
   resource-agents.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: packages/resource-agents/resource-agents.spec
diff -u packages/resource-agents/resource-agents.spec:1.10 packages/resource-agents/resource-agents.spec:1.11
--- packages/resource-agents/resource-agents.spec:1.10	Tue Jul 19 23:05:45 2011
+++ packages/resource-agents/resource-agents.spec	Tue Jul 19 23:39:20 2011
@@ -90,6 +90,12 @@
 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
@@ -116,16 +122,16 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS doc/README.webapps heartbeat/ra-api-1.dtd
-%dir %{_prefix}/lib/ocf
-%dir %{_prefix}/lib/ocf/resource.d
-%{_prefix}/lib/ocf/resource.d/heartbeat
-%attr(755,root,root) %{_prefix}/lib/ocf/resource.d/heartbeat/*
-%{_prefix}/lib/ocf/lib
-%dir %{_prefix}/lib/ocf/lib/heartbeat
-%{_prefix}/lib/ocf/lib/heartbeat/ocf-binaries
-%{_prefix}/lib/ocf/lib/heartbeat/ocf-directories
-%{_prefix}/lib/ocf/lib/heartbeat/ocf-returncodes
-%{_prefix}/lib/ocf/lib/heartbeat/ocf-shellfuncs
+%attr(755,root,root) %{_libdir}/heartbeat/send_arp
+%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/ocft
 %attr(755,root,root) %{_sbindir}/ocf-tester
 %attr(755,root,root) %{_sbindir}/ocft
@@ -134,12 +140,6 @@
 %{_mandir}/man7/*.7*
 %{_mandir}/man8/ocf-tester.8*
 %{_sysconfdir}/ha.d/shellfuncs
-
-%attr(755,root,root) %{_libdir}/heartbeat/send_arp
-%attr(755,root,root) %{_libdir}/heartbeat/sfex_daemon
-%attr(755,root,root) %{_libdir}/heartbeat/findif
-%attr(755,root,root) %{_libdir}/heartbeat/tickle_tcp
-
 %{_includedir}/heartbeat/agent_config.h
 
 %attr(1755,root,root) /var/run/resource-agents
@@ -159,6 +159,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2011/07/19 21:39:20  mmazur
+- more file and directory fixes; should work now
+
 Revision 1.10  2011/07/19 21:05:45  mmazur
 - more missing permissions
 
================================================================

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