From 7378d34a2b44dd7ffaeaff147d0278a2cee7d369 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 21 Oct 2019 14:50:17 +0200
Subject: - fix preload, add upstream patch for https://bugs.php.net/78512 -
 change dependency on nginx-filesystem to weak

---
 php74.spec | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'php74.spec')

diff --git a/php74.spec b/php74.spec
index 5e5e6db..da00c5f 100644
--- a/php74.spec
+++ b/php74.spec
@@ -103,7 +103,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: %{upver}%{?rcver:~%{lower}}
-Release: 9%{?dist}
+Release: 10%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -168,6 +168,7 @@ Patch91: php-7.2.0-oci8conf.patch
 Patch300: php-7.0.10-datetests.patch
 
 # WIP
+Patch100: https://github.com/php/php-src/commit/05c5e5dfde91955263469daa2dd5afcbb5199d17.patch
 
 BuildRequires: gnupg2
 BuildRequires: bzip2-devel
@@ -320,7 +321,8 @@ Provides: php(httpd)
 %endif
 %if %{with_nginx}
 # for /etc/nginx ownership
-Requires: nginx-filesystem
+# Temporarily not mandatory to allow nginx for nginx repo
+Recommends: nginx-filesystem
 %endif
 %if 0%{?rhel}
 Obsoletes: php53-fpm, php53u-fpm, php54-fpm, php54w-fpm, php55u-fpm, php55w-fpm, php56u-fpm, php56w-fpm
@@ -1163,6 +1165,7 @@ in pure PHP.
 %endif
 
 # WIP patch
+%patch100 -p1
 
 # Prevent %%doc confusion over LICENSE files
 cp Zend/LICENSE Zend/ZEND_LICENSE
@@ -2151,6 +2154,10 @@ fi
 
 
 %changelog
+* Mon Oct 21 2019 Remi Collet <remi@remirepo.net> - 7.4.0~RC4-10
+- fix preload, add upstream patch for https://bugs.php.net/78512
+- change dependency on nginx-filesystem to weak
+
 * Tue Oct 15 2019 Remi Collet <remi@remirepo.net> - 7.4.0~RC4-9
 - update to 7.4.0RC4
 
-- 
cgit