[packages/php4] merge triggers

atler atler at pld-linux.org
Tue Feb 4 15:36:17 CET 2025


commit 883bc57605c432dbd0a6085333af453d84e831e5
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Feb 4 14:53:35 2025 +0100

    merge triggers

 php4.spec | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/php4.spec b/php4.spec
index a08f612..8537232 100644
--- a/php4.spec
+++ b/php4.spec
@@ -2043,19 +2043,15 @@ fi
 [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart
 [ ! -f /etc/httpd/conf.d/??_mod_php4.conf ] || %service -q httpd restart
 
-%if %{with apache2}
-%triggerpostun -n apache-mod_php4 -- apache-mod_php4 < 3:4.4.0-2.16, php4 < 3:4.3.11-4.16
+%triggerpostun -n apache1-mod_%{name} -- apache1-mod_%{name} < 3:4.4.9-51
+sed -i -e 's#modules/libphp4.so#modules/mod_php.so#g' /etc/apache/conf.d/*_mod_php4.conf
+
+%triggerpostun -n apache-mod_%{name} -- apache-mod_%{name} < 3:4.4.9-51
 # for fixed php-SAPI.ini, the poor php-apache.ini was never read for apache2
 if [ -f %{_sysconfdir}/php-apache.ini.rpmsave ]; then
 	cp -f %{_sysconfdir}/php-apache2handler.ini{,.rpmnew}
 	mv -f %{_sysconfdir}/php-apache.ini.rpmsave %{_sysconfdir}/php-apache2handler.ini
 fi
-%endif
-
-%triggerpostun -n apache1-mod_%{name} -- apache1-mod_%{name} < 3:4.4.9-51
-sed -i -e 's#modules/libphp4.so#modules/mod_php.so#g' /etc/apache/conf.d/*_mod_php4.conf
-
-%triggerpostun -n apache-mod_%{name} -- apache-mod_%{name} < 3:4.4.9-51
 sed -i -e 's#modules/libphp4.so#modules/mod_php.so#g' /etc/httpd/conf.d/*_mod_php4.conf
 
 %post bcmath
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php4.git/commitdiff/651d944459ba9ed5f561eabd92ca1957678874c2



More information about the pld-cvs-commit mailing list