[openvpn-auth-ldap] Make sure tools/ content gets our CFLAGS.
Matthias Saou
thias at fedoraproject.org
Sat Aug 13 21:02:32 UTC 2011
commit 0ee2b24bc34a5483c87c3c4279b1f9077b48dfd6
Author: Matthias Saou <matthias at saou.eu>
Date: Sat Aug 13 23:01:52 2011 +0200
Make sure tools/ content gets our CFLAGS.
auth-ldap-2.0.3-tools-CFLAGS.patch | 11 +++++++++++
openvpn-auth-ldap.spec | 3 +++
2 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/auth-ldap-2.0.3-tools-CFLAGS.patch b/auth-ldap-2.0.3-tools-CFLAGS.patch
new file mode 100644
index 0000000..7e2e39f
--- /dev/null
+++ b/auth-ldap-2.0.3-tools-CFLAGS.patch
@@ -0,0 +1,11 @@
+diff -Naupr auth-ldap-2.0.3.orig/tools/Makefile.in auth-ldap-2.0.3/tools/Makefile.in
+--- auth-ldap-2.0.3.orig/tools/Makefile.in 2006-04-30 21:56:47.000000000 +0200
++++ auth-ldap-2.0.3/tools/Makefile.in 2011-08-13 22:57:23.409789931 +0200
+@@ -12,7 +12,6 @@ LEMON_OBJS= lemon.o
+ LEMON_GEN_SRCS= lempar.c
+
+ MAKEHEADERS_OBJS= makeheaders.o
+-CFLAGS=
+
+ all:: lemon makeheaders
+
diff --git a/openvpn-auth-ldap.spec b/openvpn-auth-ldap.spec
index 62e12a3..1406bd0 100644
--- a/openvpn-auth-ldap.spec
+++ b/openvpn-auth-ldap.spec
@@ -9,6 +9,7 @@ Source0: http://openvpn-auth-ldap.googlecode.com/files/auth-ldap-%{version}.tar.
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
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
@@ -28,6 +29,7 @@ LDAP for OpenVPN 2.x.
%setup -q -n auth-ldap-%{version}
%patch0 -p1 -b .top_builddir
%patch1 -p1 -b .README
+%patch2 -p1 -b .tools-CFLAGS
# 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
@@ -70,6 +72,7 @@ rm -rf %{buildroot}
* Sat Aug 13 2011 Matthias Saou <matthias at saou.eu> 2.0.3-8
- Minor spec file cleanups.
- Fix build on F-15+.
+- Make sure tools/ content gets our CFLAGS.
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list