From 68d1536ca460cfba8117687770d11c59c774cab7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zden=C4=9Bk=20=C5=A0ustr?= Date: Thu, 14 Apr 2011 07:20:23 +0000 Subject: [PATCH] Updating version, ChangeLog and copying the most recent configure from ./org.glite.lb for v. 1.3.18-1 --- org.glite.px.proxyrenewal/configure | 96 +++++++++++++++------- org.glite.px.proxyrenewal/project/ChangeLog | 3 + .../project/version.properties | 4 +- 3 files changed, 71 insertions(+), 32 deletions(-) diff --git a/org.glite.px.proxyrenewal/configure b/org.glite.px.proxyrenewal/configure index 96cd3e0..7e949ab 100755 --- a/org.glite.px.proxyrenewal/configure +++ b/org.glite.px.proxyrenewal/configure @@ -181,13 +181,18 @@ my %deps_type; my %buildroot; my (%etics_externs, %etics_projects); +# +# modules of the subsystems +# +# additional modules from $project{modules} are automatically added +# my %lbmodules = ( - 'lb' => [ qw/client client-java common doc logger server state-machine types utils ws-interface ws-test harvester yaim glite-LB logger-msg/], + 'lb' => [ qw/client client-java common doc logger server state-machine types utils ws-interface ws-test harvester yaim logger-msg/], 'lbjp-common' => [qw/db log maildir server-bones trio jp-interface gss gsoap-plugin/], 'jobid' => [qw/api-c api-cpp api-java/], 'jp' => [ qw/client doc index primary server-common ws-interface/ ], 'gridsite' => [ qw/apache shared commands core devel slashgrid services service-clients gsexec/ ], - 'px' => [ qw/proxyrenewal glite-PX myproxy-yaim/ ], + 'px' => [ qw/proxyrenewal myproxy-yaim/ ], ); @@ -232,7 +237,6 @@ my @keeparg = @ARGV; GetOptions @opts or die "Errors parsing command line\n"; $prefix=~s/\/$//; -$stagedir=~s/\/$// if ($stagedir); $root=~s/\/$//; $sysroot=~s/\/$//; if (not $sysconfdir) { $sysconfdir = $prefix eq '/usr' ? '/etc' : "$prefix/etc"; } @@ -263,6 +267,9 @@ for my $ext (keys %need_externs_aux) { $need_externs_type{$ext}->{$pkg} = $type; } } +for $_ (keys %{$project{modules}}) { + push @{$lbmodules{$_}},@{$project{modules}{$_}}; +} if ($help) { usage(); exit 0; } @@ -302,6 +309,7 @@ if (!$en && !$dis) { for (@nodes) { $enable_nodes{$_} = 1 if ($default_nodes{$_} for (keys %enable_nodes) { delete $enable_nodes{$_} unless $enable_nodes{$_}; } $stagedir = $root unless $stagedir; +$stagedir=~s/\/$// if ($stagedir); if ($mode eq 'build') { for my $ext (keys %externs) { if (defined $externs{$ext} and defined $externs{$ext}{withprefix}) { $externs{$ext}{prefix} = $externs{$ext}{withprefix}; } @@ -515,10 +523,10 @@ 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/ ], - 'lb.state-machine' => [ qw/classads 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 flex:B/ ], + 'lb.state-machine' => [ qw/classads libtool:B libxslt:B expat:B/ ], 'lb.utils' => [ qw/cppunit:B libtool:B/ ], - 'lb.ws-interface' => [], + 'lb.ws-interface' => [ qw/libxslt:B/ ], 'lb.ws-test' => [ qw/gsoap:B libtool:B/ ], 'lb.types' => [ qw// ], 'lb.harvester' => [ qw/docbook-utils:B libtool:B/ ], @@ -530,8 +538,8 @@ BEGIN{ 'lbjp-common.jp-interface' => [ qw/cppunit:B log4c:B libtool:B/ ], 'lbjp-common.gss' => [ qw/globus_essentials:R globus:B cares cppunit:B libtool:B/ ], 'lbjp-common.gsoap-plugin' => [ qw/cppunit:B globus_essentials:R globus:B cares:B gsoap gsoapxx libtool:B/ ], - 'jobid.api-c' => [ qw/cppunit:B libtool:B/ ], - 'jobid.api-cpp' => [ qw/cppunit:B/ ], + 'jobid.api-c' => [ qw/cppunit:B libtool:B openssl:B/ ], + 'jobid.api-cpp' => [ qw/cppunit:B libtool:B/ ], 'jobid.api-java' => [ qw/ant:B jdk:B/ ], 'jp.client' => [ qw/gsoap libtar globus_essentials:R globus:B/ ], 'jp.doc' => [], @@ -543,7 +551,7 @@ BEGIN{ 'gridsite.commands' => [ qw/curl:R openssl:R/ ], 'gridsite.apache' => [ qw/libxml2:R openssl:R curl:R/ ], 'gridsite.shared' => [ qw/libxml2:R openssl:R/ ], - 'gridsite.devel' => [], + 'gridsite.devel' => [ qw// ], 'gridsite.slashgrid' => [ qw/curl:R fuse-libs:R fuse:R/], 'gridsite.services' => [ qw/curl:R gsoap:R/ ], 'gridsite.service-clients' => [ qw/curl:R gsoap:R gsoapxx:R/ ], @@ -601,7 +609,7 @@ for my $jar (keys %need_jars) { lbjp-common.jp-interface jobid.api-c lbjp-common.trio lbjp-common.maildir - lb.client lb.state-machine + lb.client lb.state-machine lb.types:B / ], 'lb.ws-test' => [ qw/lbjp-common.gsoap-plugin lb.ws-interface/ ], 'lb.ws-interface' => [ qw/lb.types:B/ ], @@ -616,6 +624,11 @@ for my $jar (keys %need_jars) { lb.ws-test:R lb.harvester:R lb.yaim:R lb.client-java:R lb.logger-msg:R / ], + 'lb.emi-lb' => [ qw/ + lb.logger:R lb.server:R lb.utils:R lb.doc:R + lb.ws-test:R lb.harvester:R lb.yaim:R lb.client-java:R + lb.logger-msg:R + / ], 'lbjp-common.db' => [ qw/lbjp-common.trio lbjp-common.log/ ], 'lbjp-common.maildir' => [ qw// ], 'lbjp-common.log' => [ qw// ], @@ -654,17 +667,18 @@ for my $jar (keys %need_jars) { 'jp.ws-interface' => [ qw// ], 'gridsite.core' => [ qw// ], - 'gridsite.commands' => [ qw/gridsite.shared:R/ ], - 'gridsite.apache' => [ qw/gridsite.shared:R/ ], - 'gridsite.shared' => [ qw// ], - 'gridsite.devel' => [ qw/gridsite.shared:R/ ], - 'gridsite.slashgrid' => [ qw/gridsite.shared:R/], - 'gridsite.services' => [ qw/gridsite.shared:R/ ], - 'gridsite.service-clients' => [ qw/gridsite.shared:R/ ], - 'gridsite.gsexec' => [ qw// ], + 'gridsite.commands' => [ qw/gridsite.core:B gridsite.shared:R/ ], + 'gridsite.apache' => [ qw/gridsite.core:B gridsite.shared:R/ ], + 'gridsite.shared' => [ qw/gridsite.core:B / ], + 'gridsite.devel' => [ qw/gridsite.core:B gridsite.shared:R/ ], + 'gridsite.slashgrid' => [ qw/gridsite.core:B gridsite.shared:R/], + 'gridsite.services' => [ qw/gridsite.core:B gridsite.shared:R/ ], + 'gridsite.service-clients' => [ qw/gridsite.core:B gridsite.shared:R/ ], + 'gridsite.gsexec' => [ qw/gridsite.core:B/ ], 'px.proxyrenewal' => [ qw// ], 'px.glite-PX' => [qw/px.myproxy-yaim:R/], + 'px.emi-px' => [qw/px.myproxy-yaim:R/], 'px.myproxy-yaim' => [ qw// ], 'px.myproxy-config' => [], ); @@ -699,8 +713,13 @@ 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/ ], +); + +%conflicts = ( + 'lb.glite-LB' => [ qq/emi-lb/ ], + 'px.glite-PX' => [ qq/emi-px/ ], + 'lb.emi-lb' => [ qq/glite-LB/ ], + 'px.emi-px' => [ qq/glite-PX/ ], ); %cvs_prefix = ( @@ -732,6 +751,7 @@ for my $ext (keys %deps_aux) { # etics_externs_devel .. ETICS modules names of devel versions of externals # need_externs_aux ..... project-specific external dependencies # supported_platforms .. platforms supported by the project +# modules .............. additional modules in subsystems %projects = ( glite => { etics_name => 'org.glite', @@ -766,10 +786,14 @@ for my $ext (keys %deps_aux) { need_externs_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/ ], + 'lb.yaim' => [ qw/yaim_core:R perl-LDAP: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/ ], }, + modules => { + 'lb' => [ qw/glite-LB/ ], + 'px' => [ qw/glite-PX/ ], + } }, emi => { @@ -793,7 +817,7 @@ for my $ext (keys %deps_aux) { yaim_bdii=>'emi.bdii.yaim-bdii', gip_release=>'emi.bdii.glite-info-provider-release', gip_service=>'emi.bdii.glite-info-provider-service', - bdii=>'emi.bdii.bdii-core', + bdii=>'emi.bdii.core', glite_version=>'emi.misc.glite-version', glue_schema=>'emi.bdii.glue-schema', trustmanager=>'emi.java-security.trustmanager', @@ -802,6 +826,7 @@ for my $ext (keys %deps_aux) { lcas=>'emi.sac.lcas', gsoapxx=>'-', build_common_cpp=>'emi.misc.glite.build-common-cpp', + jdk=>'java', }, etics_externs_devel => { cares => 'c-ares-devel', @@ -817,6 +842,7 @@ for my $ext (keys %deps_aux) { libxml2 => 'libxml2-devel', openssl => 'openssl-devel', gridsite=>'emi.gridsite.devel', + jdk=>'java-devel', }, etics_projects => { 'emi'=>[qw/voms voms-devel gridsite lcas gip_release gip_service bdii glite_version glue_schema yaim_core yaim_bdii trustmanager trustmanager_axis/], @@ -824,7 +850,7 @@ for my $ext (keys %deps_aux) { need_externs_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/ ], + 'lb.yaim' => [ qw/yaim_core:R yaim_bdii:R perl-LDAP: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/ ], }, @@ -832,6 +858,10 @@ for my $ext (keys %deps_aux) { sl5_x86_64_gcc412EPEL => 1, sl5_ia32_gcc412EPEL => 1, }, + modules => { + 'lb' => [ qw/emi-lb/ ], + 'px' => [ qw/emi-px/ ], + } }, ); @@ -1086,8 +1116,9 @@ sub mode_etics { @cmd{qw/configure compile test install packaging clean/} = ('None') x 6; $cmd{clean} = 'make clean'; $cmd{checkout} = "cvs -d \${vcsroot} co -d \${moduleName} ".($conftag eq 'HEAD' ? '-A' : '-r ${tag}')." $cvs_prefix{$subsys}.$subsys.$module 2>/dev/null"; - #$cmd{checkout} = "(test -d \${moduleName}/.git && (cd \${moduleName}; git pull) || git clone http://scientific.zcu.cz/git/jra1mw.git \${moduleName})"; - #$cmd{checkout} .= " && (cd \${moduleName}; git checkout ${tag})" unless ($conftag =~ /HEAD/); + #$cmd{checkout} = "(test -d jra1mw/.git && (cd jra1mw; git pull) || git clone http://scientific.zcu.cz/git/jra1mw.git)"; + #$cmd{checkout} .= " && (cd jra1mw; git checkout \${tag})" unless ($conftag =~ /HEAD/); + #$cmd{checkout} .= " && ln -s jra1mw/$cvs_prefix{$subsys}.$subsys.$module \${moduleName}"; $cmd{tag} = "cvs -d \${vcsroot} tag -R \${tag} ${moduleName}"; if ($subsys eq 'gridsite') { @@ -1107,7 +1138,9 @@ sub mode_etics { $cmd{compile} = "echo 'make $flags' > build.sh\n\tmake $flags build"; $cmd{clean} = "rm -rvf build.sh; $cmd{clean}"; $cmd{install} = "make $prefix $flags install"; - $cmd{packaging} = "make $prefix $flags rpm"; + $cmd{packaging} = "mkdir ${moduleDir}/src/tgz + make $prefix $flags rpm && \ + cp ${moduleDir}/RPMTMP/SOURCES/gridsite-${version}.src.tar.gz ${moduleDir}/src/tgz"; } else { $cmd{clean} = 'None'; @@ -1173,8 +1206,8 @@ checkstyle = None [Platform-default:Property] $buildroot aprSuffix = 0 -package.RPMSLocation = \${moduleDir}/$cvs_prefix{$subsys}.$subsys.$module/RPMTMP/RPMS -package.SRPMSLocation = \${moduleDir}/$cvs_prefix{$subsys}.$subsys.$module/RPMTMP/SRPMS +package.RPMSLocation = \${moduleDir}/RPMTMP/RPMS +package.SRPMSLocation = \${moduleDir}/RPMTMP/SRPMS package.preserve.libtool = false $package_description$package_summary$defprops}; @@ -1182,6 +1215,9 @@ $package_description$package_summary$defprops}; print C "package.obsoletes = $_\n"; print C "package.replaces = $_\n"; } + for (@{$conflicts{"$subsys.$module"}}) { + print C "package.conflicts = $_\n"; + } for my $pp (keys %{$platform_properties{"$subsys.$module"}}) { next if $pp eq 'default'; @@ -1192,8 +1228,8 @@ $package_description$package_summary$defprops}; for my $p (keys %{$platform_properties{"$subsys.$module"}->{$pp}}) { print C $p . ' = ' . $platform_properties{"$subsys.$module"}->{$pp}->{$p} . "\n"; } - print C "package.RPMSLocation = \${moduleDir}/$cvs_prefix{$subsys}.$subsys.$module/RPMTMP/RPMS -package.SRPMSLocation = \${moduleDir}/$cvs_prefix{$subsys}.$subsys.$module/RPMTMP/SRPMS\n"; + print C "package.RPMSLocation = \${moduleDir}/RPMTMP/RPMS +package.SRPMSLocation = \${moduleDir}/RPMTMP/SRPMS\n"; print C "$package_description$package_summary\n"; } diff --git a/org.glite.px.proxyrenewal/project/ChangeLog b/org.glite.px.proxyrenewal/project/ChangeLog index 77a8125..3bbcc22 100644 --- a/org.glite.px.proxyrenewal/project/ChangeLog +++ b/org.glite.px.proxyrenewal/project/ChangeLog @@ -31,3 +31,6 @@ 1.3.17-2 - Module rebuilt +1.3.18-1 +- New man pages. + diff --git a/org.glite.px.proxyrenewal/project/version.properties b/org.glite.px.proxyrenewal/project/version.properties index 1902922..92d0f4e 100644 --- a/org.glite.px.proxyrenewal/project/version.properties +++ b/org.glite.px.proxyrenewal/project/version.properties @@ -1,2 +1,2 @@ -module.version=1.3.17 -module.age=2 +module.version=1.3.18 +module.age=1 -- 1.8.2.3