From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Fri, 8 Jun 2012 10:01:31 +0000 (+0000)
Subject: Updating version, ChangeLog and copying the most recent configure from ./org.glite... 
X-Git-Tag: glite-lb-client_R_5_2_0_1~1
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=d11b47d8662d0f5f027e54a13a2d8fb4bef4397b;p=jra1mw.git

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

diff --git a/org.glite.lb.client/configure b/org.glite.lb.client/configure
index 007c7b2..e457931 100755
--- a/org.glite.lb.client/configure
+++ b/org.glite.lb.client/configure
@@ -285,6 +285,9 @@ if ($project =~ /^([^0-9]*)(.*)$/) {
 }
 %project = %{$projects{$project}};
 $project_version = $project{current_version} unless $project_version;
+if ($project ne 'emi' or $project_version <= 1) {
+	$lbmodules{'gridsite'} = [ qw/apache shared commands core devel slashgrid services service-clients gsexec/ ];
+}
 for my $platform (keys %{$project{etics_externs}}) {
 	for $_ (keys %{$project{etics_externs}{$platform}}) {
 		$etics_externs{$platform}{$_} = $project{etics_externs}{$platform}{$_};
@@ -625,6 +628,7 @@ BEGIN{
 	'gridsite.commands' => [ qw/curl:R openssl:R/ ],
 	'gridsite.apache' => [ qw/libxml2:R openssl:R curl:R/ ],
 	'gridsite.libs' => [ qw/libxml2:R openssl:R/ ],
+	'gridsite.shared' => [ qw/libxml2:R openssl:R/ ],
 	'gridsite.devel' => [ qw// ],
 	'gridsite.slashgrid' => [ qw/curl:R fuse:R/],
 	'gridsite.services' => [ qw/curl:R gsoap:R/ ],
@@ -633,7 +637,7 @@ BEGIN{
 	'gridsite.1.5-compat' => [ qw/httpd-devel:B gsoap:B globus:B curl:B doxygen:B fuse-devel:B libxml2:B openssl:B doxygen:B/ ],
 	'px.proxyrenewal' => [ qw/globus:B globus_essentials:R myproxy-devel:B voms:B libtool:B pkgconfig:B/ ],
 	'px.myproxy-config' => [ qw/myproxy-admin:R/ ], # in myproxy-config.spec
-	'canl.c' => [ qw/cares:B openssl:B libtool:B bison:B flex:B krb5-devel:B pkgconfig:B/ ],
+	'canl.c' => [ qw/cares:B openssl:B libtool:B bison:B flex:B krb5-devel:B pkgconfig:B tetex-latex:B/ ],
 );
 
 %need_jars = (
@@ -751,6 +755,7 @@ for my $jar (keys %need_jars) {
 	'gridsite.commands' => [ qw/gridsite.core:B/ ],
 	'gridsite.apache' => [ qw/gridsite.core:B/ ],
 	'gridsite.libs' => [ qw/gridsite.core:B / ],
+	'gridsite.shared' => [ qw/gridsite.core:B / ],
 	'gridsite.devel' => [ qw/gridsite.core:B/ ],
 	'gridsite.slashgrid' => [ qw/gridsite.core:B/],
 	'gridsite.services' => [ qw/gridsite.core:B/ ],
@@ -1559,7 +1564,7 @@ sub mode_etics {
 	else {
 		$conf = "$confprefix$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
 # XXX: gridsite hack
-		$conftag = $subsys eq 'gridsite' ? "$project{tag_prefix}{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}" : 
+		$conftag = $subsys eq 'gridsite' ? "$project{tag_prefix}{$subsys}${subsys}_R_${major}_${minor}_${rev}" : 
 			"$project{tag_prefix}{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
 
 		# lowering age for older packaging
@@ -1634,7 +1639,7 @@ sub mode_etics {
 			}
 
 			$cmd{default}{configure} = "cat > Makefile.inc <<EOF
-	project = $project
+	project = $project$project_version
 	top_srcdir = ..
 	$flags
 	EOF";
diff --git a/org.glite.lb.client/project/ChangeLog b/org.glite.lb.client/project/ChangeLog
index 490e25e..e832319 100644
--- a/org.glite.lb.client/project/ChangeLog
+++ b/org.glite.lb.client/project/ChangeLog
@@ -228,3 +228,9 @@
 5.1.4-2
 - Module rebuilt
 
+5.2.0-1
+- Torque jobs support
+- Showing CREAM data for WMS->CREAM jobs
+- Merge from branch_3_2
+- Unnecessary events removed from Sandbox collection registration
+
diff --git a/org.glite.lb.client/project/version.properties b/org.glite.lb.client/project/version.properties
index 60bf675..61607d2 100644
--- a/org.glite.lb.client/project/version.properties
+++ b/org.glite.lb.client/project/version.properties
@@ -1,3 +1,3 @@
 # $Header$
-module.version=5.1.4
-module.age=2
+module.version=5.2.0
+module.age=1