[voms/el5] Fix build of compat package with new globus headers

[Mattias Ellert]

commit 983da70e18bab0575d1b095220f053172865f00f
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Mon Apr 23 20:49:56 2012 +0200

    Fix build of compat package with new globus headers

 voms-globus-compat.patch |   12 ++++++++++++
 voms.spec                |    8 +++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/voms-globus-compat.patch b/voms-globus-compat.patch
new file mode 100644
index 0000000..310e232
--- /dev/null
+++ b/voms-globus-compat.patch
@@ -0,0 +1,12 @@
+diff -ur voms-1.9.19.2.orig/src/include/gssapi_compat.h voms-1.9.19.2/src/include/gssapi_compat.h
+--- voms-1.9.19.2.orig/src/include/gssapi_compat.h	2010-03-30 14:55:21.000000000 +0200
++++ voms-1.9.19.2/src/include/gssapi_compat.h	2011-03-07 11:27:19.611712430 +0100
+@@ -72,7 +72,7 @@
+     globus_gsi_cred_handle_t            cred_handle;
+ } gss2_cred_id_desc;
+ 
+-#if !defined(GLOBUS_INCLUDE_GLOBUS_THREAD)
++#if !defined(GLOBUS_INCLUDE_GLOBUS_THREAD) && !defined(GLOBUS_INCLUDE_GLOBUS_THREAD_H)
+ typedef int globus_mutex_t;
+ #endif
+ 
diff --git a/voms.spec b/voms.spec
index 781261d..2a46449 100644
--- a/voms.spec
+++ b/voms.spec
@@ -8,7 +8,7 @@
 %global release1 6
 
 %global version2 2.0.7
-%global release2 1
+%global release2 2
 
 Name:		voms
 Version:	%{version2}
@@ -83,6 +83,8 @@ Patch15:	%{name}-expat.patch
 #		Add missing dependencies for stricter binutils
 #		https://savannah.cern.ch/bugs/?60979
 Patch16:	%{name}-deps.patch
+#		Changed multiple inclusion guard name
+Patch17:	%{name}-globus-compat.patch
 #		Fix the database install script
 Patch20:	%{name}-install-db2.patch
 #		Resolve race condition in Makefile documentation rules
@@ -224,6 +226,7 @@ pushd %{name}-%{version1}
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 # Fix bad permissions (which otherwise end up in the debuginfo package)
 find . '(' -name '*.h' -o -name '*.c' -o -name '*.cpp' -o \
@@ -453,6 +456,9 @@ fi
 %doc README.Fedora
 
 %changelog
+* Mon Apr 23 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.7-2
+- Fix build of compat package with new globus headers
+
 * Mon Apr 23 2012 Mattias Ellert <mattias.ellert at fysast.uu.se> - 2.0.7-1
 - Update to version 2.0.7
 - No longer build the Java API - it is in a separate package now