From 2bbae45d8515db76816385813feb377203b9c33b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Sat, 19 Jan 2013 08:49:28 +0000 Subject: [PATCH] Updating version, ChangeLog and copying the most recent configure from ./org.glite.lb for v. 2.0.1-1 --- org.glite.lb.client-java/configure | 8 ++++---- org.glite.lb.client-java/project/ChangeLog | 3 +++ org.glite.lb.client-java/project/version.properties | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/org.glite.lb.client-java/configure b/org.glite.lb.client-java/configure index a024047..b6b28e5 100755 --- a/org.glite.lb.client-java/configure +++ b/org.glite.lb.client-java/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 () { 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.lb.client-java/project/ChangeLog b/org.glite.lb.client-java/project/ChangeLog index 30ac09a..dd60d8a 100644 --- a/org.glite.lb.client-java/project/ChangeLog +++ b/org.glite.lb.client-java/project/ChangeLog @@ -113,3 +113,6 @@ 2.0.0-2 - Module rebuilt +2.0.1-1 +- Changes based on Fedora reviews + diff --git a/org.glite.lb.client-java/project/version.properties b/org.glite.lb.client-java/project/version.properties index 4429364..edb024a 100644 --- a/org.glite.lb.client-java/project/version.properties +++ b/org.glite.lb.client-java/project/version.properties @@ -1,3 +1,3 @@ # $Header$ -module.version=2.0.0 -module.age=2 +module.version=2.0.1 +module.age=1 -- 1.8.2.3