From 5dd6d09fba322ede7fbdf26f29d61281a80eb00d Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 28 Feb 2018 13:48:50 +0100
Subject: Update to 7.1.15 - http://www.php.net/releases/7_1_15.php FPM: revert
pid file removal improve devel dependencies
---
failed.txt | 8 +++++---
php.spec | 9 ++++++---
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/failed.txt b/failed.txt
index 4d78374..5539f69 100644
--- a/failed.txt
+++ b/failed.txt
@@ -1,15 +1,17 @@
-===== 7.1.15RC1 (2018-03-01)
+===== 7.1.15 (2018-03-01)
$ grep -r 'Tests failed' /var/lib/mock/scl71*/build.log
/var/lib/mock/scl71el6x/build.log:Tests failed : 0
/var/lib/mock/scl71el7x/build.log:Tests failed : 0
-/var/lib/mock/scl71fc24x/build.log:Tests failed : 0
-/var/lib/mock/scl71fc25x/build.log:Tests failed : 0
+/var/lib/mock/scl71fc25x/build.log:Tests failed : 1
/var/lib/mock/scl71fc26x/build.log:Tests failed : 1
/var/lib/mock/scl71fc27x/build.log:Tests failed : 0
+/var/lib/mock/scl71fc28x/build.log:Tests failed : 0
+fc25x:
+ 1 Bug #64438 proc_open hangs with stdin/out with 4097+ bytes [ext/standard/tests/streams/proc_open_bug64438.phpt]
fc26x:
1 Bug #60120 proc_open hangs with stdin/out with 2048+ bytes [ext/standard/tests/streams/proc_open_bug60120.phpt]
diff --git a/php.spec b/php.spec
index f43740e..fdb3656 100644
--- a/php.spec
+++ b/php.spec
@@ -121,7 +121,7 @@
%endif
%global upver 7.1.15
-%global rcver RC1
+#global rcver RC1
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
@@ -1415,8 +1415,6 @@ sed -e 's:/run:%{_localstatedir}/run:' \
-e 's:php-fpm.service:%{?scl_prefix}php-fpm.service:' \
-e 's:/usr/sbin:%{_sbindir}:' \
-i $RPM_BUILD_ROOT%{_unitdir}/%{?scl_prefix}php-fpm.service
-sed -e 's/^pid/;pid/' \
- -i $RPM_BUILD_ROOT%{_sysconfdir}/php-fpm.conf
# this folder requires systemd >= 204
install -m 755 -d $RPM_BUILD_ROOT%{_root_sysconfdir}/systemd/system/%{?scl_prefix}php-fpm.service.d
%else
@@ -1835,6 +1833,11 @@ fi
%changelog
+* Wed Feb 28 2018 Remi Collet <remi@remirepo.net> - 7.1.15-1
+- Update to 7.1.15 - http://www.php.net/releases/7_1_15.php
+- FPM: revert pid file removal
+- improve devel dependencies
+
* Wed Feb 14 2018 Remi Collet <remi@remirepo.net> - 7.1.15~RC1-1
- Update to 7.1.15RC1
- adapt ldap patch
--
cgit