[myproxy] - myproxy-vomsc-vomsapi.patch to build against vomsapi rather than vomscapi.

[stevetraylen]

commit 12deb5405867b39ecdb80b17544d77057aa9ffd5
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Tue Feb 22 22:19:08 2011 +0100

    - myproxy-vomsc-vomsapi.patch to build against vomsapi rather
      than vomscapi.

 myproxy-vomsc-vomsapi.patch |   12 ++++++++++++
 myproxy.spec                |   14 +++++++++++++-
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/myproxy-vomsc-vomsapi.patch b/myproxy-vomsc-vomsapi.patch
new file mode 100644
index 0000000..73782eb
--- /dev/null
+++ b/myproxy-vomsc-vomsapi.patch
@@ -0,0 +1,12 @@
+diff -uNr myproxy-5.3.ORIG/configure.in myproxy-5.3/configure.in
+--- myproxy-5.3.ORIG/configure.in	2011-02-22 21:42:54.465453091 +0100
++++ myproxy-5.3/configure.in	2011-02-22 21:44:53.741877911 +0100
+@@ -227,7 +227,7 @@
+ 		   LDFLAGS="-L${withval}/lib -L${withval}/lib64 $LDFLAGS"
+ 		   AC_CHECK_HEADER(voms_apic.h)
+ 		   AC_CHECK_HEADER(newformat.h)
+-           AC_SEARCH_LIBS(VOMS_Init, vomsc vomsc_$GLOBUS_FLAVOR_NAME, ,
++           AC_SEARCH_LIBS(VOMS_Init, vomsapi vomsc vomsc_$GLOBUS_FLAVOR_NAME, ,
+ 			     AC_MSG_ERROR([VOMS_Init not found in libvomsc]) )
+            AC_DEFINE(HAVE_VOMS)
+ 		fi
diff --git a/myproxy.spec b/myproxy.spec
index 3ae87ee..ccccbbe 100644
--- a/myproxy.spec
+++ b/myproxy.spec
@@ -8,7 +8,7 @@
 
 Name:           myproxy
 Version:        5.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Manage X.509 Public Key Infrastructure (PKI) security credentials
 
 Group:          System Environment/Daemons
@@ -20,6 +20,12 @@ Source1:        myproxy.init
 Source2:        myproxy.sysconfig
 Source3:        README.Fedora
 
+#VOMS has two alternate APIs which are the "same". vomsapi is the
+#newer though not that new. myproxy is the last software in
+#EPEL using the old vomsc.
+#Patch to go upstream myproxy though they are aware.
+Patch0:         myproxy-vomsc-vomsapi.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  globus-gss-assist-devel > 3
@@ -161,10 +167,12 @@ Package %{name}-doc contains the MyProxy documentation.
 
 %prep
 %setup -q
+%patch0 -p1
 cp -p %{SOURCE1} .
 cp -p %{SOURCE2} .
 cp -p %{SOURCE3} .
 
+
 %build
 rm -f doxygen/Doxyfile*
 rm -f doxygen/Makefile.am
@@ -398,6 +406,10 @@ fi
 %{_libdir}/pkgconfig/myproxy.pc
 
 %changelog
+* Tue Feb 22 2011 Steve Traylen <steve.traylen at cern.ch> - 5.3-3
+- myproxy-vomsc-vomsapi.patch to build against vomsapi rather
+  than vomscapi.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild