packages: nagios-merlin/nagios-merlin.spec, nagios-merlin/install.patch (NE...

[glen]

Author: glen                         Date: Tue Dec  7 15:16:00 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- install apps

---- Files affected:
packages/nagios-merlin:
   nagios-merlin.spec (1.7 -> 1.8) , install.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/nagios-merlin/nagios-merlin.spec
diff -u packages/nagios-merlin/nagios-merlin.spec:1.7 packages/nagios-merlin/nagios-merlin.spec:1.8
--- packages/nagios-merlin/nagios-merlin.spec:1.7	Tue Dec  7 16:07:44 2010
+++ packages/nagios-merlin/nagios-merlin.spec	Tue Dec  7 16:15:55 2010
@@ -2,13 +2,15 @@
 Summary:	Merlin: Module for Effortless Redundancy and Loadbalancing In Nagios
 Name:		nagios-merlin
 Version:	0.9.0
-Release:	0.13
+Release:	0.15
 License:	GPL v2
 Group:		Networking
 Source0:	http://www.op5.org/op5media/op5.org/downloads/merlin-%{version}.tar.gz
 # Source0-md5:	dd3fda7b4eea661e65b60f9b6a7d079e
 Source1:	merlind.init
+Source2:	README.PLD
 Patch0:		ldflags-as-needed.patch
+Patch1:		install.patch
 URL:		http://www.op5.org/community/plugin-inventory/op5-projects/merlin
 BuildRequires:	bash
 BuildRequires:	libdbi-devel
@@ -40,6 +42,7 @@
 %prep
 %setup -q -n merlin-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %{__sed} -i -e '
 	s#@@DESTDIR@@/logs/neb.log#%{logdir}/merlin-neb.log#g
@@ -64,9 +67,10 @@
 bash install-merlin.sh \
 	--root=$RPM_BUILD_ROOT \
 	--dest-dir=%{appdir} \
-	--libexecdir=%{_libdir} \
+	--libexecdir=%{appdir}/lib \
+	--bindir=%{_sbindir} \
 	--batch \
-	--install=files
+	--install=files,apps
 
 chmod a+rx $RPM_BUILD_ROOT%{appdir}/merlin.so
 rm -f $RPM_BUILD_ROOT%{appdir}/init.sh
@@ -108,12 +112,31 @@
 %attr(755,root,root) %{appdir}/merlin.so
 %attr(755,root,root) %{appdir}/showlog
 
+# apps
+%attr(755,root,root) %{_sbindir}/mon
+%dir %{appdir}/lib
+%attr(755,root,root) %{appdir}/lib/-oconf
+%attr(755,root,root) %{appdir}/lib/log.push.sh
+%attr(755,root,root) %{appdir}/lib/node.py
+%attr(755,root,root) %{appdir}/lib/oconf.py
+%attr(755,root,root) %{appdir}/lib/restart.sh
+%attr(755,root,root) %{appdir}/lib/sshkey.fetch.sh
+%attr(755,root,root) %{appdir}/lib/sshkey.push.sh
+%attr(755,root,root) %{appdir}/lib/start.sh
+%attr(755,root,root) %{appdir}/lib/stop.sh
+%{appdir}/lib/modules/compound_config.py
+%{appdir}/lib/modules/merlin_apps_utils.py
+%{appdir}/lib/modules/merlin_conf.py
+
 %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.8  2010/12/07 15:15:55  glen
+- install apps
+
 Revision 1.7  2010/12/07 15:07:44  glen
 - add pld readme, needs mysql dbi driver (at least)
 

================================================================
Index: packages/nagios-merlin/install.patch
diff -u /dev/null packages/nagios-merlin/install.patch:1.1
--- /dev/null	Tue Dec  7 16:16:00 2010
+++ packages/nagios-merlin/install.patch	Tue Dec  7 16:15:55 2010
@@ -0,0 +1,11 @@
+--- merlin-0.9.0/install-merlin.sh~	2010-11-01 16:27:11.000000000 +0200
++++ merlin-0.9.0/install-merlin.sh	2010-12-07 17:14:52.926983287 +0200
+@@ -147,7 +147,7 @@
+ {
+ 	mkdir -p $root_path/$bindir
+ 	mkdir -p $root_path/$libexecdir
+-	cp apps/mon.py $root_path/usr/bin/mon
++	cp apps/mon.py $root_path/$bindir/mon
+ 	cp -a apps/libexec/* $root_path/$libexecdir
+ 	cp oconf $root_path/$libexecdir/-oconf
+ 	chmod 755 $root_path/$bindir/mon
================================================================

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