From: Marcin Krol <hawk@tld-linux.org>
Date: Wed, 22 Aug 2018 12:04:25 +0000 (+0000)
Subject: - fixed removing alternatives on uninstall
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=357152b93c46771a1965ce602942b99e757680b4;p=packages%2Fphp.git

- fixed removing alternatives on uninstall
---

diff --git a/php.spec b/php.spec
index 9faef10..05da72f 100644
--- a/php.spec
+++ b/php.spec
@@ -143,7 +143,7 @@ Summary(ru.UTF-8):	PHP Версии 7 - язык препроцессирова
 Summary(uk.UTF-8):	PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:		%{orgname}%{php_suffix}
 Version:	7.1.21
-Release:	1
+Release:	2
 Epoch:		4
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
@@ -2666,7 +2666,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
@@ -2682,8 +2682,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
@@ -2698,7 +2698,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
@@ -2861,7 +2861,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}