- rel 51; switch module name to mod_php.so (first step to using alternatives and...

diff --git a/php4-mod_php.conf b/php4-mod_php.conf
index fa770660b98f49ac79b036e76d6e9131fcc6afae..a65e9413391a5dda5b9a4b5b752c20365c8ef2b2 100644 (file)
--- a/php4-mod_php.conf
+++ b/php4-mod_php.conf
@@ -1,6 +1,4 @@
-# load php4 module only if php5 module is not yet loaded
-<IfModule !mod_php5.c>
-LoadModule php4_module modules/libphp4.so
+LoadModule php4_module modules/mod_php.so
 
 # apache2handler php module (apache 2.x)
 <IfModule sapi_apache2.c>
@@ -16,7 +14,5 @@ AddType application/x-httpd-php .php
 AddType application/x-httpd-php .inc
 AddType application/x-httpd-php .php3
 AddType application/x-httpd-php .php4
-</IfModule>
-
 </IfModule>
 # vim: filetype=apache ts=4 sw=4 et

diff --git a/php4.spec b/php4.spec
index f2000e43ac2e0f73575891f3323130ad796180dd..d295ac523f21d72830782fc928d95e852ee5a096 100644 (file)
--- a/php4.spec
+++ b/php4.spec
@@ -73,7 +73,7 @@
 %undefine      with_msession
 %endif
 
-%define                rel 50
+%define                rel 51
 Summary:       PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):     Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):     Język skryptowy PHP
@@ -1817,6 +1817,9 @@ done
 %{__make} libphp_common.la
 %{__make} build-modules
 
+# version suffix
+v=$(echo %{version} | cut -d. -f1-2)
+
 %if %{with apache1}
 %{__make} libtool-sapi LIBTOOL_SAPI=sapi/apache/libphp4.la -f Makefile.apxs1
 %endif
@@ -1864,12 +1867,18 @@ sed -i -e "s|^libdir=.*|libdir='%{_libdir}'|" $RPM_BUILD_ROOT%{_libdir}/libphp_c
 %if %{with apache1}
 libtool --silent --mode=install install sapi/apache/libphp4.la $RPM_BUILD_ROOT%{_libdir}/apache1
 rm $RPM_BUILD_ROOT%{_libdir}/apache1/libphp4.la
+
+mv $RPM_BUILD_ROOT%{_libdir}/apache1/libphp4{,-$v}.so
+ln -s libphp4-$v.so $RPM_BUILD_ROOT%{_libdir}/apache1/mod_php.so
 %endif
 
 # install apache2 DSO module
 %if %{with apache2}
 libtool --silent --mode=install install sapi/apache2handler/libphp4.la $RPM_BUILD_ROOT%{_libdir}/apache
 rm $RPM_BUILD_ROOT%{_libdir}/apache/libphp4.la
+
+mv $RPM_BUILD_ROOT%{_libdir}/apache/libphp4{,-$v}.so
+ln -s libphp4-$v.so $RPM_BUILD_ROOT%{_libdir}/apache/mod_php.so
 %endif
 
 # better solution?
@@ -2014,6 +2023,12 @@ if [ -f %{_sysconfdir}/php-apache.ini.rpmsave ]; then
 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
 %extension_post
 
@@ -2631,7 +2646,8 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/apache/conf.d/*_mod_php4.conf
 %dir %{_sysconfdir}/apache.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache.ini
-%attr(755,root,root) %{_libdir}/apache1/libphp4.so
+%attr(755,root,root) %{_libdir}/apache1/mod_php.so
+%attr(755,root,root) %{_libdir}/apache1/libphp4-*.so
 %endif
 
 %if %{with apache2}
@@ -2641,7 +2657,8 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/httpd/conf.d/*_mod_php4.conf
 %dir %{_sysconfdir}/apache2handler.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache2handler.ini
-%attr(755,root,root) %{_libdir}/apache/libphp4.so
+%attr(755,root,root) %{_libdir}/apache/mod_php.so
+%attr(755,root,root) %{_libdir}/apache/libphp4-*.so
 %endif
 
 %if %{with fcgi}