From: Jan-Frode Myklebust <janfrode@tanso.net>
Date: Thu, 26 Mar 2009 14:45:53 +0000 (+0100)
Subject: [PATCH] Update specfile to build for v2.6 kernel.
X-Git-Tag: v1.3.17~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=facafad06d97e5bb61d4d2e48d30f5a833d08cdc;p=thirdparty%2Fhaproxy.git

[PATCH] Update specfile to build for v2.6 kernel.
  - Fix date in changelog.
  - Stop using deprecated "REGEX=pcre", and start using "USE_PCRE=1" instead.
  - Disable RPM-processing of perl dependencies, since haproxy
    shouldn't depend on perl, and it's only the examples/check script
    that's using perl.
---

diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index 85d7b9ae5b..54b6a8530f 100644
--- a/examples/haproxy.spec
+++ b/examples/haproxy.spec
@@ -29,8 +29,11 @@ risking the system's stability.
 %prep
 %setup -q
 
+# We don't want any perl dependecies in this RPM:
+%define __perl_requires /bin/true
+
 %build
-%{__make} REGEX="pcre" "COPTS.pcre=-DUSE_PCRE $(pcre-config --cflags)" DEBUG="" TARGET=linux24e
+%{__make} USE_PCRE=1 "COPTS.pcre=-DUSE_PCRE $(pcre-config --cflags)" DEBUG="" TARGET=linux26
 #%{__make} REGEX=pcre DEBUG="" LIBS.pcre="-L\$(PCREDIR)/lib -Wl,-Bstatic -lpcreposix -lpcre -Wl,-Bdynamic"
 
 
@@ -71,7 +74,7 @@ fi
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
 
 %changelog
-* Sun Mar 22 2008 Willy Tarreau <w@1wt.eu>
+* Sun Mar 22 2009 Willy Tarreau <w@1wt.eu>
 - updated to 1.3.16
 
 * Sat Apr 19 2008 Willy Tarreau <w@1wt.eu>