From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Sat, 19 Jan 2013 07:32:51 +0000 (+0000)
Subject: Updating version, ChangeLog and copying the most recent configure from ./org.glite... 
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=0ba11beb02c2f9dbbdfc486c1df75f93193baeb4;p=jra1mw.git

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

diff --git a/org.glite.lbjp-common.gsoap-plugin/configure b/org.glite.lbjp-common.gsoap-plugin/configure
index a024047..b6b28e5 100755
--- a/org.glite.lbjp-common.gsoap-plugin/configure
+++ b/org.glite.lbjp-common.gsoap-plugin/configure
@@ -2003,12 +2003,12 @@ $output};
 	close C;
 
 	for $file ("$cvs_module/project/debian.rules", "$cvs_module/project/$packageName.spec") {
-		my $lib;
+		my ($lib, $pkg_prefix);
 		my $main_module;
 		@copts = ();
 
-		if ($file =~ /debian\.rules$/) { $lib = 'lib'; }
-		else { $lib = '%{_lib}'; }
+		if ($file =~ /debian\.rules$/) { $lib = 'lib'; $pkg_prefix = "$project{local_prefix}"; }
+		else { $lib = '%{_lib}'; $pkg_prefix = '%{_prefix}'; }
 
 		my $main_module = "$subsys.$module";
 		if (exists $subpackages{$main_module}) { $main_module = $subpackages{$main_module}; }
@@ -2027,7 +2027,7 @@ $output};
 			while (<SRC>) {
 				if (/^(\s*).+\/configure\s/) {
 					printf DST "%s", "$1";
-					printf DST "/usr/bin/perl $confdir/configure $project{flavours} --root=/ --prefix=$project{local_prefix} --libdir=$lib --project=$project --module $main_module@copts\n";
+					printf DST "/usr/bin/perl $confdir/configure $project{flavours} --root=/ --prefix=$pkg_prefix --libdir=$lib --project=$project --module $main_module@copts\n";
 				} else {
 					printf DST "%s", "$_";
 				}
diff --git a/org.glite.lbjp-common.gsoap-plugin/project/ChangeLog b/org.glite.lbjp-common.gsoap-plugin/project/ChangeLog
index 0a4893e..f5f765c 100644
--- a/org.glite.lbjp-common.gsoap-plugin/project/ChangeLog
+++ b/org.glite.lbjp-common.gsoap-plugin/project/ChangeLog
@@ -150,3 +150,6 @@
 3.2.5-1
 - Library sonames tracked in rpm
 
+3.2.6-1
+- Changes based on Fedora reviews
+
diff --git a/org.glite.lbjp-common.gsoap-plugin/project/version.properties b/org.glite.lbjp-common.gsoap-plugin/project/version.properties
index d2a952b..d87553f 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.5
+module.version=3.2.6
 module.age=1