From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Tue, 28 Aug 2012 07:21:29 +0000 (+0000)
Subject: Updating version, ChangeLog and copying the most recent configure from ./org.glite... 
X-Git-Tag: glite-lbjp-common-gsoap-plugin_R_3_2_2_1~1
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=87c40224900f0c337bc85c731b2b45c096ab28df;p=jra1mw.git

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

diff --git a/org.glite.lbjp-common.gsoap-plugin/configure b/org.glite.lbjp-common.gsoap-plugin/configure
index f2880c2..3d43cdb 100755
--- a/org.glite.lbjp-common.gsoap-plugin/configure
+++ b/org.glite.lbjp-common.gsoap-plugin/configure
@@ -1712,8 +1712,11 @@ sub mode_etics {
 	top_srcdir = ..
 	$flags
 	EOF";
-			$cmd{default}{compile} = "make prefix=\${prefix}$project{local_prefix} libdir=\${libdir}";
-			$cmd{default}{install} = "make prefix=\${prefix}$project{local_prefix} libdir=\${libdir} install";
+			# no stage builds since EMI-3
+			if ($project ne 'emi' or $project_version <= 2) {
+				$cmd{default}{compile} = "make prefix=\${prefix}$project{local_prefix} libdir=\${libdir}";
+				$cmd{default}{install} = "make prefix=\${prefix}$project{local_prefix} libdir=\${libdir} install";
+			}
 			mode_etics_packaging($fmod, \%cmd,
 				"make prefix=\${prefix}$project{local_prefix} rpm-prepare
 	cp gridsite.spec ../\n\t",
@@ -1757,12 +1760,15 @@ sub mode_etics {
 	}
 	else {
 		$cmd{default}{configure} = "/usr/bin/perl $confdir/configure $project{flavours} --root=\${prefix} --prefix=$project{local_prefix} --stage=\${stageDir} --sysroot=\${package.prefix} --libdir=\${libdir} --project=\${projectName} --module $subsys.$module @copts";
-		$cmd{default}{compile} = 'make';
-		$cmd{default}{test} = 'make check';
-		$cmd{default}{install} = 'make install';
-		if ($subsys eq 'lb' and $module eq 'client') {
-			$cmd{default}{compile} = "make rpath=$project{local_prefix}/\${libdir}";
-			$cmd{default}{install} = "make install post-install rpath=$project{local_prefix}/\${libdir}";
+		# no stage builds since EMI-3
+		if ($project ne 'emi' or $project_version <= 2) {
+			$cmd{default}{compile} = 'make';
+			$cmd{default}{test} = 'make check';
+			$cmd{default}{install} = 'make install';
+			if ($subsys eq 'lb' and $module eq 'client') {
+				$cmd{default}{compile} = "make rpath=$project{local_prefix}/\${libdir}";
+				$cmd{default}{install} = "make install post-install rpath=$project{local_prefix}/\${libdir}";
+			}
 		}
 		mode_etics_packaging($fmod, \%cmd, "make dist\n\t", "make dist\n\t");
 	}
diff --git a/org.glite.lbjp-common.gsoap-plugin/project/ChangeLog b/org.glite.lbjp-common.gsoap-plugin/project/ChangeLog
index 534780e..9aeb612 100644
--- a/org.glite.lbjp-common.gsoap-plugin/project/ChangeLog
+++ b/org.glite.lbjp-common.gsoap-plugin/project/ChangeLog
@@ -128,3 +128,6 @@
 - Debian package builds in vanilla chroot environment
 - Simplified source tarball and packages distribution
 
+3.2.2-1
+- New parameter to indicate the type of credentials to acquire
+
diff --git a/org.glite.lbjp-common.gsoap-plugin/project/version.properties b/org.glite.lbjp-common.gsoap-plugin/project/version.properties
index ed225d9..4c6d169 100644
--- a/org.glite.lbjp-common.gsoap-plugin/project/version.properties
+++ b/org.glite.lbjp-common.gsoap-plugin/project/version.properties
@@ -1,3 +1,3 @@
 # $Header$
-module.version=3.2.1
+module.version=3.2.2
 module.age=1