From e021d2dec5c80dcae94295d3f88c177350f4d273 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 5 Apr 2019 10:19:49 +0200 Subject: build with system oniguruma5 --- php.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/php.spec b/php.spec index 060fe23..dcd4cdc 100644 --- a/php.spec +++ b/php.spec @@ -87,11 +87,7 @@ %else %global with_libpcre 0 %endif -%if 0%{?fedora} >= 28 %global with_onig 1 -%else -%global with_onig 0 -%endif %if 0%{?__isa_bits:1} %global isasuffix -%{__isa_bits} @@ -136,7 +132,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php Version: %{upver}%{?rcver:~%{lower}} -Release: 2%{?dist} +Release: 3%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -701,7 +697,8 @@ Group: Development/Languages # ucgendat is licensed under OpenLDAP License: PHP and LGPLv2 and BSD and OpenLDAP %if %{with_onig} -BuildRequires: oniguruma-devel +# ensure we have soname 5 +BuildRequires: oniguruma-devel >= 6.8 %else Provides: bundled(oniguruma) = 6.9.0 %endif @@ -1889,7 +1886,10 @@ fi %changelog -* Wed Apr 3 2019 Remi Collet - 7.3.4-4 +* Fri Apr 5 2019 Remi Collet - 7.3.4-3 +- build with system oniguruma5 + +* Wed Apr 3 2019 Remi Collet - 7.3.4-2 - test build for https://bugs.php.net/77653 patch from https://github.com/php/php-src/pull/4007 -- cgit