This commit is contained in:
Remi Collet 2017-05-24 07:28:12 +02:00
parent a3a5820e6d
commit f7d1d7fc57

View File

@ -61,13 +61,13 @@
%global db_devel libdb-devel %global db_devel libdb-devel
%endif %endif
#global rcver RC1 %global upver 7.1.6
%global rpmrel 1 %global rcver RC1
Summary: PHP scripting language for creating dynamic web sites Summary: PHP scripting language for creating dynamic web sites
Name: php Name: php
Version: 7.1.5 Version: %{upver}%{?rcver:~%{rcver}}
Release: %{?rcver:0.}%{rpmrel}%{?rcver:.%{rcver}}%{?dist} Release: 1%{?dist}
# All files licensed under PHP version 3.01, except # All files licensed under PHP version 3.01, except
# Zend is licensed under Zend # Zend is licensed under Zend
# TSRM is licensed under BSD # TSRM is licensed under BSD
@ -77,7 +77,7 @@ License: PHP and Zend and BSD and MIT and ASL 1.0
Group: Development/Languages Group: Development/Languages
URL: http://www.php.net/ URL: http://www.php.net/
Source0: http://www.php.net/distributions/php-%{version}%{?rcver}.tar.xz Source0: http://www.php.net/distributions/php-%{upver}%{?rcver}.tar.xz
Source1: php.conf Source1: php.conf
Source2: php.ini Source2: php.ini
Source3: macros.php Source3: macros.php
@ -696,7 +696,7 @@ support for JavaScript Object Notation (JSON) to PHP.
%prep %prep
%setup -q -n php-%{version}%{?rcver} %setup -q -n php-%{upver}%{?rcver}
# ensure than current httpd use prefork MPM. # ensure than current httpd use prefork MPM.
httpd -V | grep -q 'threaded:.*yes' && exit 1 httpd -V | grep -q 'threaded:.*yes' && exit 1
@ -759,8 +759,8 @@ rm Zend/tests/bug68412.phpt
# Safety check for API version change. # Safety check for API version change.
pver=$(sed -n '/#define PHP_VERSION /{s/.* "//;s/".*$//;p}' main/php_version.h) pver=$(sed -n '/#define PHP_VERSION /{s/.* "//;s/".*$//;p}' main/php_version.h)
if test "x${pver}" != "x%{version}%{?rcver}"; then if test "x${pver}" != "x%{upver}%{?rcver}"; then
: Error: Upstream PHP version is now ${pver}, expecting %{version}%{?rcver}. : Error: Upstream PHP version is now ${pver}, expecting %{upver}%{?rcver}.
: Update the version/rcver macros and rebuild. : Update the version/rcver macros and rebuild.
exit 1 exit 1
fi fi
@ -1324,7 +1324,7 @@ sed -e '/blacklist_filename/s/php.d/php-zts.d/' \
sed -e "s/@PHP_APIVER@/%{apiver}%{isasuffix}/" \ sed -e "s/@PHP_APIVER@/%{apiver}%{isasuffix}/" \
-e "s/@PHP_ZENDVER@/%{zendver}%{isasuffix}/" \ -e "s/@PHP_ZENDVER@/%{zendver}%{isasuffix}/" \
-e "s/@PHP_PDOVER@/%{pdover}%{isasuffix}/" \ -e "s/@PHP_PDOVER@/%{pdover}%{isasuffix}/" \
-e "s/@PHP_VERSION@/%{version}/" \ -e "s/@PHP_VERSION@/%{upver}/" \
%if ! %{with_zts} %if ! %{with_zts}
-e "/zts/d" \ -e "/zts/d" \
%endif %endif
@ -1501,6 +1501,9 @@ rm -f README.{Zeus,QNX,CVS-RULES}
%changelog %changelog
* Wed May 24 2017 Remi Collet <remi@fedoraproject.org> - 7.1.6~RC1-1
- Update to 7.1.6RC1
* Tue May 9 2017 Remi Collet <remi@fedoraproject.org> - 7.1.5-1 * Tue May 9 2017 Remi Collet <remi@fedoraproject.org> - 7.1.5-1
- Update to 7.1.5 - http://www.php.net/releases/7_1_5.php - Update to 7.1.5 - http://www.php.net/releases/7_1_5.php