packages: resource-agents/resource-agents.spec - missing dirs, Socket6 dep ...

[glen]

Author: glen                         Date: Wed Jan 13 19:11:08 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- missing dirs, Socket6 dep for ldirectord

---- Files affected:
packages/resource-agents:
   resource-agents.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/resource-agents/resource-agents.spec
diff -u packages/resource-agents/resource-agents.spec:1.4 packages/resource-agents/resource-agents.spec:1.5
--- packages/resource-agents/resource-agents.spec:1.4	Wed Jan 13 19:35:58 2010
+++ packages/resource-agents/resource-agents.spec	Wed Jan 13 20:11:03 2010
@@ -1,9 +1,6 @@
 # $Revision$, $Date$
-# TODO
-# - avoid remote docbook.xsl include:
-#  /usr/bin/xsltproc --xinclude http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
 %define		subver	rc2
-%define		rel		0.2
+%define		rel		0.7
 Summary:	Reusable cluster resource scripts
 Name:		resource-agents
 Version:	1.0.2
@@ -41,7 +38,8 @@
 Requires:	ipvsadm
 Requires:	perl-MailTools
 Requires:	perl-Net-SSLeay
-Requires:	perl-libwww-perl
+Requires:	perl-Socket6
+Requires:	perl-libwww
 Requires:	rc-scripts
 Provides:	heartbeat-ldirectord
 Obsoletes:	heartbeat-ldirectord
@@ -81,10 +79,13 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/ha.d
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/ha.d/resource.d
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# in doc
+rm $RPM_BUILD_ROOT%{_datadir}/%{name}/ra-api-1.dtd
+
 rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/ldirectord
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ldirectord
 cp -a ldirectord/ldirectord.cf $RPM_BUILD_ROOT%{_sysconfdir}/ha.d
@@ -98,7 +99,6 @@
 # Unset execute permissions from things that shouln't have it
 find $RPM_BUILD_ROOT -name '.ocf-*' -type f -print0 | xargs -0 chmod a-x
 find $RPM_BUILD_ROOT -name 'ocf-*'  -type f -print0 | xargs -0 chmod a-x
-find $RPM_BUILD_ROOT -name '*.dtd'  -type f -print0 | xargs -0 chmod a-x
 chmod a+rx $RPM_BUILD_ROOT%{_sbindir}/ocf-tester
 
 %clean
@@ -116,8 +116,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS doc/README.webapps
-%doc %{_datadir}/%{name}/ra-api-1.dtd
+%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
@@ -130,6 +129,7 @@
 %{_libdir}/heartbeat/ocf-shellfuncs
 %{_libdir}/heartbeat/ocf-returncodes
 %dir %{_sysconfdir}/ha.d
+%dir %{_sysconfdir}/ha.d/resource.d
 %{_sysconfdir}/ha.d/shellfuncs
 
 %{_libdir}/heartbeat/send_arp
@@ -151,6 +151,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2010/01/13 19:11:03  glen
+- missing dirs, Socket6 dep for ldirectord
+
 Revision 1.4  2010/01/13 18:35:58  glen
 - command paths from heartbeat.spec
 
================================================================

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