Build with pcre2 over deprecated pcre

This commit is contained in:
Stewart Smith 2022-07-23 18:50:47 +00:00
parent eb0a81aba0
commit 7b9e0060a5
1 changed files with 7 additions and 5 deletions

View File

@ -49,7 +49,7 @@
Name: postfix
Summary: Postfix Mail Transport Agent
Version: 3.7.2
Release: 2%{?dist}
Release: 3%{?dist}
Epoch: 2
URL: http://www.postfix.org
License: (IBM and GPLv2+) or (EPL-2.0 and GPLv2+)
@ -118,7 +118,7 @@ BuildRequires: libnsl2-devel
%{?with_ldap:BuildRequires: openldap-devel}
%{?with_lmdb:BuildRequires: lmdb-devel}
%{?with_sasl:BuildRequires: cyrus-sasl-devel}
%{?with_pcre:BuildRequires: pcre-devel}
%{?with_pcre:BuildRequires: pcre2-devel}
%{?with_mysql:BuildRequires: mariadb-connector-c-devel}
%{?with_pgsql:BuildRequires: libpq-devel}
%{?with_sqlite:BuildRequires: sqlite-devel}
@ -282,9 +282,8 @@ CCARGS="${CCARGS} -fsigned-char"
AUXLIBS_LMDB="-llmdb"
%endif
%if %{with pcre}
# -I option required for pcre 3.4 (and later?)
CCARGS="${CCARGS} -DHAS_PCRE -I%{_includedir}/pcre"
AUXLIBS_PCRE="-lpcre"
CCARGS="${CCARGS} -DHAS_PCRE=2 `pcre2-config --cflags`"
AUXLIBS_PCRE=`pcre2-config --libs8`
%endif
%if %{with mysql}
CCARGS="${CCARGS} -DHAS_MYSQL -I%{_includedir}/mysql"
@ -803,6 +802,9 @@ fi
%endif
%changelog
* Sat Jul 23 2022 Stewart Smith <trawets@amazon.com> - 2:3.7.2-3
- Build with pcre2 instead of the deprecated pcre library
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2:3.7.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild