summaryrefslogtreecommitdiffstats
path: root/php.spec
diff options
context:
space:
mode:
Diffstat (limited to 'php.spec')
-rw-r--r--php.spec18
1 files changed, 10 insertions, 8 deletions
diff --git a/php.spec b/php.spec
index 107ad5e..f246953 100644
--- a/php.spec
+++ b/php.spec
@@ -81,7 +81,6 @@
%else
%global with_libpcre 0
%endif
-%global with_onig 1
%global with_dtrace 1
@@ -97,9 +96,9 @@
%global with_zip 0
-%global gh_commit cd3f42f17efe3e0a8584d1048b307cf00e209468
+%global gh_commit 797c1c50886305333644dcfe7b6c0dc8fb1ca917
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_date 20200608
+%global gh_date 20200609
%global gh_owner php
%global gh_project php-src
%global upver 8.0.0
@@ -109,7 +108,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}}
-Release: 17%{?dist}
+Release: 18%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -674,11 +673,10 @@ Group: Development/Languages
# onigurama is licensed under BSD
# ucgendat is licensed under OpenLDAP
License: PHP and LGPLv2 and BSD and OpenLDAP
-%if %{with_onig}
-# ensure we have soname 5
-BuildRequires: pkgconfig(oniguruma) >= 6.8
+%if 0%{?rhel}
+BuildRequires: oniguruma5php-devel
%else
-Provides: bundled(oniguruma) = 6.9.3
+BuildRequires: oniguruma-devel
%endif
Provides: bundled(libmbfl) = 1.3.2
Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
@@ -1783,6 +1781,10 @@ fi
%changelog
+* Tue Jun 9 2020 Remi Collet <remi@remirepo.net> - 8.0.0~DEV.20200609-18
+- new snapshot
+- rebuild using oniguruma5php
+
* Mon Jun 8 2020 Remi Collet <remi@remirepo.net> - 8.0.0~DEV.20200608-17
- new snapshot
- drop patch to fix PHP_UNAME