From c457176f07884754e76cc03f4ea821fd40c9878f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Tue, 13 Dec 2011 12:34:24 +0000
Subject: [PATCH] Packaging fixes for EMI-1: - "soft" dependency for
 lb.ws-interface - doc dir location (package names) - missing automatic
 dependencies in lb.common (fixed permissions)

---
 org.glite.lb.common/Makefile                        | 2 +-
 org.glite.lb.logger-msg/Makefile                    | 1 -
 org.glite.lb.logger-msg/project/package.description | 2 +-
 org.glite.lb.nagios/Makefile                        | 4 +++-
 org.glite.lb/configure                              | 2 +-
 org.glite.lbjp-common.maildir/Makefile              | 2 +-
 org.glite.lbjp-common.server-bones/Makefile         | 2 +-
 org.glite.lbjp-common.trio/Makefile                 | 2 +-
 8 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index cc06da1..b2e6af7 100644
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -223,7 +223,7 @@ olddoc: generate events.tex status.tex
 install: 
 	mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir}
 	mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/examples
-	${INSTALL} -m 644 ${lib_LTLIBRARIES} ${DESTDIR}${PREFIX}${prefix}/${libdir}
+	${INSTALL} -m 755 ${lib_LTLIBRARIES} ${DESTDIR}${PREFIX}${prefix}/${libdir}
 	${INSTALL} -m 644 ${top_srcdir}/LICENSE ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
 	( cd ${top_srcdir}/project && ${INSTALL} -m 644 ChangeLog package.description package.summary ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} )
 #	cp -r C CPP ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
diff --git a/org.glite.lb.logger-msg/Makefile b/org.glite.lb.logger-msg/Makefile
index bc6d400..206eee1 100644
--- a/org.glite.lb.logger-msg/Makefile
+++ b/org.glite.lb.logger-msg/Makefile
@@ -99,7 +99,6 @@ check:
 install:
 	-mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples
 	-mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
-	-mkdir -p ${DESTDIR}${PREFIX}${prefix}/etc/glite-lb
 	-mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/glite-lb
 	-mkdir -p ${DESTDIR}${PREFIX}${sysconfdir}/glite-lb
 	${INSTALL} -m 644 ${top_srcdir}/LICENSE ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
diff --git a/org.glite.lb.logger-msg/project/package.description b/org.glite.lb.logger-msg/project/package.description
index f6dd3e3..f2ca5cf 100644
--- a/org.glite.lb.logger-msg/project/package.description
+++ b/org.glite.lb.logger-msg/project/package.description
@@ -1 +1 @@
-Plugin for delivering L&B notification messages into the messaging infrustructure.
+Plugin for delivering L&B notification messages into the messaging infrastructure.
diff --git a/org.glite.lb.nagios/Makefile b/org.glite.lb.nagios/Makefile
index 1676c7e..10fe7bb 100644
--- a/org.glite.lb.nagios/Makefile
+++ b/org.glite.lb.nagios/Makefile
@@ -1,6 +1,6 @@
 top_srcdir=..
 stagedir=.
-package=emi-nagios-lb
+package=emi-lb-nagios-plugins
 version=0.0.0
 prefix=
 INSTALL=install
@@ -8,6 +8,8 @@ INSTALL=install
 -include Makefile.inc
 -include ${top_srcdir}/project/version.properties
 
+version=${module.version}
+
 install:
 	mkdir -p ${DESTDIR}${PREFIX}/var/lib/grid-monitoring/emi.lb
 	mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
diff --git a/org.glite.lb/configure b/org.glite.lb/configure
index 04919fb..16595a2 100755
--- a/org.glite.lb/configure
+++ b/org.glite.lb/configure
@@ -553,7 +553,7 @@ BEGIN{
 	'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql:R mysql-server:R mysql-devel:B cppunit:B gsoap:B classads voms lcas gridsite bison:B libtool:B libxml2 flex:B/ ],
 	'lb.state-machine' => [ qw/classads libtool:B libxslt:B expat:B/ ],
 	'lb.utils' => [ qw/cppunit:B libtool:B/ ],
-	'lb.ws-interface' => [ qw/libxslt:B/ ],
+	'lb.ws-interface' => [ qw/libxslt:B tidy:B/ ],
 	'lb.ws-test' => [ qw/gsoap:B libtool:B/ ],
 	'lb.types' => [ qw// ],
 	'lb.harvester' => [ qw/docbook-utils:B libtool:B/ ],
diff --git a/org.glite.lbjp-common.maildir/Makefile b/org.glite.lbjp-common.maildir/Makefile
index 6f4b81c..56660f5 100644
--- a/org.glite.lbjp-common.maildir/Makefile
+++ b/org.glite.lbjp-common.maildir/Makefile
@@ -5,7 +5,7 @@ stagedir=.
 distdir=.
 globalprefix=glite
 lbutilsprefix=lbu
-package=glite-lb-utils-maildir
+package=glite-lbjp-common-maildir
 version=1.0.0
 PREFIX=/opt/glite
 prefix=
diff --git a/org.glite.lbjp-common.server-bones/Makefile b/org.glite.lbjp-common.server-bones/Makefile
index c2b75bf..730f6e2 100644
--- a/org.glite.lbjp-common.server-bones/Makefile
+++ b/org.glite.lbjp-common.server-bones/Makefile
@@ -3,7 +3,7 @@ top_srcdir=..
 stagedir=.
 globalprefix=glite
 lbutilsprefix=lbu
-package=glite-lb-server-bones
+package=glite-lbjp-common-server-bones
 version=0.0.1
 PREFIX=/opt/glite
 prefix=
diff --git a/org.glite.lbjp-common.trio/Makefile b/org.glite.lbjp-common.trio/Makefile
index dcd52ef..9c10316 100644
--- a/org.glite.lbjp-common.trio/Makefile
+++ b/org.glite.lbjp-common.trio/Makefile
@@ -5,7 +5,7 @@ top_builddir=${top_srcdir}/${builddir}
 stagedir=.
 distdir=.
 globalprefix=glite
-package=glite-lb-utils-trio
+package=glite-lbjp-common-trio
 version=0.0.0
 PREFIX=/opt/glite
 lbuprefix=lbu
-- 
1.8.2.3