From 019b79ccf8063320f05b8cb8d66f81d5fafa22f9 Mon Sep 17 00:00:00 2001 From: Matthias Saou Date: Feb 08 2012 18:41:36 +0000 Subject: Include patch to fix check for no longer existing objc/objc-api.h file --- diff --git a/auth-ldap-2.0.3-objc-include.patch b/auth-ldap-2.0.3-objc-include.patch new file mode 100644 index 0000000..6b504c9 --- /dev/null +++ b/auth-ldap-2.0.3-objc-include.patch @@ -0,0 +1,42 @@ +diff -Naupr auth-ldap-2.0.3.orig/aclocal.m4 auth-ldap-2.0.3/aclocal.m4 +--- auth-ldap-2.0.3.orig/aclocal.m4 2006-09-12 22:44:13.000000000 +0200 ++++ auth-ldap-2.0.3/aclocal.m4 2012-02-08 19:35:42.314356627 +0100 +@@ -129,7 +129,7 @@ AC_DEFUN([OD_OBJC_RUNTIME],[ + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([ + #include +- #include ++ #include + ], [ + id class = objc_lookUpClass("Object"); + id obj = @<:@class alloc@:>@; +@@ -156,7 +156,7 @@ AC_DEFUN([OD_OBJC_RUNTIME],[ + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([ + #include +- #include ++ #include + ], [ + id class = objc_lookup_class("Object"); + id obj = @<:@class alloc@:>@; +diff -Naupr auth-ldap-2.0.3.orig/configure auth-ldap-2.0.3/configure +--- auth-ldap-2.0.3.orig/configure 2007-03-22 21:32:56.000000000 +0100 ++++ auth-ldap-2.0.3/configure 2012-02-08 19:35:57.338231240 +0100 +@@ -6367,7 +6367,7 @@ cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + #include +- #include ++ #include + + int + main () +@@ -6459,7 +6459,7 @@ cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + + #include +- #include ++ #include + + int + main () diff --git a/openvpn-auth-ldap.spec b/openvpn-auth-ldap.spec index 390dd2c..c0fa7af 100644 --- a/openvpn-auth-ldap.spec +++ b/openvpn-auth-ldap.spec @@ -10,6 +10,7 @@ Source1: openvpn-plugin.h Patch0: auth-ldap-2.0.3-top_builddir.patch Patch1: auth-ldap-2.0.3-README.patch Patch2: auth-ldap-2.0.3-tools-CFLAGS.patch +Patch3: auth-ldap-2.0.3-objc-include.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root # This is a plugin not linked against a lib, so hardcode the requirement # since we require the parent configuration and plugin directories @@ -30,6 +31,7 @@ LDAP for OpenVPN 2.x. %patch0 -p1 -b .top_builddir %patch1 -p1 -b .README %patch2 -p1 -b .tools-CFLAGS +%patch3 -p1 -b .objc-include # Fix plugin from the instructions in the included README sed -i 's|^plugin .*| plugin %{_libdir}/openvpn/plugin/lib/openvpn-auth-ldap.so "/etc/openvpn/auth/ldap.conf"|g' README # Install the one required OpenVPN plugin header @@ -69,6 +71,9 @@ rm -rf %{buildroot} %changelog +* Wed Feb 8 2012 Matthias Saou 2.0.3-10 +- Include patch to fix check for no longer existing objc/objc-api.h file. + * Fri Jan 13 2012 Fedora Release Engineering - 2.0.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild