Disable java stuff (missing dependencies in EMI-3).

diff --git a/org.glite.lb.emi-lb/project/debian.control b/org.glite.lb.emi-lb/project/debian.control
index 55f5a12..be5d7e8 100644 (file)
--- a/org.glite.lb.emi-lb/project/debian.control
+++ b/org.glite.lb.emi-lb/project/debian.control
@@ -13,6 +13,6 @@ Package: emi-lb
 Section: net
 Architecture: any
 Depends: ${misc:Depends}, bdii, emi-version, fetch-crl, glite-lb-client-progs, glite-lb-doc, glite-lb-harvester, glite-lb-logger, glite-lb-logger-msg, glite-lb-server, glite-lb-utils, glite-lb-ws-test, glue-schema
-Recommends: glite-info-provider-service, glite-lb-client-java, glite-lb-yaim
+Recommends: glite-info-provider-service, glite-lb-yaim
 Description: @SUMMARY@
 @DEBIAN_DESCRIPTION@

diff --git a/org.glite.lb.emi-lb/project/emi-lb.spec b/org.glite.lb.emi-lb/project/emi-lb.spec
index 6185e7a..5d8888e 100644 (file)
--- a/org.glite.lb.emi-lb/project/emi-lb.spec
+++ b/org.glite.lb.emi-lb/project/emi-lb.spec
@@ -13,9 +13,6 @@ BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires:       bdii
 Requires:       emi-version
 Requires:       fetch-crl
-%if ! 0%{?fedora}
-Requires:       glite-lb-client-java
-%endif
 Requires:       glite-lb-client-progs
 Requires:       glite-lb-doc
 Requires:       glite-lb-harvester

diff --git a/org.glite.lb/configure b/org.glite.lb/configure
index c920302..1c4743f 100755 (executable)
--- a/org.glite.lb/configure
+++ b/org.glite.lb/configure
@@ -192,9 +192,9 @@ my (%etics_externs, %etics_projects);
 # additional modules from $project{modules} are automatically added
 #
 my %lbmodules = (
-       'lb' => [ qw/client client-java common doc logger server state-machine types utils ws-interface ws-test harvester yaim logger-msg nagios client-devel client-progs common-devel logger-devel state-machine-devel/], 
+       'lb' => [ qw/client common doc logger server state-machine types utils ws-interface ws-test harvester yaim logger-msg nagios client-devel client-progs common-devel logger-devel state-machine-devel/], 
        'lbjp-common' => [qw/db log maildir server-bones trio jp-interface gss gsoap-plugin db-devel log-devel maildir-devel server-bones-devel trio-devel jp-interface-devel gss-devel gsoap-plugin-devel/],
-       'jobid' => [qw/api-c api-c-devel api-cpp api-cpp-devel api-java/],
+       'jobid' => [qw/api-c api-c-devel api-cpp api-cpp-devel/],
        'jp' => [ qw/client doc index primary server-common ws-interface/ ],
        'gridsite' => [ qw/apache libs commands core devel services service-clients/ ],
        'px' => [ qw/proxyrenewal myproxy-yaim proxyrenewal-devel proxyrenewal-progs/ ],
@@ -749,12 +749,12 @@ for my $jar (keys %need_jars) {
        'lb.yaim' => [ qw// ],
        'lb.glite-LB' => [ qw/
                lb.logger:R lb.server:R lb.utils:R lb.doc:R
-               lb.ws-test:R lb.harvester:R lb.yaim:R lb.client-java:R
+               lb.ws-test:R lb.harvester:R lb.yaim:R
                lb.logger-msg:R
        / ],
        'lb.emi-lb' => [ qw/
                lb.logger:R lb.server:R lb.utils:R lb.doc:R
-               lb.ws-test:R lb.harvester:R lb.yaim:R lb.client-java:R
+               lb.ws-test:R lb.harvester:R lb.yaim:R
                lb.logger-msg:R
        / ],
        'lbjp-common.db' => [ qw/lbjp-common.trio lbjp-common.log/ ],