The most recent version copied. Do not modify this instance (RW in ./org.glite.lb).

diff --git a/org.glite.lb.glite-LB/configure b/org.glite.lb.glite-LB/configure
index 0ef21e0..c82ed75 100755 (executable)
--- a/org.glite.lb.glite-LB/configure
+++ b/org.glite.lb.glite-LB/configure
@@ -327,10 +327,10 @@ BEGIN{
        'lb.ws-interface' => [],
        'lb.ws-test' => [ qw/gsoap:B/ ],
        'lb.types' => [ qw// ],
-       'lb.harvester' => [ qw/postgresql:R/ ],
+       'lb.harvester' => [ qw// ],
        'lb.yaim' => [ qw/yaim_core:R/ ],
        'lb.glite-LB' => [ qw/fetchcrl:R gpt:R gip_release:R gip_service:R bdii:R glite_version:R glite_info_templates:R glue_schema:R/ ],
-       'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B/ ],
+       'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B cppunit:B log4c:B/ ],
        'lbjp-common.log' => [ qw/log4c/ ],
        'lbjp-common.maildir' => [ qw// ],
        'lbjp-common.server-bones' => [ qw// ],
@@ -416,7 +416,7 @@ 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.ws-test:R lb.harvester:R lb.yaim:R lb.client-java:R
        / ],
        'lbjp-common.db' => [ qw/lbjp-common.trio lbjp-common.log/ ],
        'lbjp-common.maildir' => [ qw// ],
@@ -475,6 +475,10 @@ for my $ext (keys %deps_aux) {
        jpclient => 'jp.client',
 );
 
+%obsoletes = (
+       'lb.yaim' => [ qq/glite-yaim-lb/ ],
+);
+
 my @t = qw/lb.client-java jobid.api-java lb.types/;
 @topbuild{@t} = (1) x ($#t+1);
 }
@@ -695,16 +699,21 @@ init = None
 install = make install
 clean = make clean
 test = make check
-configure = cd $confdir && \${moduleName}/configure --thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor} --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --module $subsys.$module @copts
+configure = cd $confdir && /usr/bin/perl \${moduleName}/configure --thrflavour=\${globus.thr.flavor} --nothrflavour=\${globus.nothr.flavor} --prefix=\${prefix} --stage=\${stageDir} --libdir=\${libdir} --module $subsys.$module @copts
 checkstyle = None
 
 [Platform-default:Property]
 $buildroot
 $package_description
 $package_summary
+};
+       for (@{$obsoletes{"$subsys.$module"}}) {
+               print C "package.obsoletes = $_\n";
+               print C "package.replaces = $_\n";
+       }
 
+       print C qq{
 [Platform-default:DynamicDependency]
-
 };
        for (@{$need_externs{"$subsys.$module"}},@{$need_jars{"$subsys.$module"}}) {
                my $eext = $etics_externs{$_} ? $etics_externs{$_} : $_;

diff --git a/org.glite.lb.harvester/configure b/org.glite.lb.harvester/configure
index 71ff6f0..c82ed75 100755 (executable)
--- a/org.glite.lb.harvester/configure
+++ b/org.glite.lb.harvester/configure
@@ -330,7 +330,7 @@ BEGIN{
        'lb.harvester' => [ qw// ],
        'lb.yaim' => [ qw/yaim_core:R/ ],
        'lb.glite-LB' => [ qw/fetchcrl:R gpt:R gip_release:R gip_service:R bdii:R glite_version:R glite_info_templates:R glue_schema:R/ ],
-       'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B/ ],
+       'lbjp-common.db' => [ qw/mysql:B mysql-devel:B postgresql:B cppunit:B log4c:B/ ],
        'lbjp-common.log' => [ qw/log4c/ ],
        'lbjp-common.maildir' => [ qw// ],
        'lbjp-common.server-bones' => [ qw// ],
@@ -416,7 +416,7 @@ 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.ws-test:R lb.harvester:R lb.yaim:R lb.client-java:R
        / ],
        'lbjp-common.db' => [ qw/lbjp-common.trio lbjp-common.log/ ],
        'lbjp-common.maildir' => [ qw// ],