From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Tue, 6 Sep 2011 09:44:21 +0000 (+0000)
Subject: * make nagios module noarch
X-Git-Tag: glite-lbjp-common_R_3_0_8_1~4
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=aa52ba47d1924b93c9bbc1e2af03dd90473c999a;p=jra1mw.git

* make nagios module noarch
* shorten description
* install ChangeLog with the package
---

diff --git a/org.glite.lb.nagios/Makefile b/org.glite.lb.nagios/Makefile
index 4c230e1..0c9651c 100644
--- a/org.glite.lb.nagios/Makefile
+++ b/org.glite.lb.nagios/Makefile
@@ -14,6 +14,7 @@ install:
 	-chown nagios:nagios ${DESTDIR}${PREFIX}/var/lib/grid-monitoring/emi.lb
 	mkdir -p ${DESTDIR}${PREFIX}${prefix}/libexec/grid-monitoring/probes/emi.lb
 	${INSTALL} -m 0755 src/LB-probe ${DESTDIR}${PREFIX}${prefix}/libexec/grid-monitoring/probes/emi.lb
+	( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} )
 
 stage:
 	$(MAKE) install PREFIX=${stagedir}
diff --git a/org.glite.lb.nagios/configure b/org.glite.lb.nagios/configure
index 5f94259..f4b0740 100755
--- a/org.glite.lb.nagios/configure
+++ b/org.glite.lb.nagios/configure
@@ -969,6 +969,9 @@ for my $ext (keys %deps_aux) {
 	'lb.yaim' => {
 		default => { 'package.buildarch' => 'noarch' },
 	},
+	'lb.nagios' => {
+		default => { 'package.buildarch' => 'noarch' },
+	},
 	'px.yaim' => {
 		default => { 'package.buildarch' => 'noarch' },
 	},
diff --git a/org.glite.lb.nagios/project/package.description b/org.glite.lb.nagios/project/package.description
index c97e3c2..6007e41 100644
--- a/org.glite.lb.nagios/project/package.description
+++ b/org.glite.lb.nagios/project/package.description
@@ -1 +1 @@
-This is a package to distribute a nagios probe that checks the EMI L&B server. It is a shell-based script titled check_lb_server.
+This is a nagios probe that checks the EMI L&B server. It is a shell-based script titled check_lb_server.
diff --git a/org.glite.lb/configure b/org.glite.lb/configure
index 5f94259..f4b0740 100755
--- a/org.glite.lb/configure
+++ b/org.glite.lb/configure
@@ -969,6 +969,9 @@ for my $ext (keys %deps_aux) {
 	'lb.yaim' => {
 		default => { 'package.buildarch' => 'noarch' },
 	},
+	'lb.nagios' => {
+		default => { 'package.buildarch' => 'noarch' },
+	},
 	'px.yaim' => {
 		default => { 'package.buildarch' => 'noarch' },
 	},