From 547150cb2d72cef6b47e114ecb1c5075690d978e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Sun, 17 Apr 2011 20:48:13 +0000 Subject: [PATCH] Updating version, ChangeLog and copying the most recent configure from ./org.glite.lb for v. 5.0.6-1 --- org.glite.lb.client/configure | 8 ++++++-- org.glite.lb.client/project/ChangeLog | 2 ++ org.glite.lb.client/project/version.properties | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/org.glite.lb.client/configure b/org.glite.lb.client/configure index a67786b..aace459 100755 --- a/org.glite.lb.client/configure +++ b/org.glite.lb.client/configure @@ -423,7 +423,9 @@ sub mode_build { open MAK,">Makefile" or die "Makefile: $!\n"; - print MAK "all: @modules\n\nclean check:\n"; + print MAK "all: @modules\n\n"; + print MAK "stage: ".(join '-stage ', @modules)."-stage\n\n"; + print MAK "clean check install:\n"; for (@modules) { my $full = full($_); @@ -446,11 +448,13 @@ sub mode_build { @ldeps{@{$deps{$_}}} = 1; for my $x (split /,/,$staged) { delete $ldeps{$x}; } my @dnames = $module ? () : keys %ldeps; + my $snames = $#dnames == -1 ? '' : join('-stage ', @dnames).'-stage'; my $full = full($_); my $build = $buildroot{$_}; print MAK "$_: @dnames\n\tcd $full/$build && \${MAKE} && \${MAKE} install\n\n"; + print MAK "$_-stage: $snames\n\tcd $full/$build && \${MAKE} && \${MAKE} stage\n\n"; } close MAK; @@ -523,7 +527,7 @@ BEGIN{ 'lb.doc' => [ qw/tetex-latex:B/ ], 'lb.logger' => [ qw/cppunit:B libtool:B/ ], 'lb.logger-msg' => [ qw/cppunit:B activemq libtool:B/ ], - 'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql:R mysql-server:R mysql-devel:B cppunit:B gsoap:B classads voms lcas gridsite bison:B libtool:B libxml2/ ], + 'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql:R mysql-server:R mysql-devel:B cppunit:B gsoap:B classads voms lcas gridsite bison:B libtool:B libxml2 flex:B/ ], 'lb.state-machine' => [ qw/classads libtool:B libxslt:B expat:B/ ], 'lb.utils' => [ qw/cppunit:B libtool:B/ ], 'lb.ws-interface' => [ qw/libxslt:B/ ], diff --git a/org.glite.lb.client/project/ChangeLog b/org.glite.lb.client/project/ChangeLog index 622fc6d..3546e97 100644 --- a/org.glite.lb.client/project/ChangeLog +++ b/org.glite.lb.client/project/ChangeLog @@ -174,3 +174,5 @@ 5.0.5-2 - Module rebuilt +5.0.6-1 +- Using rpath only as $prefix/$libdir (fixes rpmlint rpath check in mock environment) diff --git a/org.glite.lb.client/project/version.properties b/org.glite.lb.client/project/version.properties index 4d04565..c7cfe5d 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.0.5 -module.age=2 +module.version=5.0.6 +module.age=1 -- 1.8.2.3