commit 417f416be8c6cea7a61b0a4f3a7bf87a2e289737
Author: Jan Rękorajski <[email protected]>
Date: Tue Aug 24 01:03:43 2021 +0200
- merged duplicate triggers, removed unsupported Obsoletes
php.spec | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
---
diff --git a/php.spec b/php.spec
index 2fe71ec..19f3ab7 100644
--- a/php.spec
+++ b/php.spec
@@ -484,7 +484,6 @@ Summary: /usr/bin/php symlink
Summary(pl.UTF-8): Dowiązanie symboliczne /usr/bin/php
Group: Development/Languages/PHP
Requires: %{name}-cli = %{epoch}:%{version}-%{release}
-Obsoletes: /usr/bin/php
Obsoletes: php-program < 4:5.3.28-7
Obsoletes: php4-program
Obsoletes: php52-program
@@ -2794,7 +2793,7 @@ fi
[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
[ ! -f /etc/httpd/conf.d/??_mod_php.conf ] || %service -q httpd restart
-%triggerpostun common -- php-common < 4:5.3.28-7
+%triggerpostun common -- %{name}-common < 4:5.6.4-2, php-common < 4:5.6.4-2
# migrate configs /etc/php/conf.d -> /etc/phpXY/conf.d/
# do config migration in php-common trigger, as the trigger is ran after all
packages are upgraded
# this way we can stick to one trigger, instead of attaching one for each
(sub)package!
@@ -2814,8 +2813,6 @@ for f in /etc/php/*.ini.rpmsave
/etc/php/*.d/*.ini.rpmsave; do
s#/etc/php#%{_sysconfdir}#
' $nf
done
-
-%triggerpostun common -- %{name}-common < 4:5.6.4-2, php-common < 4:5.6.4-2
# switch to browscap package if the ini file has original value
%{__sed} -i -e
's#%{_sysconfdir}/browscap.ini#/usr/share/browscap/php_browscap.ini#'
%{_sysconfdir}/php.ini
# disable browscap, if optional package not present
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/417f416be8c6cea7a61b0a4f3a7bf87a2e289737
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
