diff options
| -rw-r--r-- | failed.txt | 4 | ||||
| -rw-r--r-- | php.spec | 13 |
2 files changed, 7 insertions, 10 deletions
@@ -6,10 +6,14 @@ $ grep -r 'Tests failed' /var/lib/mock/scl72*/build.log /var/lib/mock/scl70fc24x/build.log:Tests failed : 0 /var/lib/mock/scl70fc25x/build.log:Tests failed : 0 /var/lib/mock/scl70fc26x/build.log:Tests failed : 0 +/var/lib/mock/scl70fc27x/build.log:Tests failed : 1 +fc27x: + 5 substr_compare() [ext/standard/tests/strings/substr_compare.phpt] (1) proc_open give erratic test results :( (2) test issue (fixed upstream) (3) known issue +(5) need investigation @@ -94,11 +94,7 @@ %global isasuffix %nil %endif -%if 0%{?fedora} < 12 && 0%{?rhel} < 6 -%global with_dtrace 0 -%else %global with_dtrace 1 -%endif # build with system libgd (gd-last in remi repo) %global with_libgd 1 @@ -176,6 +172,7 @@ Source51: opcache-default.blacklist Source52: 20-oci8.ini # Build fixes +Patch1: php-7.1.7-httpd.patch Patch5: php-7.2.0-includedir.patch Patch6: php-5.6.3-embed.patch Patch7: php-5.3.0-recode.patch @@ -902,6 +899,7 @@ low-level PHP extension for the libsodium cryptographic library. %setup -q -n php-%{version}%{?rcver} %endif +%patch1 -p1 -b .mpmcheck %patch5 -p1 -b .includedir %patch6 -p1 -b .embed %patch7 -p1 -b .recode @@ -1075,17 +1073,11 @@ exit 1 %{?dtsenable} # aclocal workaround - to be improved -%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 cat $(aclocal --print-ac-dir)/{libtool,ltoptions,ltsugar,ltversion,lt~obsolete}.m4 >>aclocal.m4 -%endif # Force use of system libtool: libtoolize --force --copy -%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6 cat $(aclocal --print-ac-dir)/{libtool,ltoptions,ltsugar,ltversion,lt~obsolete}.m4 >build/libtool.m4 -%else -cat $(aclocal --print-ac-dir)/libtool.m4 > build/libtool.m4 -%endif %if 0%{?gh_date} # Bison files @@ -1850,6 +1842,7 @@ fi * Tue Aug 22 2017 Remi Collet <remi@remirepo.net> - 7.2.0-0.17.20170822.3fff74a. - test build from git snapshot - adapt tzdata patch for timelib 2017.05beta7 +- disable httpd MPM check * Tue Aug 15 2017 Remi Collet <remi@remirepo.net> - 7.2.0-0.16.beta3 - update to 7.2.0beta3 |