From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Wed, 30 Mar 2011 07:50:57 +0000 (+0000)
Subject: Updating version, ChangeLog and copying the most recent configure from ./org.glite... 
X-Git-Tag: glite-lb-utils_R_2_1_2_2~1
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=1b16ae4b58da115185d95cfd3f464046bb335571;p=jra1mw.git

Updating version, ChangeLog and copying the most recent configure from ./org.glite.lb for v. 2.1.2-2
---

diff --git a/org.glite.lb.utils/configure b/org.glite.lb.utils/configure
index 52b932d..24b0fce 100755
--- a/org.glite.lb.utils/configure
+++ b/org.glite.lb.utils/configure
@@ -120,7 +120,8 @@ my %externs = (
 		prefix => '/opt/glite'
 	},
 	lcas => {
-		prefix => '/opt/glite'
+		prefix => '/opt/glite',
+		pkg => 'lcas'
 	},
 	trustmanager => {
 		prefix => '/opt/glite'
@@ -409,11 +410,11 @@ sub mode_build {
 	
 	open MAK,">Makefile" or die "Makefile: $!\n";
 	
-	print MAK "all: @modules\n\nclean:\n";
+	print MAK "all: @modules\n\nclean check:\n";
 	
 	for (@modules) {
 		my $full = full($_);
-		print MAK "\tcd $full/$buildroot{$_} && \${MAKE} clean\n"
+		print MAK "\tcd $full/$buildroot{$_} && \${MAKE} \$@\n"
 	}
 	
 	print MAK "\ndistclean:\n";
@@ -676,6 +677,8 @@ for my $ext (keys %deps_aux) {
 	'px.myproxy-config' => [ qq/myproxy-config/ ], # in myproxy-config.spec
 	'lbjp-common.gss' => [ qq/glite-security-gss/ ],
 	'lbjp-common.gsoap-plugin' => [ qq/glite-security-gsoap-plugin/ ],
+	'lb.glite-LB' => [ qq/glite-LB/ ],
+	'px.glite-PX' => [ qq/glite-PX/ ],
 );
 
 %cvs_prefix = (
@@ -739,7 +742,7 @@ for my $ext (keys %deps_aux) {
 			'lb.client-java' => [ qw/ant:B jdk:B axis:B trustmanager utiljava libtool:B/ ],
 			'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/ ],
 			'lb.yaim' => [ qw/yaim_core:R/ ],
-			'px.glite-PX' => [qw/myproxy-server:R myproxy-admin:R fetchcrl:R gip_service:R bdii:R glite_version:R gpt:R glue_schema:R nc:R/],
+			'px.glite-PX' => [qw/myproxy-server:R myproxy-admin:R fetchcrl:R gip_service:R bdii:R glite_version:R gpt:R glue_schema:R/],
 			'px.myproxy-yaim' => [ qw/yaim_core:R/ ],
 		},
 	},
@@ -796,7 +799,7 @@ for my $ext (keys %deps_aux) {
 			'lb.client-java' => [ qw/ant:B jdk:B axis:B trustmanager trustmanager_axis libtool:B/ ],
 			'lb.glite-LB' => [ qw/fetchcrl:R gip_release:R gip_service:R bdii:R glite_version:R glue_schema:R/ ],
 			'lb.yaim' => [ qw/yaim_core:R yaim_bdii:R/ ],
-			'px.glite-PX' => [qw/myproxy-server:R myproxy-admin:R fetchcrl:R gip_service:R bdii:R glite_version:R glue_schema:R nc:R/],
+			'px.glite-PX' => [qw/myproxy-server:R myproxy-admin:R fetchcrl:R gip_service:R bdii:R glite_version:R glue_schema:R/],
 			'px.myproxy-yaim' => [ qw/yaim_core:R yaim_bdii:R/ ],
 		},
 	},
diff --git a/org.glite.lb.utils/project/ChangeLog b/org.glite.lb.utils/project/ChangeLog
index 89f62e7..10c421b 100644
--- a/org.glite.lb.utils/project/ChangeLog
+++ b/org.glite.lb.utils/project/ChangeLog
@@ -71,3 +71,6 @@
 - Relocatable build directory
 - Build system cleanup -- removing obsolete files
 
+2.1.2-2
+- Module rebuilt
+
diff --git a/org.glite.lb.utils/project/version.properties b/org.glite.lb.utils/project/version.properties
index a2cab4e..7838732 100755
--- a/org.glite.lb.utils/project/version.properties
+++ b/org.glite.lb.utils/project/version.properties
@@ -1,3 +1,3 @@
 # $Header$
 module.version=2.1.2
-module.age=1
+module.age=2