[CGSI-gSOAP/el5: 4/4] Add missing libraries to linking

[Mattias Ellert]

commit 3466e82eafb2a571fb58556348458cc02bee452e
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Fri Mar 2 17:04:36 2012 +0100

    Add missing libraries to linking

 CGSI-gSOAP-library-linking.patch |   41 ++++++++++++++++++++++++++++++++++++++
 CGSI-gSOAP.spec                  |    7 +++++-
 2 files changed, 47 insertions(+), 1 deletions(-)
---
diff --git a/CGSI-gSOAP-library-linking.patch b/CGSI-gSOAP-library-linking.patch
new file mode 100644
index 0000000..14f24d2
--- /dev/null
+++ b/CGSI-gSOAP-library-linking.patch
@@ -0,0 +1,41 @@
+diff -ur CGSI-gSOAP-1.3.4.2.orig/src/Makefile CGSI-gSOAP-1.3.4.2/src/Makefile
+--- CGSI-gSOAP-1.3.4.2.orig/src/Makefile	2011-06-10 08:35:48.000000000 +0200
++++ CGSI-gSOAP-1.3.4.2/src/Makefile	2012-02-20 19:51:31.690872909 +0100
+@@ -66,7 +66,12 @@
+ 
+ ifneq ($(WITH_EMI), $(EMPTY))
+ GLOBUS_INCLUDE = -I$(GLOBUS_LOCATION)/include/globus -I$(GLOBUS_LOCATION)/$(LIBDIR)/globus/include
+-GLOBUS_LIBS = -L$(GLOBUS_LOCATION)/$(LIBDIR) -lglobus_gssapi_gsi -lglobus_gss_assist
++GLOBUS_LIBS = -L$(GLOBUS_LOCATION)/$(LIBDIR) \
++	-lglobus_gss_assist \
++	-lglobus_gssapi_gsi \
++	-lglobus_gsi_credential \
++	-lglobus_gsi_cert_utils \
++	-lglobus_common -lcrypto
+ 
+ ifneq ($(USE_VOMS), $(EMPTY))
+ LIBFILES +=libcgsi_plugin_voms$(GSOAP_VERSION).a
+@@ -79,11 +79,19 @@
+ else
+ GLOBUS_INCLUDE = -I$(GLOBUS_LOCATION)/include/$(GLOBUS_FLAVOUR)
+-GLOBUS_LIBS = -L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) \
+-	-lglobus_gss_assist_$(GLOBUS_FLAVOUR)
++GLOBUS_LIBS = -L$(GLOBUS_LOCATION)/$(LIBDIR) \
++	-lglobus_gss_assist_$(GLOBUS_FLAVOUR) \
++	-lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR) \
++	-lglobus_gsi_credential_$(GLOBUS_FLAVOUR) \
++	-lglobus_gsi_cert_utils_$(GLOBUS_FLAVOUR) \
++	-lglobus_common_$(GLOBUS_FLAVOUR) -lcrypto
+ 
+ GLOBUS_INCLUDE_PTHR = -I$(GLOBUS_LOCATION)/include/$(GLOBUS_FLAVOUR_PTHR)
+-GLOBUS_LIBS_PTHR = -L$(GLOBUS_LOCATION)/lib -lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR_PTHR) \
+-        -lglobus_gss_assist_$(GLOBUS_FLAVOUR_PTHR)
++GLOBUS_LIBS = -L$(GLOBUS_LOCATION)/$(LIBDIR) \
++	-lglobus_gss_assist_$(GLOBUS_FLAVOUR_PTHR) \
++	-lglobus_gssapi_gsi_$(GLOBUS_FLAVOUR_PTHR) \
++	-lglobus_gsi_credential_$(GLOBUS_FLAVOUR_PTHR) \
++	-lglobus_gsi_cert_utils_$(GLOBUS_FLAVOUR_PTHR) \
++	-lglobus_common_$(GLOBUS_FLAVOUR_PTHR) -lcrypto
+ 
+ ifneq ($(USE_VOMS), $(EMPTY))
+ LIBFILES += libcgsi_plugin_voms$(GSOAP_VERSION)_$(GLOBUS_FLAVOUR).a
diff --git a/CGSI-gSOAP.spec b/CGSI-gSOAP.spec
index 2944ac6..9e16478 100644
--- a/CGSI-gSOAP.spec
+++ b/CGSI-gSOAP.spec
@@ -1,6 +1,6 @@
 Name:		CGSI-gSOAP
 Version:	1.3.4.2
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	GSI plugin for gSOAP
 
 Group:		System Environment/Libraries
@@ -10,6 +10,7 @@ URL:		http://glite.web.cern.ch/glite/
 #		svn co http://svnweb.cern.ch/guest/lcgutil/cgsi-gsoap/tags/cgsi-gsoap_R_1_3_4_2 CGSI-gSOAP-1.3.4.2
 #		tar --exclude .svn -z -c -f CGSI-gSOAP-1.3.4.2.tar.gz CGSI-gSOAP-1.3.4.2
 Source0:	%{name}-%{version}.tar.gz
+Patch0:		%{name}-library-linking.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	globus-gss-assist-devel%{?_isa}
@@ -34,6 +35,7 @@ plugins.
 
 %prep
 %setup -q
+%patch0 -p1
 
 # Fix bad permissions (which otherwise end up in the debuginfo package)
 find . '(' -name '*.h' -o -name '*.c' -o -name '*.cpp' -o -name '*.cc' ')' \
@@ -97,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man*/*
 
 %changelog
+* Fri Mar 02 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.3.4.2-6
+- Add missing libraries to linking
+
 * Fri Feb 10 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 1.3.4.2-5
 - Rebuilt for gsoap 2.8.7 (Fedora 17+)