diff options
| -rw-r--r-- | failed.txt | 2 | ||||
| -rw-r--r-- | php.spec | 23 |
2 files changed, 21 insertions, 4 deletions
@@ -1,4 +1,4 @@ -===== 7.1.0-dev (20170529.37a16a3) +===== 7.1.0-dev (20170602.a86c87d) $ grep -r 'Tests failed' /var/lib/mock/scl72*/build.log /var/lib/mock/scl72el6x/build.log:Tests failed : 0 @@ -82,6 +82,11 @@ %else %global with_libpcre 0 %endif +%if 0%{?fedora} >= 26 +%global with_onig 1 +%else +%global with_onig 0 +%endif %if 0%{?__isa_bits:1} %global isasuffix -%{__isa_bits} @@ -123,13 +128,13 @@ %global db_devel libdb-devel %endif -%global gh_commit 37a16a32c97fba3e5528aa4a3a675431f3cae136 +%global gh_commit a86c87df2dc2d3bf82bd87cddd888f899306a451 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 20170529 +%global gh_date 20170602 %global gh_owner php %global gh_project php-src #global rcver alpha0 -%global rpmrel 6 +%global rpmrel 7 Summary: PHP scripting language for creating dynamic web sites @@ -671,6 +676,11 @@ Group: Development/Languages # onigurama is licensed under BSD # ucgendat is licensed under OpenLDAP License: PHP and LGPLv2 and BSD and OpenLDAP +%if %{with_onig} +BuildRequires: oniguruma-devel +%else +Provides: bundled(oniguruma) = 6.3.0 +%endif Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} %description mbstring @@ -1142,6 +1152,9 @@ build --libdir=%{_libdir}/php \ --with-imap=shared --with-imap-ssl \ %endif --enable-mbstring=shared \ +%if %{with_onig} + --with-onig=%{_root_prefix} \ +%endif --enable-mbregex \ %if %{with_libgd} --with-gd=shared,%{_root_prefix} \ @@ -1801,6 +1814,10 @@ fi %changelog +* Fri Jun 2 2017 Remi Collet <remi@remirepo.net> - 7.2.0-0.7.20170602.a86c87d +- new snapshot +- use system oniguruma (F26) + * Mon May 29 2017 Remi Collet <remi@remirepo.net> - 7.2.0-0.6.20170529.37a16a3 - new snapshot |