From: František Dvořák <valtri@civ.zcu.cz>
Date: Mon, 19 Dec 2011 10:53:23 +0000 (+0000)
Subject: Packaging fixes.
X-Git-Tag: emi-canl-c_R_1_0_0_0~106
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=bf3460be30af8eb789c0932c9a4bb5eb93a93e95;p=jra1mw.git

Packaging fixes.
---

diff --git a/org.glite.lb.nagios/project/emi-lb-nagios-plugins.spec b/org.glite.lb.nagios/project/emi-lb-nagios-plugins.spec
index af4cd71..caa0167 100644
--- a/org.glite.lb.nagios/project/emi-lb-nagios-plugins.spec
+++ b/org.glite.lb.nagios/project/emi-lb-nagios-plugins.spec
@@ -11,7 +11,7 @@ Requires: glite-lb-client
 Requires: glite-lb-utils
 Requires: glite-lb-ws-test
 Requires: globus-proxy-utils
-Provides: glite-lb-nagios-plugins
+Provides: glite-lb-nagios-plugins = %{name}-%{version}-%{release}
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 AutoReqProv: yes
 Source: http://eticssoft.web.cern.ch/eticssoft/repository/emi/emi.lb.nagios/%{version}/src/%{name}-@VERSION@.src.tar.gz
diff --git a/org.glite.lb.server/project/glite-lb-server.spec b/org.glite.lb.server/project/glite-lb-server.spec
index 165cee1..6b76902 100644
--- a/org.glite.lb.server/project/glite-lb-server.spec
+++ b/org.glite.lb.server/project/glite-lb-server.spec
@@ -40,6 +40,9 @@ BuildRequires: voms
 BuildRequires: bison
 BuildRequires: chrpath
 Requires: mysql-server
+# for upgrade from EMI-1:
+# new function glite_srvbones_daemon_listen() in 2.2.0
+Requires: libglite-lbjp-common-server-bones%{?_isa} >= 2.2.0
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
@@ -87,23 +90,19 @@ exit 0
 
 
 %post
-/sbin/chkconfig --add glite-lb-bkserver
-if [ $1 -eq 1 ] ; then
-	# XXX: or rather to detect finalized set-up in the start-up scripts?
-	/sbin/chkconfig glite-lb-bkserver off
-fi
+/sbin/chkconfig --add glite-lb-bkserverd
 
 
 %preun
 if [ $1 -eq 0 ] ; then
-    /sbin/service glite-lb-bkserver stop >/dev/null 2>&1
-    /sbin/chkconfig --del glite-lb-bkserver
+    /sbin/service glite-lb-bkserverd stop >/dev/null 2>&1
+    /sbin/chkconfig --del glite-lb-bkserverd
 fi
 
 
 %postun
 if [ "$1" -ge "1" ] ; then
-    /sbin/service glite-lb-bkserver restart >/dev/null 2>&1 || :
+    /sbin/service glite-lb-bkserverd restart >/dev/null 2>&1 || :
 fi
 
 
diff --git a/org.glite.lb/configure b/org.glite.lb/configure
index 45b5c78..7b24695 100755
--- a/org.glite.lb/configure
+++ b/org.glite.lb/configure
@@ -682,7 +682,7 @@ for my $jar (keys %need_jars) {
 	'jobid.api-cpp' =>  [ qw/jobid.api-c/ ],
 	'jobid.api-java' =>  [ qw// ],
 
-	'lbjp-common.jp-interface' => [ qw/lbjp-common.db jobid.api-c/ ],
+	'lbjp-common.jp-interface' => [ qw/lbjp-common.trio lbjp-common.db jobid.api-c/ ],
 
 	'jp.client' => [ qw/
                 jp.ws-interface
diff --git a/org.glite.lbjp-common.gsoap-plugin/project/glite-lbjp-common-gsoap-plugin.spec b/org.glite.lbjp-common.gsoap-plugin/project/glite-lbjp-common-gsoap-plugin.spec
index 8aa70fe..21258fd 100644
--- a/org.glite.lbjp-common.gsoap-plugin/project/glite-lbjp-common-gsoap-plugin.spec
+++ b/org.glite.lbjp-common.gsoap-plugin/project/glite-lbjp-common-gsoap-plugin.spec
@@ -39,7 +39,7 @@ Group: Development/Libraries
 Requires: lib%{name}%{?_isa} = %{version}-%{release}
 Requires: glite-lbjp-common-gss-devel
 Provides: %{name}%{?_isa} = %{version}-%{release}
-Provides: glite-security-gsoap-plugin
+Provides: glite-security-gsoap-plugin%{?_isa} = %{version}-%{release}
 Obsoletes: glite-security-gsoap-plugin < 2.0.1-1
 
 
diff --git a/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec b/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec
index 37ae9b3..96cbe2d 100644
--- a/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec
+++ b/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec
@@ -37,7 +37,7 @@ Group: Development/Libraries
 Requires: lib%{name}%{?_isa} = %{version}-%{release}
 Requires: globus-gssapi-gsi-devel
 Provides: %{name}%{?_isa} = %{version}-%{release}
-Provides: glite-security-gss
+Provides: glite-security-gss%{?_isa} = %{version}-%{release}
 Obsoletes: glite-security-gss < 2.1.5-1