Updating version, ChangeLog and copying the most recent configure from ./org.glite...

diff --git a/org.glite.lb.client/configure b/org.glite.lb.client/configure
index a67786b..aace459 100755 (executable)
--- 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 (file)
--- 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 (file)
--- 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