X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=php.spec;h=df441a62d11658739b322bae21da12c92d6fd449;hb=c5f06e46285d0a5d14a2a9cb9ed7d64189e87099;hp=c37d79ec0752c6d2909ddde62e99548752e83717;hpb=6fb5ef928c2f7484dfdc00eb94bd79878d64d388;p=packages%2Fphp.git

diff --git a/php.spec b/php.spec
index c37d79e..df441a6 100644
--- a/php.spec
+++ b/php.spec
@@ -146,7 +146,7 @@ Summary(pt_BR.UTF-8):	A linguagem de script PHP
 Summary(ru.UTF-8):	PHP Версии 7 - язык препроцессирования HTML-файлов, выполняемый на сервере
 Summary(uk.UTF-8):	PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		%{orgname}%{php_suffix}
-Version:	7.2.9
+Version:	7.2.20
 Release:	1
 Epoch:		4
 # All files licensed under PHP version 3.01, except
@@ -155,7 +155,7 @@ Epoch:		4
 License:	PHP 3.01 and Zend and BSD
 Group:		Libraries
 Source0:	http://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5:	d529efc4017840e3db970b0bc25aef9c
+# Source0-md5:	b023517d701397f90094083aef57a78c
 Source1:	opcache.ini
 Source2:	%{orgname}-mod_php.conf
 Source3:	%{orgname}-cgi-fcgi.ini
@@ -210,7 +210,6 @@ Patch69:	fpm-conf-split.patch
 Patch70:	mysqlnd-ssl.patch
 Patch71:	libdb-info.patch
 Patch72:	phar-hash-shared.patch
-Patch73:	revert-mysql-8-auth-fix.patch
 URL:		http://php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:	aspell-devel >= 2:0.50.0}
@@ -307,7 +306,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		jsonver		1.6.0
 %define		pharver		2.0.2
 %define		sqlite3ver	%{version}
-%define		zipver		1.15.3
+%define		zipver		1.15.4
 %define		phpdbgver	0.5.0
 %define		sodiumver	%{version}
 
@@ -1969,7 +1968,6 @@ cp -p php.ini-production php.ini
 %patch70 -p1
 %patch71 -p1
 %patch72 -p1 -b .phar-shared
-%patch73 -p1
 
 %{__sed} -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' ext/xmlrpc/config.m4
 
@@ -2669,7 +2667,7 @@ update-alternatives \
 
 %postun cli
 if [ $1 -eq 0 ]; then
-	update-alternatives --remove php %{_bindir}/php || :
+	update-alternatives --remove php %{_bindir}/php%{php_suffix} || :
 fi
 
 %post	common -p /sbin/ldconfig
@@ -2685,8 +2683,8 @@ update-alternatives \
 
 %postun devel
 if [ $1 -eq 0 ]; then
-	update-alternatives --remove phpize %{_bindir}/phpize || :
-	update-alternatives --remove php-config %{_bindir}/php-config || :
+	update-alternatives --remove phpize %{_bindir}/phpize%{php_suffix} || :
+	update-alternatives --remove php-config %{_bindir}/php-config%{php_suffix} || :
 fi
 
 %pre fpm
@@ -2701,7 +2699,7 @@ update-alternatives --install %{_sbindir}/php-fpm php-fpm %{_sbindir}/php%{php_s
 if [ "$1" = "0" ]; then
 	%service %{name}-fpm stop
 	/sbin/chkconfig --del %{name}-fpm
-	update-alternatives --remove php-fpm %{_sbindir}/php-fpm || :
+	update-alternatives --remove php-fpm %{_sbindir}/php%{php_suffix}-fpm || :
 fi
 
 %postun fpm
@@ -2864,7 +2862,7 @@ update-alternatives \
 %postun phar
 %ext_postun
 if [ $1 -eq 0 ]; then
-	update-alternatives --remove phar %{_bindir}/phar || :
+	update-alternatives --remove phar %{_bindir}/phar%{php_suffix}.phar || :
 fi
 
 %if %{with apache2}