From d5794124ea3c7255c1f4531439151df6a1bb3465 Mon Sep 17 00:00:00 2001 From: Ryan O'Hara Date: Tue, 30 Jul 2019 10:15:24 -0500 Subject: [PATCH] Build with PCRE2 (#1669217) --- haproxy.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/haproxy.spec b/haproxy.spec index af224e8..a2c5495 100644 --- a/haproxy.spec +++ b/haproxy.spec @@ -8,7 +8,7 @@ Name: haproxy Version: 1.8.20 -Release: 2%{?dist} +Release: 3%{?dist} Summary: HAProxy reverse proxy for high availability environments License: GPLv2+ @@ -23,7 +23,7 @@ Source5: halog.1 BuildRequires: gcc BuildRequires: lua-devel -BuildRequires: pcre-devel +BuildRequires: pcre2-devel BuildRequires: zlib-devel BuildRequires: openssl-devel BuildRequires: systemd-devel @@ -55,7 +55,7 @@ regparm_opts= regparm_opts="USE_REGPARM=1" %endif -%{__make} %{?_smp_mflags} CPU="generic" TARGET="linux2628" USE_OPENSSL=1 USE_PCRE=1 USE_ZLIB=1 USE_LUA=1 USE_CRYPT_H=1 USE_SYSTEMD=1 USE_LINUX_TPROXY=1 USE_GETADDRINFO=1 ${regparm_opts} ADDINC="%{optflags}" ADDLIB="%{__global_ldflags}" +%{__make} %{?_smp_mflags} CPU="generic" TARGET="linux2628" USE_OPENSSL=1 USE_PCRE2=1 USE_ZLIB=1 USE_LUA=1 USE_CRYPT_H=1 USE_SYSTEMD=1 USE_LINUX_TPROXY=1 USE_GETADDRINFO=1 ${regparm_opts} ADDINC="%{optflags}" ADDLIB="%{__global_ldflags}" pushd contrib/halog %{__make} ${halog} OPTIMIZE="%{optflags} %{build_ldflags}" @@ -132,6 +132,9 @@ exit 0 %{_mandir}/man1/* %changelog +* Tue Jul 30 2019 Ryan O'Hara - 1.8.20-3 +- Build with PCRE2 (#1669217) + * Thu Jul 25 2019 Fedora Release Engineering - 1.8.20-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild