From b23d24e3c6bdc19f3bb0a038bf75dfacab31028f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 6 Dec 2017 09:11:11 +0100 Subject: v7.1.13RC1 --- php71.spec | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'php71.spec') diff --git a/php71.spec b/php71.spec index e2d1106..442bf92 100644 --- a/php71.spec +++ b/php71.spec @@ -107,13 +107,13 @@ %global db_devel libdb-devel %endif -%global upver 7.1.12 -#global rcver RC1 +%global upver 7.1.13 +%global rcver RC1 Summary: PHP scripting language for creating dynamic web sites Name: php Version: %{upver}%{?rcver:~%{rcver}} -Release: 4%{?dist} +Release: 1%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -170,8 +170,6 @@ Patch48: php-7.1.9-openssl-load-config.patch Patch91: php-5.6.3-oci8conf.patch # Upstream fixes (100+) -Patch100: php-bug75573.patch -Patch101: php-bug75514.patch # Security fixes (200+) @@ -1020,8 +1018,6 @@ support for JavaScript Object Notation (JSON) to PHP. %patch91 -p1 -b .remi-oci8 # upstream patches -%patch100 -p1 -b .bug75573 -%patch101 -p1 -b .bug75514 # security patches @@ -1171,6 +1167,9 @@ if [ ! -f Zend/zend_language_parser.c ]; then ./genfiles fi +# For doc +cat %{SOURCE1} %{SOURCE11} >httpd-php.conf + %build %{?dtsenable} @@ -1952,7 +1951,7 @@ fi %doc sapi/phpdbg/{README.md,CREDITS} %files fpm -%doc php-fpm.conf.default www.conf.default +%doc php-fpm.conf.default www.conf.default httpd-php.conf %license fpm_LICENSE %attr(0770,root,apache) %dir %{_localstatedir}/lib/php/session %attr(0770,root,apache) %dir %{_localstatedir}/lib/php/wsdlcache @@ -2059,6 +2058,9 @@ fi %changelog +* Wed Dec 6 2017 Remi Collet - 7.1.13~RC1-1 +- Update to 7.1.13RC1 + * Fri Dec 1 2017 Remi Collet - 7.1.12-4 - add upstream patch for https://bugs.php.net/75573 -- cgit