From 5a875b175ef4e30f520c3204fe40499b78c86a9b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Wed, 30 Mar 2011 08:14:42 +0000 Subject: [PATCH] Updating version, ChangeLog and copying the most recent configure from ./org.glite.lb for v. 1.1.2-3 --- org.glite.lbjp-common.log/configure | 15 ++++++++++----- org.glite.lbjp-common.log/project/ChangeLog | 3 +++ org.glite.lbjp-common.log/project/version.properties | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/org.glite.lbjp-common.log/configure b/org.glite.lbjp-common.log/configure index 136cfc2..24b0fce 100755 --- a/org.glite.lbjp-common.log/configure +++ b/org.glite.lbjp-common.log/configure @@ -120,7 +120,8 @@ my %externs = ( prefix => '/opt/glite' }, lcas => { - prefix => '/opt/glite' + prefix => '/opt/glite', + pkg => 'lcas' }, trustmanager => { prefix => '/opt/glite' @@ -409,11 +410,11 @@ sub mode_build { open MAK,">Makefile" or die "Makefile: $!\n"; - print MAK "all: @modules\n\nclean:\n"; + print MAK "all: @modules\n\nclean check:\n"; for (@modules) { my $full = full($_); - print MAK "\tcd $full/$buildroot{$_} && \${MAKE} clean\n" + print MAK "\tcd $full/$buildroot{$_} && \${MAKE} \$@\n" } print MAK "\ndistclean:\n"; @@ -676,6 +677,8 @@ for my $ext (keys %deps_aux) { 'px.myproxy-config' => [ qq/myproxy-config/ ], # in myproxy-config.spec 'lbjp-common.gss' => [ qq/glite-security-gss/ ], 'lbjp-common.gsoap-plugin' => [ qq/glite-security-gsoap-plugin/ ], + 'lb.glite-LB' => [ qq/glite-LB/ ], + 'px.glite-PX' => [ qq/glite-PX/ ], ); %cvs_prefix = ( @@ -739,7 +742,7 @@ for my $ext (keys %deps_aux) { 'lb.client-java' => [ qw/ant:B jdk:B axis:B trustmanager utiljava libtool:B/ ], 'lb.glite-LB' => [ qw/fetchcrl:R gpt:R gip_release:R gip_service:R bdii:R glite_version:R glite_info_templates:R glue_schema:R/ ], 'lb.yaim' => [ qw/yaim_core:R/ ], - 'px.glite-PX' => [qw/myproxy-server:R myproxy-admin:R fetchcrl:R gip_service:R bdii:R glite_version:R gpt:R glue_schema:R nc:R/], + 'px.glite-PX' => [qw/myproxy-server:R myproxy-admin:R fetchcrl:R gip_service:R bdii:R glite_version:R gpt:R glue_schema:R/], 'px.myproxy-yaim' => [ qw/yaim_core:R/ ], }, }, @@ -796,7 +799,7 @@ for my $ext (keys %deps_aux) { 'lb.client-java' => [ qw/ant:B jdk:B axis:B trustmanager trustmanager_axis libtool:B/ ], 'lb.glite-LB' => [ qw/fetchcrl:R gip_release:R gip_service:R bdii:R glite_version:R glue_schema:R/ ], 'lb.yaim' => [ qw/yaim_core:R yaim_bdii:R/ ], - 'px.glite-PX' => [qw/myproxy-server:R myproxy-admin:R fetchcrl:R gip_service:R bdii:R glite_version:R glue_schema:R nc:R/], + 'px.glite-PX' => [qw/myproxy-server:R myproxy-admin:R fetchcrl:R gip_service:R bdii:R glite_version:R glue_schema:R/], 'px.myproxy-yaim' => [ qw/yaim_core:R yaim_bdii:R/ ], }, }, @@ -806,6 +809,8 @@ for my $ext (keys %deps_aux) { 'gridsite.core' => { sl5_x86_64_gcc412 => { aprSuffix => '1' }, sl5_ia32_gcc412 => { aprSuffix => '1' }, + sl5_x86_64_gcc412EPEL => { aprSuffix => '1' }, + sl5_ia32_gcc412EPEL => { aprSuffix => '1' }, deb5_x86_64_gcc432 => { aprSuffix => '1.0' }, deb5_ia32_gcc432 => { aprSuffix => '1.0' }, slc4_x86_64_gcc346 => { aprSuffix => '0' }, diff --git a/org.glite.lbjp-common.log/project/ChangeLog b/org.glite.lbjp-common.log/project/ChangeLog index d231630..494bab1 100644 --- a/org.glite.lbjp-common.log/project/ChangeLog +++ b/org.glite.lbjp-common.log/project/ChangeLog @@ -50,3 +50,6 @@ 1.1.2-2 - Module rebuilt +1.1.2-3 +- Module rebuilt + diff --git a/org.glite.lbjp-common.log/project/version.properties b/org.glite.lbjp-common.log/project/version.properties index 41326f7..0e3889f 100644 --- a/org.glite.lbjp-common.log/project/version.properties +++ b/org.glite.lbjp-common.log/project/version.properties @@ -1,3 +1,3 @@ # $Header$ module.version=1.1.2 -module.age=2 +module.age=3 -- 1.8.2.3