Debian package builds in vanilla chroot environment (backported from HEAD):

- create pkg-config file for gss (depends on used GSSAPI provider)
- spread proper CFLAGS needed for gss (to find gssapi.h) using pkg-config
- missing build dependencies
- missing dependency for libglite-lbjp-common-gsoap-plugin-dev (lb.ws-test build)
- fix dependency of msg-plugin
- no runtime dependencies for build

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index 7e7032d..02b45f2 100644 (file)
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -98,13 +98,16 @@ COMMON_LIB_THR:=-lglite_lb_common_${thrflavour}
 COMMON_LIB:=-lglite_lb_common
 TRIO_LIB:=-lglite_lbu_trio
 
+GLITE_LBJP_COMMON_GSS_CFLAGS?=`PKG_CONFIG_PATH=$$PKG_CONFIG_PATH:${PREFIX}${prefix}/${libdir}/pkgconfig pkg-config glite-security-gss --cflags`
+
 CFLAGS:=${DEBUG} \
        -I. \
        -I${top_srcdir}/src -I${top_srcdir}/interface \
        -I${stagedir}${prefix}/include \
        ${COVERAGE_FLAGS} \
        -DBUILDING_LB_CLIENT \
-       -D_GNU_SOURCE ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS} ${CFLAGS}
+       -D_GNU_SOURCE ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS} \
+       ${GLITE_LBJP_COMMON_GSS_CFLAGS} ${CFLAGS}
 
 CXXFLAGS:=${CFLAGS}
 

diff --git a/org.glite.lb.client/project/debian.glite-lb-client-progs.dirs b/org.glite.lb.client/project/debian.glite-lb-client-progs.dirs
index bb9ceb6..c752420 100644 (file)
--- a/org.glite.lb.client/project/debian.glite-lb-client-progs.dirs
+++ b/org.glite.lb.client/project/debian.glite-lb-client-progs.dirs
@@ -1,3 +1,3 @@
 usr/bin
-usr/lib/glite-lb/exampes
+usr/lib/glite-lb/examples
 usr/sbin

diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile
index f443a1c..a917b81 100644 (file)
--- a/org.glite.lb.common/Makefile
+++ b/org.glite.lb.common/Makefile
@@ -52,6 +52,7 @@ EXPAT_CFLAGS?=-I${expat_prefix}/include
 EXPAT_LIBS?=${expatlib} -lexpat
 CLASSADS_CFLAGS?=-I${classads_prefix}/include -I${classads_prefix}/include/classad
 CLASSADS_LIBS?=${classadslib} -lclassad
+GLITE_LBJP_COMMON_GSS_CFLAGS?=`PKG_CONFIG_PATH=$$PKG_CONFIG_PATH:${PREFIX}${prefix}/${libdir}/pkgconfig pkg-config glite-security-gss --cflags`
 
 CFLAGS:=${DEBUG} -I${top_srcdir}/src -I${top_srcdir}/interface \
        -I. \
@@ -62,7 +63,7 @@ CFLAGS:=${DEBUG} -I${top_srcdir}/src -I${top_srcdir}/interface \
        ${COVERAGE_FLAGS} \
        -D_GNU_SOURCE \
        -DDATAGRID_EXTENSION ${LB_STANDALONE_FLAGS} \
-       -DBUILDING_LB_COMMON ${CFLAGS}
+       -DBUILDING_LB_COMMON ${GLITE_LBJP_COMMON_GSS_CFLAGS} ${CFLAGS}
 
 LDFLAGS:=${LDFLAGS} -L${stagedir}${prefix}/${libdir} \
        ${COVERAGE_FLAGS}

diff --git a/org.glite.lb.doc/project/debian.control b/org.glite.lb.doc/project/debian.control
index 37b2b8e..c17d238 100644 (file)
--- a/org.glite.lb.doc/project/debian.control
+++ b/org.glite.lb.doc/project/debian.control
@@ -2,7 +2,7 @@ Source: glite-lb-doc
 Priority: extra
 Maintainer: @MAINTAINER@
 Uploaders: @UPLOADERS@
-Build-Depends: debhelper (>= 7.0.50~), texlive-latex-extra
+Build-Depends: debhelper (>= 7.0.50~), texlive-latex-extra, texlive-latex-recommended, texlive-fonts-recommended, glite-lb-types
 Standards-Version: 3.9.1
 Section: doc
 Homepage: @URL@

diff --git a/org.glite.lb.emi-lb/project/debian.control b/org.glite.lb.emi-lb/project/debian.control
index b5d29ca..55f5a12 100644 (file)
--- a/org.glite.lb.emi-lb/project/debian.control
+++ b/org.glite.lb.emi-lb/project/debian.control
@@ -13,6 +13,6 @@ Package: emi-lb
 Section: net
 Architecture: any
 Depends: ${misc:Depends}, bdii, emi-version, fetch-crl, glite-lb-client-progs, glite-lb-doc, glite-lb-harvester, glite-lb-logger, glite-lb-logger-msg, glite-lb-server, glite-lb-utils, glite-lb-ws-test, glue-schema
-Recommends: glite-info-provider-service glite-lb-client-java glite-lb-yaim
+Recommends: glite-info-provider-service, glite-lb-client-java, glite-lb-yaim
 Description: @SUMMARY@
 @DEBIAN_DESCRIPTION@

diff --git a/org.glite.lb.harvester/Makefile b/org.glite.lb.harvester/Makefile
index a97cf79..eaae150 100644 (file)
--- a/org.glite.lb.harvester/Makefile
+++ b/org.glite.lb.harvester/Makefile
@@ -15,7 +15,8 @@ version:=${module.version}
 CC=gcc
 VPATH=${top_srcdir}/src:${top_srcdir}/doc
 
-CPPFLAGS:=-I${stagedir}${prefix}/include -D_GNU_SOURCE -D_REENTRANT ${CPPFLAGS}
+GLITE_LBJP_COMMON_GSS_CFLAGS?=`PKG_CONFIG_PATH=$$PKG_CONFIG_PATH:${PREFIX}${prefix}/${libdir}/pkgconfig pkg-config glite-security-gss --cflags`
+CPPFLAGS:=-I${stagedir}${prefix}/include -D_GNU_SOURCE -D_REENTRANT ${GLITE_LBJP_COMMON_GSS_CFLAGS} ${CPPFLAGS}
 CFLAGS:=-W -Wall -g -O2 ${CFLAGS}
 LDFLAGS:=${LDFLAGS} 
 ifeq (${thrflavour},)

diff --git a/org.glite.lb.logger-msg/Makefile b/org.glite.lb.logger-msg/Makefile
index 20460aa..df0a7b6 100644 (file)
--- a/org.glite.lb.logger-msg/Makefile
+++ b/org.glite.lb.logger-msg/Makefile
@@ -29,13 +29,16 @@ ACTIVEMQ_LIBS?=-L${activemq_prefix}/${libdir} -lactivemq-cpp
 CPPUNIT_LIBS?=-L${cppunit_prefix}/${libdir} -lcppunit
 CPPUNIT_CFLAGS?=-I${cppunit_prefix}/include
 
+GLITE_LBJP_COMMON_GSS_CFLAGS?=`PKG_CONFIG_PATH=$$PKG_CONFIG_PATH:${PREFIX}${prefix}/${libdir}/pkgconfig pkg-config glite-security-gss --cflags`
+
 DEBUG:=-g -O0
-CFLAGS:=${CFLAGS} ${DEBUG} \
+CFLAGS:=${DEBUG} \
        -I${stagedir}${prefix}/include -I${top_srcdir}/src \
        ${ACTIVEMQ_CFLAGS} \
        -D_GNU_SOURCE \
        ${COVERAGE_FLAGS} \
-       ${VERSION} ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS} 
+       ${VERSION} ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS} \
+       ${GLITE_LBJP_COMMON_GSS_CFLAGS} ${CFLAGS}
 
 LDFLAGS:=${LDFLAGS} -L${stagedir}${prefix}/${libdir} \
        ${COVERAGE_FLAGS} 

diff --git a/org.glite.lb.logger-msg/project/debian.control b/org.glite.lb.logger-msg/project/debian.control
index 89ffd14..a91e34a 100644 (file)
--- a/org.glite.lb.logger-msg/project/debian.control
+++ b/org.glite.lb.logger-msg/project/debian.control
@@ -2,7 +2,7 @@ Source: glite-lb-logger-msg
 Priority: extra
 Maintainer: @MAINTAINER@
 Uploaders: @UPLOADERS@
-Build-Depends: debhelper (>= 7.0.50~), activemq-cpp-dev, chrpath, glite-lb-logger-dev, libcppunit-dev, libglite-lbjp-common-log-dev, libglite-lbjp-common-trio-dev, libtool, pkg-config
+Build-Depends: debhelper (>= 7.0.50~), activemq-cpp-dev, chrpath, glite-lb-logger-dev, libcppunit-dev, libglite-lbjp-common-log-dev, libglite-lbjp-common-trio-dev, libnet-ldap-perl, libtool, pkg-config
 Standards-Version: 3.9.1
 Section: misc
 Homepage: @URL@
@@ -12,7 +12,7 @@ DM-Upload-Allowed: yes
 Package: glite-lb-logger-msg
 Section: misc
 Architecture: any
-Depends: glite-lb-logger, ${shlibs:Depends}, ${misc:Depends}
+Depends: glite-lb-logger, libnet-ldap-perl, ${shlibs:Depends}, ${misc:Depends}
 Description: @SUMMARY@
 @DEBIAN_DESCRIPTION@
 

diff --git a/org.glite.lb.logger-msg/project/glite-lb-logger-msg.spec b/org.glite.lb.logger-msg/project/glite-lb-logger-msg.spec
index e097fa7..5263537 100644 (file)
--- a/org.glite.lb.logger-msg/project/glite-lb-logger-msg.spec
+++ b/org.glite.lb.logger-msg/project/glite-lb-logger-msg.spec
@@ -17,6 +17,7 @@ BuildRequires: glite-lbjp-common-log-devel%{?_isa}
 BuildRequires: glite-lbjp-common-trio-devel%{?_isa}
 BuildRequires: libtool
 BuildRequires: pkgconfig
+Requires: perl-LDAP
 Requires: glite-lb-logger
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 AutoReqProv: yes

diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile
index 3380ee4..55685fb 100644 (file)
--- a/org.glite.lb.logger/Makefile
+++ b/org.glite.lb.logger/Makefile
@@ -53,13 +53,15 @@ DL_LIBS=
 ifeq (${os},Linux)
        DL_LIBS=-ldl
 endif
+GLITE_LBJP_COMMON_GSS_CFLAGS?=`PKG_CONFIG_PATH=$$PKG_CONFIG_PATH:${PREFIX}${prefix}/${libdir}/pkgconfig pkg-config glite-security-gss --cflags`
 
 DEBUG:=-g -O0
-CFLAGS:=${CFLAGS} ${DEBUG} \
+CFLAGS:=${DEBUG} \
        -I${stagedir}${prefix}/include -I${top_srcdir}/src -I${top_srcdir}/interface \
        -D_GNU_SOURCE \
        ${COVERAGE_FLAGS} \
-       ${VERSION} ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS} 
+       ${VERSION} ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS} \
+       ${GLITE_LBJP_COMMON_GSS_CFLAGS} ${CFLAGS}
 
 LDFLAGS:=${LDFLAGS} -L${stagedir}${prefix}/${libdir} \
        ${COVERAGE_FLAGS} 

diff --git a/org.glite.lb.logger/project/debian.control b/org.glite.lb.logger/project/debian.control
index b57b1db..ffb575d 100644 (file)
--- a/org.glite.lb.logger/project/debian.control
+++ b/org.glite.lb.logger/project/debian.control
@@ -2,7 +2,7 @@ Source: glite-lb-logger
 Priority: extra
 Maintainer: @MAINTAINER@
 Uploaders: @UPLOADERS@
-Build-Depends: debhelper (>= 7.0.50~), chrpath, libcppunit-dev, libglite-jobid-api-c-dev, libglite-lbjp-common-gss-dev, libglite-lbjp-common-log-dev, libglite-lbjp-common-trio-dev, libtool, pkg-config
+Build-Depends: debhelper (>= 7.0.50~), chrpath, libcppunit-dev, libglite-lb-common-dev, libglite-jobid-api-c-dev, libglite-lbjp-common-gss-dev, libglite-lbjp-common-log-dev, libglite-lbjp-common-trio-dev, libtool, pkg-config
 Standards-Version: 3.9.1
 Section: misc
 Homepage: @URL@

diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile
index 98fde12..99515b4 100644 (file)
--- a/org.glite.lb.server/Makefile
+++ b/org.glite.lb.server/Makefile
@@ -118,7 +118,9 @@ CPPUNIT_CFLAGS?=-I${cppunit_prefix}/include
 VOMS_CFLAGS?=-I${voms_prefix}/include -I${voms_prefix}/include/glite/security
 VOMS_LIBS?=-L${voms_prefix}/${libdir} -lvomsapi${vomsflavour}
 
-CFLAGS:= ${CFLAGS} \
+GLITE_LBJP_COMMON_CFLAGS?=`PKG_CONFIG_PATH=$$PKG_CONFIG_PATH:${PREFIX}${prefix}/${libdir}/pkgconfig pkg-config glite-security-gss glite-security-gsoap-plugin --cflags`
+
+CFLAGS:= \
        ${GLOBUS_GSSAPI_GSI_CFLAGS} \
        ${WS_CFLAGS} ${DEBUG} \
        -DVERSION=\"${version}\" \
@@ -131,7 +133,8 @@ CFLAGS:= ${CFLAGS} \
        ${VOMS_CFLAGS} \
        ${COVERAGE_FLAGS} \
        $(GRIDSITE_CFLAGS) ${LCAS_CFLAGS} ${GSOAP_CFLAGS} \
-       -D_GNU_SOURCE ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS} -DLB_EVENTS_BLOB
+       -D_GNU_SOURCE ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS} -DLB_EVENTS_BLOB \
+       ${GLITE_LBJP_COMMON_CFLAGS} ${CFLAGS}
 
 CXXFLAGS:=${CFLAGS}
 

diff --git a/org.glite.lb.server/project/debian.control b/org.glite.lb.server/project/debian.control
index 9901cdd..733afc7 100644 (file)
--- a/org.glite.lb.server/project/debian.control
+++ b/org.glite.lb.server/project/debian.control
@@ -2,7 +2,7 @@ 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, libclassad0-dev | libclassad-dev, libcppunit-dev, 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-dev, pkg-config, voms-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 0089b6d..b87391f 100644 (file)
--- a/org.glite.lb.server/project/glite-lb-server.spec
+++ b/org.glite.lb.server/project/glite-lb-server.spec
@@ -22,20 +22,15 @@ BuildRequires: glite-lbjp-common-server-bones-devel
 BuildRequires: glite-lbjp-common-trio-devel
 BuildRequires: gridsite-devel
 BuildRequires: gsoap-devel
-BuildRequires: libxml2
 BuildRequires: c-ares-devel
 BuildRequires: cppunit-devel
-BuildRequires: gridsite-shared
 BuildRequires: flex
 BuildRequires: voms-devel
 BuildRequires: classads-devel
 BuildRequires: libtool
 BuildRequires: lcas-devel
-BuildRequires: c-ares
-BuildRequires: classads
 BuildRequires: libxml2-devel
 BuildRequires: expat-devel
-BuildRequires: voms
 BuildRequires: bison
 BuildRequires: chrpath
 BuildRequires: pkgconfig

diff --git a/org.glite.lb.state-machine/Makefile b/org.glite.lb.state-machine/Makefile
index 811937a..6fd30e7 100644 (file)
--- a/org.glite.lb.state-machine/Makefile
+++ b/org.glite.lb.state-machine/Makefile
@@ -32,6 +32,7 @@ CLASSADS_CFLAGS?=-I${classads_prefix}/include -I${classads_prefix}/include/class
 CLASSADS_LIBS?=${classadslib} -lclassad
 EXPAT_CFLAGS?=
 EXPAT_LIBS?=${expatlib} -lexpat
+GLITE_LBJP_COMMON_GSS_CFLAGS?=`PKG_CONFIG_PATH=$$PKG_CONFIG_PATH:${PREFIX}${prefix}/${libdir}/pkgconfig pkg-config glite-security-gss --cflags`
 
 DEBUG:=-g -O0 -Wall
 
@@ -39,7 +40,7 @@ CFLAGS:= \
        ${DEBUG} \
        ${CLASSADS_CFLAGS} \
        -I${stagedir}${prefix}/include -I${top_srcdir}/src -I. \
-       -I${top_srcdir}/interface ${CFLAGS}
+       -I${top_srcdir}/interface ${GLITE_LBJP_COMMON_GSS_CFLAGS} ${CFLAGS}
 
 COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
 LINK:=libtool --mode=link ${CC} -rpath ${stagedir}${prefix}/${libdir}  ${LDFLAGS} 

diff --git a/org.glite.lb.utils/Makefile b/org.glite.lb.utils/Makefile
index 8b57cd1..16e76e4 100644 (file)
--- a/org.glite.lb.utils/Makefile
+++ b/org.glite.lb.utils/Makefile
@@ -25,15 +25,17 @@ SUFFIXES = .T
 DEBUG:=-g -O0 -Wall
 
 GSOAP_CFLAGS?=-I${gsoap_prefix}/include -I${gsoap_prefix}/
+GLITE_LBJP_COMMON_GSS_CFLAGS?=`PKG_CONFIG_PATH=$$PKG_CONFIG_PATH:${PREFIX}${prefix}/${libdir}/pkgconfig pkg-config glite-security-gss --cflags`
 
-CFLAGS:= ${CFLAGS} \
+CFLAGS:= \
        ${WS_CFLAGS} ${DEBUG} \
        -DVERSION=\"${version}\" \
        -I${stagedir}${prefix}/include -I${top_srcdir}/src -I. \
        -I${top_srcdir}/interface \
        ${GSOAP_CFLAGS} \
        ${COVERAGE_FLAGS} \
-       -D_GNU_SOURCE
+       -D_GNU_SOURCE ${GLITE_LBJP_COMMON_GSS_CFLAGS} ${CFLAGS}
+
 LDFLAGS:=${LDFLAGS} -L${stagedir}${prefix}/${libdir}
 
 COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
@@ -125,6 +127,7 @@ install:
 
 clean:
        rm -rfv ${ALLUTILS} ${MAN_GZ} ${MAN8_GZ} *.lo *.o .libs/
+       rm -rvf dist ${package}-*.tar.gz
 
 distclean:
        rm -rvf Makefile.inc *.spec debian/

diff --git a/org.glite.lb.utils/project/debian.control b/org.glite.lb.utils/project/debian.control
index 9c6b622..ea32ae2 100644 (file)
--- a/org.glite.lb.utils/project/debian.control
+++ b/org.glite.lb.utils/project/debian.control
@@ -2,7 +2,7 @@ Source: glite-lb-utils
 Priority: extra
 Maintainer: @MAINTAINER@
 Uploaders: @UPLOADERS@
-Build-Depends: debhelper (>= 7.0.50~), chrpath, glite-lb-types, libcppunit-dev, libglite-jobid-api-c-dev, libglite-lb-client-dev, libglite-lb-state-machine-dev, libglite-lbjp-common-jp-interface-dev, libglite-lbjp-common-maildir-dev, libglite-lbjp-common-trio-dev, pkg-config
+Build-Depends: debhelper (>= 7.0.50~), chrpath, glite-lb-types, libcppunit-dev, libglite-jobid-api-c-dev, libglite-lb-client-dev, libglite-lb-state-machine-dev, libglite-lbjp-common-jp-interface-dev, libglite-lbjp-common-maildir-dev, libglite-lbjp-common-trio-dev, libtool, pkg-config
 Standards-Version: 3.9.1
 Section: misc
 Homepage: @URL@

diff --git a/org.glite.lb.ws-test/Makefile b/org.glite.lb.ws-test/Makefile
index e78995d..a87a9ce 100644 (file)
--- a/org.glite.lb.ws-test/Makefile
+++ b/org.glite.lb.ws-test/Makefile
@@ -33,12 +33,15 @@ endif
 
 VPATH=${top_srcdir}/examples:${top_srcdir}/tests
 CC=gcc
+
+GLITE_LBJP_COMMON_CFLAGS?=`PKG_CONFIG_PATH=$$PKG_CONFIG_PATH:${PREFIX}${prefix}/${libdir}/pkgconfig pkg-config glite-security-gsoap-plugin --cflags`
+
 DEBUG:=-g -O0 -Wall
 CFLAGS:=${CFLAGS} -I${gsoap_prefix}/include -I${gsoap_prefix}/ \
        -I${stagedir}${prefix}/include -I${top_srcdir}/src -I. \
        ${GLOBUS_GSSAPI_GSI_CFLAGS} \
        ${GSOAP_CFLAGS} \
-       ${DEBUG}
+       ${DEBUG} ${GLITE_LBJP_COMMON_CFLAGS} ${CFLAGS}
 
 COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
 LINK:=libtool --mode=link ${CC} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS}

diff --git a/org.glite.lb.yaim/project/debian.control b/org.glite.lb.yaim/project/debian.control
index e7ae2a4..7c9c9be 100644 (file)
--- a/org.glite.lb.yaim/project/debian.control
+++ b/org.glite.lb.yaim/project/debian.control
@@ -12,6 +12,6 @@ DM-Upload-Allowed: yes
 Package: glite-lb-yaim
 Section: admin
 Architecture: all
-Depends: ${misc:Depends}, glite-yaim-bdii, libnet-ldap-perl, glite-yaim-core
+Depends: ${misc:Depends}, glite-yaim-bdii, glite-yaim-core
 Description: @SUMMARY@
 @DEBIAN_DESCRIPTION@

diff --git a/org.glite.lb.yaim/project/glite-lb-yaim.spec b/org.glite.lb.yaim/project/glite-lb-yaim.spec
index 05188b4..b375511 100644 (file)
--- a/org.glite.lb.yaim/project/glite-lb-yaim.spec
+++ b/org.glite.lb.yaim/project/glite-lb-yaim.spec
@@ -8,7 +8,6 @@ Vendor: EMI
 Group: Development/Tools
 BuildArch: noarch
 Requires: glite-yaim-bdii
-Requires: perl-LDAP
 Requires: glite-yaim-core
 Obsoletes: glite-yaim-lb <= 4.2.1-1
 Provides: glite-yaim-lb = %{version}-%{release}

diff --git a/org.glite.lbjp-common.gsoap-plugin/Makefile b/org.glite.lbjp-common.gsoap-plugin/Makefile
index 4b8a036..bd021dc 100644 (file)
--- a/org.glite.lbjp-common.gsoap-plugin/Makefile
+++ b/org.glite.lbjp-common.gsoap-plugin/Makefile
@@ -92,13 +92,15 @@ GSOAP_CFLAGS_lang:=${GSOAPXX_CFLAGS}
 GSOAP_LIBS_lang:=${GSOAPXX_LIBS}
 endif
 
+GLITE_LBJP_COMMON_GSS_CFLAGS?=`PKG_CONFIG_PATH=$$PKG_CONFIG_PATH:${PREFIX}${prefix}/${libdir}/pkgconfig pkg-config glite-security-gss --cflags`
 
 CFLAGS:= ${DEBUG} \
        -DVERSION=\"${version}\" \
        -DWITH_NONAMESPACES \
        -I. -I${top_srcdir2}/interface \
        -I${stagedir}${prefix}/include \
-       ${COVERAGE_FLAGS} -D_GNU_SOURCE -DDATAGRID_EXTENSION ${CFLAGS}
+       ${COVERAGE_FLAGS} -D_GNU_SOURCE -DDATAGRID_EXTENSION \
+       ${GLITE_LBJP_COMMON_GSS_CFLAGS} ${CFLAGS}
 
 LDFLAGS:=${LDFLAGS} ${COVERAGE_FLAGS}
 
@@ -372,7 +374,7 @@ distclean:
        ${COMPILE} ${GSOAP_DEFAULT_CFLAGS} -o $@ -c $<
 
 %.pc: %.pc.in
-       sed -e "s/@VERSION@/${version}/" -e "s/@LIBDIR@/${libdir}/" -e "s/@LIB_SUFFIX@/${dotless_ver}/" $< > $@; \
+       sed -e "s,@PREFIX@,${PREFIX}${prefix}," -e "s/@VERSION@/${version}/" -e "s/@LIBDIR@/${libdir}/" -e "s/@LIB_SUFFIX@/${dotless_ver}/" $< > $@
 
 test_gsplugin_cxx.o: %.o: %.cpp stdsoap2.h
        ${COMPILEXX} ${GSOAPXX_DEFAULT_CFLAGS} -c ${GLOBUS_INC} $<

diff --git a/org.glite.lbjp-common.gsoap-plugin/project/debian.control b/org.glite.lbjp-common.gsoap-plugin/project/debian.control
index 0cedbc4..f3a48ef 100644 (file)
--- a/org.glite.lbjp-common.gsoap-plugin/project/debian.control
+++ b/org.glite.lbjp-common.gsoap-plugin/project/debian.control
@@ -20,7 +20,7 @@ Package: libglite-lbjp-common-gsoap-plugin-dev
 Section: libdevel
 Architecture: any
 Provides: glite-lbjp-common-gsoap-plugin, glite-security-gsoap-plugin
-Depends: libglite-lbjp-common-gsoap-plugin (= ${binary:Version}), ${misc:Depends}
+Depends: libglite-lbjp-common-gsoap-plugin (= ${binary:Version}), libglite-lbjp-common-gss-dev, ${misc:Depends}
 Description: Development files for gLite gsoap-plugin
  This package contains development libraries and header files for gLite
  gsoap-plugin.

diff --git a/org.glite.lbjp-common.gsoap-plugin/project/gsoap-plugin++.pc.in b/org.glite.lbjp-common.gsoap-plugin/project/gsoap-plugin++.pc.in
index 3abce84..7303f01 100644 (file)
--- a/org.glite.lbjp-common.gsoap-plugin/project/gsoap-plugin++.pc.in
+++ b/org.glite.lbjp-common.gsoap-plugin/project/gsoap-plugin++.pc.in
@@ -1,4 +1,4 @@
-prefix=/usr
+prefix=@PREFIX@
 exec_prefix=${prefix}
 libdir=/usr/@LIBDIR@
 includedir=${prefix}/include
@@ -6,6 +6,6 @@ includedir=${prefix}/include
 Name: gLite security gSoap plugin
 Description: Plugin for gSoap to use glite-security-gss as the communication layer
 Version: @VERSION@
-Requires: gsoap++
+Requires: gsoap++ glite-security-gss
 Libs: -L${libdir} -lglite_security_gsoap_plugin_@LIB_SUFFIX@_cxx -lglite_security_gss
 Cflags: -I${includedir}

diff --git a/org.glite.lbjp-common.gsoap-plugin/project/gsoap-plugin.pc.in b/org.glite.lbjp-common.gsoap-plugin/project/gsoap-plugin.pc.in
index fd8dac5..64bdf26 100644 (file)
--- a/org.glite.lbjp-common.gsoap-plugin/project/gsoap-plugin.pc.in
+++ b/org.glite.lbjp-common.gsoap-plugin/project/gsoap-plugin.pc.in
@@ -1,4 +1,4 @@
-prefix=/usr
+prefix=@PREFIX@
 exec_prefix=${prefix}
 libdir=/usr/@LIBDIR@
 includedir=${prefix}/include
@@ -6,6 +6,6 @@ includedir=${prefix}/include
 Name: gLite security gSoap plugin
 Description: Plugin for gSoap to use glite-security-gss as the communication layer
 Version: @VERSION@
-Requires: gsoap
+Requires: gsoap glite-security-gss
 Libs: -L${libdir} -lglite_security_gsoap_plugin_@LIB_SUFFIX@_c -lglite_security_gss
 Cflags: -I${includedir}

diff --git a/org.glite.lbjp-common.gss/Makefile b/org.glite.lbjp-common.gss/Makefile
index 320c18e..7fe14a4 100644 (file)
--- a/org.glite.lbjp-common.gss/Makefile
+++ b/org.glite.lbjp-common.gss/Makefile
@@ -34,7 +34,7 @@ offset=6
 version_info:=-version-info ${shell \
        perl -e '$$,=":"; @F=split "\\.","${version}"; print $$F[0]+$$F[1]+${offset},$$F[2],$$F[1]' }
 
-VPATH=${top_srcdir}/src:${top_srcdir}/test:${top_srcdir}/examples
+VPATH=${top_srcdir}/src:${top_srcdir}/test:${top_srcdir}/examples:${top_srcdir}/project
 
 default: all
 
@@ -82,11 +82,13 @@ GSSAPI_THR_LIBS=${GLOBUS_COMMON_LIBS} ${KERBEROS_GSSAPI_LIBS} -lssl
 GSSAPI_THR_INC=${GLOBUS_COMMON_CFLAGS} ${KERBEROS_GSSAPI_CFLAGS}
 GSSAPI_NOTHR_LIBS=${GLOBUS_NOTHR_LIBS} ${KERBEROS_GSSAPI_LIBS} -lssl
 GSSAPI_NOTHR_INC=${GLOBUS_NOTHR_INC} ${KERBEROS_GSSAPI_CFLAGS}
+GSSAPI_PROVIDER_PKG=
 else
 GSSAPI_THR_LIBS=${GLOBUS_GSSAPI_GSI_LIBS}
 GSSAPI_THR_INC=${GLOBUS_GSSAPI_GSI_CFLAGS}
 GSSAPI_NOTHR_LIBS=${GLOBUS_NOTHR_LIBS} ${GLOBUS_GSSAPI_NOTHR_LIBS}
 GSSAPI_NOTHR_INC=${GLOBUS_NOTHR_INC}
+GSSAPI_PROVIDER_PKG=globus-gssapi-gsi
 endif
 
 LIBCARES_CFLAGS?=-I${cares_prefix}/include
@@ -116,6 +118,7 @@ lib_LIBRARIES=${GSS_NOTHRSTATICLIB} ${GSS_THRSTATICLIB}
 default_gss=${GSS_NOTHRLTLIB}
 endif
 
+PKG_CONFIG_FILES=gss.pc
 
 ifeq ($(thrflavour),)
 ${GSS_STATICLIB}: ${GSS_THROBJS}
@@ -141,7 +144,7 @@ ${GSS_THRLTLIB}: ${GSS_THROBJS}
 endif
 
 
-all compile: $(lib_LTLIBRARIES) ${lib_LIBRARIES} examples
+all compile: $(lib_LTLIBRARIES) ${lib_LIBRARIES} examples ${PKG_CONFIG_FILES}
 
 check: compile check.gss
 
@@ -171,7 +174,7 @@ stage:
        $(MAKE) install PREFIX=${stagedir} DOSTAGE=yes
 
 install:
-       -mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir}
+       -mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir}/pkgconfig
        -mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
        -mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/glite/security
        ${INSTALL} -m 755 ${lib_LTLIBRARIES} ${DESTDIR}${PREFIX}${prefix}/${libdir}
@@ -180,9 +183,10 @@ install:
        if [ x${DOSTAGE} = xyes ]; then \
                install -m 644 ${lib_LIBRARIES} ${DESTDIR}${PREFIX}${prefix}/${libdir}; \
        fi
+       ${INSTALL} -m 644 gss.pc ${DESTDIR}${PREFIX}${prefix}/${libdir}/pkgconfig/glite-security-gss.pc
 
 clean:
-       rm -rf *.o *.lo *.a *.la .libs test_gss gss_server gss_client
+       rm -rf *.o *.lo *.a *.la .libs test_gss gss_server gss_client *.pc
 
 distclean:
        rm -rvf Makefile.inc *.spec debian/
@@ -193,5 +197,8 @@ distclean:
 %.thr.o: %.c
        ${COMPILE} -D_REENTRANT -DGLITE_LBU_THREADED ${GSSAPI_THR_INC} ${LIBCARES_CFLAGS} -o $@ -c $<
 
+%.pc: %.pc.in
+       sed -e "s,@PREFIX@,${PREFIX}${prefix}," -e "s/@VERSION@/${version}/" -e "s/@LIBDIR@/${libdir}/" -e "s/@GSSAPI_PROVIDER@/${GSSAPI_PROVIDER_PKG}/" $< > $@
+
 test_gss.o: %.o: %.cpp
        ${CXX} -c ${CFLAGS} ${GLOBUS_GSSAPI_GSI_CFLAGS} ${CPPUNIT_CFLAGS} -Wno-error $<

diff --git a/org.glite.lbjp-common.gss/project/debian.libglite-lbjp-common-gss-dev.install b/org.glite.lbjp-common.gss/project/debian.libglite-lbjp-common-gss-dev.install
index 6cb0e0b..07e8c8a 100644 (file)
--- a/org.glite.lbjp-common.gss/project/debian.libglite-lbjp-common-gss-dev.install
+++ b/org.glite.lbjp-common.gss/project/debian.libglite-lbjp-common-gss-dev.install
@@ -1,2 +1,3 @@
 usr/include/glite/security/*.h
 usr/lib/lib*.so
+usr/lib/pkgconfig/*.pc

diff --git a/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec b/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec
index 0b90250..c98852e 100644 (file)
--- a/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec
+++ b/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec
@@ -82,6 +82,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/include/glite/security
 /usr/include/glite/security/glite_gss.h
 /usr/%{_lib}/libglite_security_gss.so
+/usr/%{_lib}/pkgconfig/*.pc
 
 
 %changelog

diff --git a/org.glite.lbjp-common.gss/project/gss.pc.in b/org.glite.lbjp-common.gss/project/gss.pc.in
new file mode 100644 (file)
index 0000000..274af39
--- /dev/null
+++ b/org.glite.lbjp-common.gss/project/gss.pc.in
@@ -0,0 +1,11 @@
+prefix=@PREFIX@
+exec_prefix=${prefix}
+libdir=/usr/@LIBDIR@
+includedir=${prefix}/include
+
+Name: gLite security wrapper of Globus GSS/SSL implementation
+Description: glite-security-gss wraps GSS functions to a secure network communication library
+Version: @VERSION@
+Requires: @GSSAPI_PROVIDER@
+Libs: -L${libdir} -lglite_security_gss
+Cflags: -I${includedir}