[packages/resource-agents] - pl, some general cleanups

Sat Sep 7 13:50:59 CEST 2013

commit 187a73687dc713e722f24ae70c868e440342d6ab
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Sep 7 13:50:51 2013 +0200

    - pl, some general cleanups

 resource-agents.spec | 101 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 60 insertions(+), 41 deletions(-)
---

diff --git a/resource-agents.spec b/resource-agents.spec
index 8503209..6ec5bcb 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -1,29 +1,34 @@
 Summary:	Reusable cluster resource scripts
+Summary(pl.UTF-8):	Skrypty wielokrotnego użytku do obsługi zasobów klastrowych
 Name:		resource-agents
 Version:	3.9.3
 Release:	1
-License:	GPL v2+; LGPL v2.1+
+License:	GPL v2+, LGPL v2.1+
 Group:		Daemons
-URL:		http://www.linux-ha.org/
 Source0:	https://github.com/ClusterLabs/resource-agents/tarball/v3.9.3/%{name}-%{version}.tar.bz2
 # Source0-md5:	244cf2b90c94c6a0c5ed0747244eaa56
 Source1:	ldirectord.init
 Source2:	%{name}.tmpfiles
 Patch0:		%{name}-no_header_parsing.patch
 Patch1:		%{name}-bash.patch
-BuildRequires:	autoconf
-BuildRequires:	automake
+URL:		http://www.linux-ha.org/
+BuildRequires:	autoconf >= 2.63
+BuildRequires:	automake >= 1:1.10.1
 BuildRequires:	cluster-glue-libs-devel
 BuildRequires:	docbook-dtd44-xml
 BuildRequires:	docbook-style-xsl
-BuildRequires:	glib2-devel
+BuildRequires:	glib2-devel >= 2.0
+BuildRequires:	libnet-devel >= 1.0
 BuildRequires:	libtool
 BuildRequires:	libxslt-progs
 BuildRequires:	openssl-tools
+BuildRequires:	perl-tools-pod
 BuildRequires:	pkgconfig
 BuildRequires:	python-devel
 BuildRequires:	which
 Requires:	cluster-glue
+# for heartbeat parts
+Requires:	heartbeat-libs >= 3
 Obsoletes:	heartbeat-resources < 3.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -31,8 +36,13 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Scripts to allow common services to operate in a High Availability
 environment.
 
+%description -l pl.UTF-8
+Skrypty pozwalające na działanie popularnych usług w środowisku
+wysokiej dostępności (High Availability).
+
 %package -n ldirectord
 Summary:	A Monitoring Daemon for Maintaining High Availability Resources
+Summary(pl.UTF-8):	Demon monitorujący do utrzymywania zasobów z wysoką dostępnością
 License:	GPL v2+
 Group:		Applications/System
 Requires(post,preun):	/sbin/chkconfig
@@ -46,15 +56,16 @@ Provides:	heartbeat-ldirectord
 Obsoletes:	heartbeat-ldirectord
 
 %description -n ldirectord
-The Linux Director Daemon (ldirectord) was written by Jacob Rief.
-<jacob.rief at tiscover.com>
-
-ldirectord is a stand alone daemon for monitoring the services on real
-servers. Currently, HTTP, HTTPS, and FTP services are supported.
-lditrecord is simple to install and works with the heartbeat code
-(http://www.linux-ha.org/).
+The Linux Director Daemon (ldirectord) is a stand alone daemon for
+monitoring the services on real servers. Currently, HTTP, HTTPS, and
+FTP services are supported. ldirectord is simple to install and works
+with the heartbeat code (http://www.linux-ha.org/).
 
-See 'ldirectord -h' and linux-ha/doc/ldirectord for more information.
+%description -n ldirectord -l pl.UTF-8
+Demon Linux Director (ldirectord) to samodzielny demon do
+monitorowania usług na rzeczywistych serwerach. Obecnie obsługiwane są
+usługi HTTP, HTTPS i FTP. ldirectord jest prosty do zainstalowania i
+współpracuje z kodem heartbeat (http://www.linux-ha.org/).
 
 %prep
 %setup -q -n ClusterLabs-%{name}-2fafa06
@@ -74,10 +85,10 @@ See 'ldirectord -h' and linux-ha/doc/ldirectord for more information.
 	MAILCMD=/bin/mail \
 	MOUNT=/bin/mount \
 	PING=/bin/ping \
+	--docdir=%{_docdir}/%{name}-%{version} \
+	--enable-fatal-warnings \
 	--with-initdir=/etc/rc.d/init.d \
-	--enable-fatal-warnings=yes \
-	--with-ocf-root=%{_prefix}/lib/ocf \
-	--docdir=%{_docdir}/%{name}-%{version}
+	--with-ocf-root=%{_prefix}/lib/ocf
 
 %{__make}
 
@@ -90,14 +101,14 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/ha.d/resource.d \
 	DESTDIR=$RPM_BUILD_ROOT
 
 # in doc
-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/ra-api-1.dtd
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/ra-api-1.dtd
 
-rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/ldirectord
+%{__rm} $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
 install %{SOURCE2} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 
-# Dont package static libs or compiled python
+# Don't package static modules 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
 find $RPM_BUILD_ROOT -name '*.pyc' -type f -print0 | xargs -0 rm -f
@@ -123,51 +134,59 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS doc/README.webapps heartbeat/ra-api-1.dtd
-%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
-%{_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
 %attr(755,root,root) %{_sbindir}/rhev-check.sh
+
 %dir %{_sysconfdir}/ha.d
 %dir %{_sysconfdir}/ha.d/resource.d
 %{_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
+
+%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 %{_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
+%{_prefix}/lib/ocf/lib/heartbeat/ocf-*
+%{_prefix}/lib/ocf/lib/heartbeat/*.sh
+%dir %{_prefix}/lib/ocf/resource.d
+%dir %{_prefix}/lib/ocf/resource.d/heartbeat
+%{_prefix}/lib/ocf/resource.d/heartbeat/.ocf-*
 %attr(755,root,root) %{_prefix}/lib/ocf/resource.d/heartbeat/*
-%attr(755,root,root) %{_datadir}/cluster/*.sh
+%{_prefix}/lib/ocf/resource.d/redhat
+
+%dir %{_datadir}/cluster
 %{_datadir}/cluster/*.metadata
+%attr(755,root,root) %{_datadir}/cluster/*.sh
 %{_datadir}/cluster/SAP*
 %{_datadir}/cluster/svclib_nfslock
 %{_datadir}/cluster/ocf-shellfuncs
+%dir %{_datadir}/cluster/relaxng
 %{_datadir}/cluster/relaxng/*
+%dir %{_datadir}/cluster/utils
 %attr(755,root,root) %{_datadir}/cluster/utils/*
-%{_prefix}/lib/ocf/resource.d/heartbeat/.ocf-*
-%{_prefix}/lib/ocf/lib/heartbeat/ocf-*
-%{_prefix}/lib/ocf/lib/heartbeat/*.sh
-%{_prefix}/lib/ocf/resource.d/redhat
-%{_mandir}/man7/*.7*
+
+%{_datadir}/resource-agents
+
+%{_includedir}/heartbeat/agent_config.h
+
+%attr(1755,root,root) /var/run/resource-agents
+%{systemdtmpfilesdir}/%{name}.conf
+
+%{_mandir}/man7/ocf_heartbeat_*.7*
 %{_mandir}/man8/ocf-tester.8*
 %{_mandir}/man8/sfex_init.8*
-%{systemdtmpfilesdir}/%{name}.conf
 
 %files -n ldirectord
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ha.d/ldirectord.cf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/ldirectord
 %attr(755,root,root) %{_sysconfdir}/ha.d/resource.d/ldirectord
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/ldirectord
 %attr(754,root,root) /etc/rc.d/init.d/ldirectord
-%attr(755,root,root) %{_sbindir}/*ldirectord*
-%{_mandir}/man8/*ldirectord*.8*
+%attr(755,root,root) %{_sbindir}/ldirectord
+%{_mandir}/man8/ldirectord.8*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/resource-agents.git/commitdiff/187a73687dc713e722f24ae70c868e440342d6ab

