From 5a5455a9cd929af192fb5a7f361ea96e89ff6cf0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Sun, 24 Jun 2012 22:57:46 +0000 Subject: [PATCH] Avoid explicit dependencies on globus GSSAPI (it fixes the package build when building with Heimdal Kerberos, or avoid unnecessary linkage of globus GSSAPI when building with MIT Kerberos). --- org.glite.lb.server/project/debian.control | 8 +++++++- org.glite.lb.server/project/glite-lb-server.spec | 6 ++++++ org.glite.lbjp-common.gsoap-plugin/project/debian.control | 8 +++++++- .../project/glite-lbjp-common-gsoap-plugin.spec | 7 ++++++- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/org.glite.lb.server/project/debian.control b/org.glite.lb.server/project/debian.control index 9901cdd..56412af 100644 --- a/org.glite.lb.server/project/debian.control +++ b/org.glite.lb.server/project/debian.control @@ -2,7 +2,13 @@ Source: glite-lb-server Priority: extra Maintainer: @MAINTAINER@ Uploaders: @UPLOADERS@ -Build-Depends: debhelper (>= 7.0.50~), bison, chrpath, flex, glite-lb-types, glite-lb-ws-interface, gsoap, libc-ares-dev, libc-ares2, libclassad0-dev | libclassad-dev, libcppunit-dev, libexpat1, libexpat1-dev, libglobus-gssapi-gsi-dev, libglite-jobid-api-c-dev, libglite-lb-common-dev, libglite-lb-state-machine-dev, libglite-lbjp-common-db-dev, libglite-lbjp-common-gss-dev, libglite-lbjp-common-gsoap-plugin-dev, libglite-lbjp-common-log-dev, libglite-lbjp-common-maildir-dev, libglite-lbjp-common-server-bones-dev, libglite-lbjp-common-trio-dev, libgridsite-dev, liblcas-dev, libtool, libxml2, libxml2-dev, pkg-config, voms-dev +Build-Depends: debhelper (>= 7.0.50~), bison, chrpath, flex, glite-lb-types, glite-lb-ws-interface, gsoap, libc-ares-dev, libc-ares2, libclassad0-dev | libclassad-dev, libcppunit-dev, libexpat1, libexpat1-dev, libglite-jobid-api-c-dev, libglite-lb-common-dev, libglite-lb-state-machine-dev, libglite-lbjp-common-db-dev, libglite-lbjp-common-gss-dev, libglite-lbjp-common-gsoap-plugin-dev, libglite-lbjp-common-log-dev, libglite-lbjp-common-maildir-dev, libglite-lbjp-common-server-bones-dev, libglite-lbjp-common-trio-dev, libgridsite-dev, liblcas-dev, libtool, libxml2, libxml2-dev, pkg-config, voms-dev +# gssapi is needed explicitly for glite-lb-server, but the proper package is +# known only in libglite-lbjp-common-gss-dev: +# - gssapi from Globus (libglobus-gssapi-gsi-dev) +# - gssapi from MIT Kerberos (libkrb5-dev) +# - gssapi from Heimdal Kerberos (heimdal-dev) +#Build-Depends: libglobus-gssapi-gsi-dev Standards-Version: 3.9.1 Section: misc Homepage: @URL@ diff --git a/org.glite.lb.server/project/glite-lb-server.spec b/org.glite.lb.server/project/glite-lb-server.spec index 981865e..2f899c0 100644 --- a/org.glite.lb.server/project/glite-lb-server.spec +++ b/org.glite.lb.server/project/glite-lb-server.spec @@ -7,6 +7,12 @@ License: ASL 2.0 Vendor: EMI Group: System Environment/Daemons BuildRequires: expat +# gssapi is needed explicitly for glite-lb-server, but the proper package is +# known only in glite-lbjp-common-gss-devel: +# - gssapi from Globus (globus-gssapi-gsi-devel) +# - gssapi from MIT Kerberos (krb5-devel) +# - gssapi from Heimdal Kerberos +#BuildRequires: globus-gssapi-gsi-devel BuildRequires: globus-gssapi-gsi-devel BuildRequires: glite-jobid-api-c-devel BuildRequires: glite-lb-common-devel diff --git a/org.glite.lbjp-common.gsoap-plugin/project/debian.control b/org.glite.lbjp-common.gsoap-plugin/project/debian.control index 0cedbc4..03395c8 100644 --- a/org.glite.lbjp-common.gsoap-plugin/project/debian.control +++ b/org.glite.lbjp-common.gsoap-plugin/project/debian.control @@ -2,7 +2,13 @@ Source: glite-lbjp-common-gsoap-plugin Priority: extra Maintainer: @MAINTAINER@ Uploaders: @UPLOADERS@ -Build-Depends: debhelper (>= 7.0.50~), chrpath, libc-ares-dev, libcppunit-dev, libglite-lbjp-common-gss-dev, libglobus-gssapi-gsi-dev, gsoap, libtool, pkg-config +Build-Depends: debhelper (>= 7.0.50~), chrpath, libc-ares-dev, libcppunit-dev, libglite-lbjp-common-gss-dev, gsoap, libtool, pkg-config +# gssapi is needed explicitly for gsoap-plugin, but the proper package is +# known only in libglite-lbjp-common-gss-dev: +# - gssapi from Globus (libglobus-gssapi-gsi-dev) +# - gssapi from MIT Kerberos (libkrb5-dev) +# - gssapi from Heimdal Kerberos (heimdal-dev) +#Build-Depends: libglobus-gssapi-gsi-dev Standards-Version: 3.9.1 Section: libs Homepage: @URL@ diff --git a/org.glite.lbjp-common.gsoap-plugin/project/glite-lbjp-common-gsoap-plugin.spec b/org.glite.lbjp-common.gsoap-plugin/project/glite-lbjp-common-gsoap-plugin.spec index 237e4b8..9642126 100644 --- a/org.glite.lbjp-common.gsoap-plugin/project/glite-lbjp-common-gsoap-plugin.spec +++ b/org.glite.lbjp-common.gsoap-plugin/project/glite-lbjp-common-gsoap-plugin.spec @@ -9,7 +9,12 @@ Group: System Environment/Libraries BuildRequires: c-ares-devel BuildRequires: cppunit-devel BuildRequires: chrpath -BuildRequires: globus-gssapi-gsi-devel +# gssapi is needed explicitly for gsoap-plugin, but the proper package is +# known only in glite-lbjp-common-gss-devel: +# - gssapi from Globus (globus-gssapi-gsi-devel) +# - gssapi from MIT Kerberos (krb5-devel) +# - gssapi from Heimdal Kerberos +#BuildRequires: globus-gssapi-gsi-devel BuildRequires: gsoap BuildRequires: gsoap-devel BuildRequires: glite-lbjp-common-gss-devel -- 1.8.2.3