[packages/php/PHP_5_5] - rel 2; switch module name to mod_php.so (first step to using alternatives and allowing apache-mod_
arekm
arekm at pld-linux.org
Mon Oct 5 13:10:07 CEST 2015
commit 901e8824e628b5ffc756f872211d495d06d59a7a
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Mon Oct 5 13:09:59 2015 +0200
- rel 2; switch module name to mod_php.so (first step to using alternatives and allowing apache-mod_php coexistence)
php-mod_php.conf | 2 +-
php.spec | 16 +++++++++++-----
2 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/php.spec b/php.spec
index 0a4eb8c..f7b2527 100644
--- a/php.spec
+++ b/php.spec
@@ -126,7 +126,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
%undefine with_filter
%endif
-%define rel 1
+%define rel 2
%define orgname php
%define ver_suffix 55
%define php_suffix %{!?with_default_php:%{ver_suffix}}
@@ -2547,14 +2547,14 @@ v=$(echo %{version} | cut -d. -f1-2)
%if %{with apache1}
libtool --mode=install install -p sapi/apache/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache1
mv $RPM_BUILD_ROOT%{_libdir}/apache1/libphp5{,-$v}.so
-ln -s libphp5-$v.so $RPM_BUILD_ROOT%{_libdir}/apache1/libphp5.so
+ln -s libphp5-$v.so $RPM_BUILD_ROOT%{_libdir}/apache1/mod_php.so
%endif
# install Apache2 DSO module
%if %{with apache2}
libtool --mode=install install -p sapi/apache2handler/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache
mv $RPM_BUILD_ROOT%{_libdir}/apache/libphp5{,-$v}.so
-ln -s libphp5-$v.so $RPM_BUILD_ROOT%{_libdir}/apache/libphp5.so
+ln -s libphp5-$v.so $RPM_BUILD_ROOT%{_libdir}/apache/mod_php.so
%endif
# install litespeed sapi
@@ -2768,6 +2768,12 @@ if [ ! -e /usr/share/browscap/php_browscap.ini ]; then
%{__sed} -i -e 's#^browscap = /usr/share/browscap/php_browscap.ini#;&#' %{_sysconfdir}/php.ini
fi
+%triggerpostun -n apache1-mod_%{name} -- apache1-mod_%{name} < 4:5.5.30-2
+sed -i -e 's#modules/libphp5.so#modules/mod_php.so#g' /etc/apache/conf.d/*_mod_php.conf
+
+%triggerpostun -n apache-mod_%{name} -- apache-mod_%{name} < 4:5.5.30-2
+sed -i -e 's#modules/libphp[57].so#modules/mod_php.so#g' /etc/httpd/conf.d/*_mod_php.conf
+
# common macros called at extension post/postun scriptlet
%define extension_scripts() \
%post %1 \
@@ -2858,7 +2864,7 @@ fi
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/apache/conf.d/*_mod_php.conf
%dir %{_sysconfdir}/apache.d
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache.ini
-%attr(755,root,root) %{_libdir}/apache1/libphp5.so
+%attr(755,root,root) %{_libdir}/apache1/mod_php.so
%attr(755,root,root) %{_libdir}/apache1/libphp5-*.*.so
%endif
@@ -2868,7 +2874,7 @@ fi
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/httpd/conf.d/*_mod_php.conf
%dir %{_sysconfdir}/apache2handler.d
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-apache2handler.ini
-%attr(755,root,root) %{_libdir}/apache/libphp5.so
+%attr(755,root,root) %{_libdir}/apache/mod_php.so
%attr(755,root,root) %{_libdir}/apache/libphp5-*.*.so
%endif
diff --git a/php-mod_php.conf b/php-mod_php.conf
index a5f5f59..1d26ec6 100644
--- a/php-mod_php.conf
+++ b/php-mod_php.conf
@@ -1,4 +1,4 @@
-LoadModule php5_module modules/libphp5.so
+LoadModule php5_module modules/mod_php.so
<IfModule mod_php5.c>
<Files *.php>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/901e8824e628b5ffc756f872211d495d06d59a7a
More information about the pld-cvs-commit
mailing list