From e7396d51aabdc292acb47598c6887af195aaca84 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 11 Sep 2018 14:41:33 +0200 Subject: update to 7.3.0RC1 with oniguruma 6.9.0 --- php.spec | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'php.spec') diff --git a/php.spec b/php.spec index 18c623b..242e6d1 100644 --- a/php.spec +++ b/php.spec @@ -82,7 +82,7 @@ %else %global with_libpcre 0 %endif -%if 0%{?fedora} >= 26 +%if 0%{?fedora} >= 28 %global with_onig 1 %else %global with_onig 0 @@ -125,12 +125,13 @@ %endif %global upver 7.3.0 -%global rcver beta3 +%global rcver RC1 +%global lower rc1 Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php -Version: %{upver}%{?rcver:~%{rcver}} -Release: 3%{?dist} +Version: %{upver}%{?rcver:~%{lower}} +Release: 1%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -183,8 +184,6 @@ Patch47: php-5.6.3-phpinfo.patch Patch91: php-7.2.0-oci8conf.patch # Upstream fixes (100+) -Patch100: php-upstream.patch -Patch101: https://github.com/php/php-src/commit/cd0a37994e3cbf1f0aa1174155d3d662cefe2e7a.patch # Security fixes (200+) @@ -685,7 +684,7 @@ License: PHP and LGPLv2 and BSD and OpenLDAP %if %{with_onig} BuildRequires: oniguruma-devel %else -Provides: bundled(oniguruma) = 6.3.0 +Provides: bundled(oniguruma) = 6.9.0 %endif Provides: bundled(libmbfl) = 1.3.2 Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} @@ -925,8 +924,6 @@ low-level PHP extension for the libsodium cryptographic library. %patch91 -p1 -b .remi-oci8 # upstream patches -%patch100 -p1 -b .up1 -%patch101 -p1 -b .up2 # security patches @@ -1861,6 +1858,10 @@ fi %changelog +* Tue Sep 11 2018 Remi Collet - 7.3.0~rc1-1 +- update to 7.3.0RC1 +- with oniguruma 6.9.0 + * Mon Sep 3 2018 Remi Collet - 7.3.0~beta3-3 - add upstream patch for openssl failing test -- cgit