!53 switch pcre to pcre2
From: @eaglegai Reviewed-by: @licihua Signed-off-by: @licihua
This commit is contained in:
commit
acb7629750
11
nginx.spec
11
nginx.spec
@ -14,7 +14,7 @@
|
||||
Name: nginx
|
||||
Epoch: 1
|
||||
Version: 1.21.5
|
||||
Release: 1
|
||||
Release: 2
|
||||
Summary: A HTTP server, reverse proxy and mail proxy server
|
||||
License: BSD
|
||||
URL: http://nginx.org/
|
||||
@ -34,8 +34,8 @@ Source210: UPGRADE-NOTES-1.6-to-1.10
|
||||
Patch0: nginx-auto-cc-gcc.patch
|
||||
Patch1: nginx-1.12.1-logs-perm.patch
|
||||
Patch2: nginx-fix-pidfile.patch
|
||||
BuildRequires: gcc openssl-devel pcre-devel zlib-devel systemd gperftools-devel
|
||||
Requires: nginx-filesystem = %{epoch}:%{version}-%{release} openssl pcre
|
||||
BuildRequires: gcc openssl-devel pcre2-devel zlib-devel systemd gperftools-devel
|
||||
Requires: nginx-filesystem = %{epoch}:%{version}-%{release} openssl
|
||||
Requires: nginx-all-modules = %{epoch}:%{version}-%{release}
|
||||
%if 0%{?with_mailcap_mimetypes}
|
||||
Requires: nginx-mimetypes
|
||||
@ -162,7 +162,7 @@ if ! ./configure \
|
||||
--with-http_perl_module=dynamic --with-http_auth_request_module \
|
||||
--with-mail=dynamic --with-mail_ssl_module --with-pcre --with-pcre-jit --with-stream=dynamic \
|
||||
--with-stream_ssl_module --with-google_perftools_module --with-debug \
|
||||
--with-cc-opt="%{optflags} $(pcre-config --cflags)" --with-ld-opt="$nginx_ldopts"; then
|
||||
--with-cc-opt="%{optflags} $(pcre2-config --cflags)" --with-ld-opt="$nginx_ldopts"; then
|
||||
: configure failed
|
||||
cat objs/autoconf.err
|
||||
exit 1
|
||||
@ -345,6 +345,9 @@ fi
|
||||
%{_mandir}/man8/nginx.8*
|
||||
|
||||
%changelog
|
||||
* Tue Jul 19 2022 gaihuiying <eaglegai@163.com> - 1:1.21.5-2
|
||||
- switch pcre to pcre2
|
||||
|
||||
* Sat Jan 15 2022 yaoxin <yaoxin30@huawei.com> - 1:1.21.5-1
|
||||
- Upgrade nginx to 1.21.5
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user