update PCRE config selection

Although PCRE 2 was only supposed to be used for Fedora > 36 it
has always been configured for Fedora 36 as well due to autoconf
weirdness.
This commit is contained in:
Joe Orton 2022-06-17 11:39:49 +01:00
parent eeff443633
commit e4ec9394be

View File

@ -10,7 +10,7 @@
%global mpm prefork
%endif
%if 0%{?fedora} > 36 || 0%{?rhel} > 9
%if 0%{?fedora} > 35 || 0%{?rhel} > 9
%bcond_without pcre2
%bcond_with pcre
%else
@ -24,7 +24,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.4.54
Release: 2%{?dist}
Release: 3%{?dist}
URL: https://httpd.apache.org/
Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2.asc
@ -362,10 +362,10 @@ export LYNX_PATH=/usr/bin/links
--with-brotli \
--enable-pie \
%if %{with pcre2}
--with-pcre2 \
--with-pcre2=%{_bindir}/pcre2-config \
%endif
%if %{with pcre}
--with-pcre \
--with-pcre=%{_bindir}/pcre-config \
%endif
--enable-mods-shared=all \
--enable-ssl --with-ssl --disable-distcache \
@ -836,6 +836,9 @@ exit $rv
%{_rpmconfigdir}/macros.d/macros.httpd
%changelog
* Fri Jun 17 2022 Joe Orton <jorton@redhat.com> - 2.4.54-3
- update PCRE config selection
* Thu Jun 09 2022 Luboš Uhliarik <luhliari@redhat.com> - 2.4.54-2
- new version 2.4.54