From 40dc8d67929bae4649455bd25b21398a96ad31e2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Mon, 16 Apr 2012 15:47:56 +0000 Subject: [PATCH] Partially harmonize gridsite packaging with EPEL. Remove some runtime dependencies (used only in ETICS). --- org.glite.lb/configure | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/org.glite.lb/configure b/org.glite.lb/configure index a0d8101..41b9788 100755 --- a/org.glite.lb/configure +++ b/org.glite.lb/configure @@ -191,7 +191,7 @@ my %lbmodules = ( 'lbjp-common' => [qw/db log maildir server-bones trio jp-interface gss gsoap-plugin db-devel log-devel maildir-devel server-bones-devel trio-devel jp-interface-devel gss-devel gsoap-plugin-devel/], 'jobid' => [qw/api-c api-c-devel api-cpp api-cpp-devel api-java/], 'jp' => [ qw/client doc index primary server-common ws-interface/ ], - 'gridsite' => [ qw/apache shared commands core devel slashgrid services service-clients gsexec/ ], + 'gridsite' => [ qw/apache libs commands core devel slashgrid services service-clients gsexec/ ], 'px' => [ qw/proxyrenewal myproxy-yaim proxyrenewal-devel proxyrenewal-progs/ ], 'canl' => [ qw/c c-devel/ ], ); @@ -597,7 +597,7 @@ BEGIN{ 'lb.logger' => [ qw/cppunit:B libtool:B globus:B/ ], 'lb.logger-msg' => [ qw/cppunit:B activemq libtool:B globus:B/ ], 'lb.nagios' => [ qw/globus_proxy_utils:R/ ], - 'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql-server:R cppunit:B gsoap:B classads voms:B lcas gridsite bison:B libtool:B libxml2 flex:B/ ], + 'lb.server' => [ qw/globus_essentials:R globus:B expat cares mysql-server:R cppunit:B gsoap:B classads voms:B lcas gridsite:B bison:B libtool:B libxml2 flex:B/ ], 'lb.state-machine' => [ qw/classads libtool:B libxslt:B expat:B globus:B/ ], 'lb.utils' => [ qw/cppunit:B libtool:B globus:B/ ], 'lb.ws-interface' => [ qw/libxslt:B tidy:B/ ], @@ -624,7 +624,7 @@ BEGIN{ 'gridsite.core' => [ qw/httpd-devel:B gsoap:B globus:B curl:B doxygen:B fuse-devel:B libxml2:B openssl:B doxygen:B/ ], 'gridsite.commands' => [ qw/curl:R openssl:R/ ], 'gridsite.apache' => [ qw/libxml2:R openssl:R curl:R/ ], - 'gridsite.shared' => [ qw/libxml2:R openssl:R/ ], + 'gridsite.libs' => [ qw/libxml2:R openssl:R/ ], 'gridsite.devel' => [ qw// ], 'gridsite.slashgrid' => [ qw/curl:R fuse:R/], 'gridsite.services' => [ qw/curl:R gsoap:R/ ], @@ -748,13 +748,13 @@ for my $jar (keys %need_jars) { 'jp.ws-interface' => [ qw// ], 'gridsite.core' => [ 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.commands' => [ qw/gridsite.core:B/ ], + 'gridsite.apache' => [ qw/gridsite.core:B/ ], + 'gridsite.libs' => [ qw/gridsite.core:B / ], + 'gridsite.devel' => [ qw/gridsite.core:B/ ], + 'gridsite.slashgrid' => [ qw/gridsite.core:B/], + 'gridsite.services' => [ qw/gridsite.core:B/ ], + 'gridsite.service-clients' => [ qw/gridsite.core:B/ ], 'gridsite.gsexec' => [ qw/gridsite.core:B/ ], 'px.proxyrenewal' => [ qw// ], @@ -895,7 +895,7 @@ for my $ext (keys %deps_aux) { globus_essentials=>'vdt_globus_essentials', globus=>'globus', globus_proxy_utils=>'vdt_globus_essentials', - gridsite=>'org.gridsite.shared', + gridsite=>'org.gridsite.libs', yaim_core=>'org.glite.yaim.core', gip_release=>'glite-info-provider-release', gip_service=>'glite-info-provider-service', @@ -965,7 +965,7 @@ for my $ext (keys %deps_aux) { globus_essentials=>'globus-gssapi-gsi', globus=>'globus-gssapi-gsi-devel', globus_proxy_utils=>'globus-proxy-utils', - gridsite=>'emi.gridsite.shared', + gridsite=>'emi.gridsite.libs', yaim_core=>'emi.yaim.yaim-core', yaim_bdii=>'emi.bdii.yaim-bdii', gip_service=>'emi.bdii.glite-info-provider-service', -- 1.8.2.3