From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Tue, 30 Mar 2010 10:28:05 +0000 (+0000)
Subject: The most recent version copied. Do not modify this instance (RW in ./org.glite.lb).
X-Git-Tag: glite-lb-doc_R_1_1_2_1~1
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=d006a6026cb0f0bff543b2ae63a8325510b5dcf3;p=jra1mw.git

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

diff --git a/org.glite.lb.doc/configure b/org.glite.lb.doc/configure
index 05685b0..71ff6f0 100755
--- a/org.glite.lb.doc/configure
+++ b/org.glite.lb.doc/configure
@@ -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.yaim/configure b/org.glite.lb.yaim/configure
index 238cfc3..71ff6f0 100644
--- a/org.glite.lb.yaim/configure
+++ b/org.glite.lb.yaim/configure
@@ -699,7 +699,7 @@ 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]