From 95f1d1a66c5aeb75d45c52346154476575b00c69 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Fri, 8 Jun 2012 13:11:58 +0000 Subject: [PATCH] Packaging with kerberos provider. --- org.glite.lbjp-common.gss/project/debian.rules | 3 +++ .../project/glite-lbjp-common-gss.spec | 22 +++++++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/org.glite.lbjp-common.gss/project/debian.rules b/org.glite.lbjp-common.gss/project/debian.rules index 9b0f5ec..2b70e0b 100644 --- a/org.glite.lbjp-common.gss/project/debian.rules +++ b/org.glite.lbjp-common.gss/project/debian.rules @@ -10,6 +10,9 @@ configure: configure-stamp configure-stamp: dh_testdir /usr/bin/perl ./configure --thrflavour= --nothrflavour= --root=/ --prefix=/usr --libdir=lib --project=emi --module lbjp-common.gss + # krb: echo "gssapi_provider=kerberos" >> Makefile.inc + # krb: echo "GLOBUS_COMMON_CFLAGS=`pkg-config --cflags globus-common`" >> Makefile.inc + # krb: echo "GLOBUS_COMMON_LIBS=`pkg-config --libs globus-common`" >> Makefile.inc touch $@ build: build-arch build-indep 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..451e51b 100644 --- a/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec +++ b/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec @@ -1,3 +1,5 @@ +#krb: %global gssapi_provider_kerberos 1 + Summary: @SUMMARY@ Name: glite-lbjp-common-gss Version: @MAJOR@.@MINOR@.@REVISION@ @@ -10,7 +12,12 @@ BuildRequires: c-ares-devel BuildRequires: c-ares BuildRequires: chrpath BuildRequires: cppunit-devel +%if %gssapi_provider_kerberos +BuildRequires: globus-common-devel +BuildRequires: krb5-devel +%else BuildRequires: globus-gssapi-gsi-devel +%endif BuildRequires: libtool BuildRequires: pkgconfig BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -27,7 +34,13 @@ Source: http://eticssoft.web.cern.ch/eticssoft/repository/emi/emi.lbjp-common.gs Summary: Development files for gLite GSS library Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: globus-gssapi-gsi-devel, pkgconfig +%if %gssapi_provider_kerberos +Requires: globus-common-devel +Requires: krb5-devel +%else +Requires: globus-gssapi-gsi-devel +%endif +Requires: pkgconfig Provides: glite-security-gss%{?_isa} = %{version}-%{release} Obsoletes: glite-security-gss%{?_isa} < 2.1.5-1 @@ -43,6 +56,13 @@ library. %build /usr/bin/perl ./configure --thrflavour= --nothrflavour= --root=/ --prefix=/usr --libdir=%{_lib} --project=emi --module lbjp-common.gss +if [ "%gssapi_provider_kerberos" == "1" ]; then + echo Kerberos + echo "gssapi_provider=kerberos" >> Makefile.inc + echo "GLOBUS_COMMON_CFLAGS=`pkg-config --cflags globus-common`" >> Makefile.inc + echo "GLOBUS_COMMON_LIBS=`pkg-config --libs globus-common`" >> Makefile.inc +fi + make -- 1.8.2.3