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

[packages/php4.git] / php4.spec

diff --git a/php4.spec b/php4.spec
index b28e1f675786d35b6e4e5bd6745afdf32d59045d..d295ac523f21d72830782fc928d95e852ee5a096 100644 (file)
--- a/php4.spec
+++ b/php4.spec
@@ -48,6 +48,7 @@
 %bcond_with     system_xmlrpc_epi       # use system xmlrpc-epi library (broken on 64bit arches, see http://bugs.php.net/41611)
 %bcond_without xslt            # without XSLT extension module
 %bcond_with    yaz             # without YAZ extension module
+%bcond_with    yp
 %bcond_without apache1         # disable building apache 1.3.x module
 %bcond_without apache2         # disable building apache 2.x module
 %bcond_without fcgi            # disable building FCGI SAPI
@@ -72,7 +73,7 @@
 %undefine      with_msession
 %endif
 
-%define                rel 39
+%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
@@ -118,7 +119,7 @@ Patch19:    %{name}-xmlrpc-fix.patch
 Patch20:       %{name}-libtool.patch
 Patch21:       %{name}-allow-db31.patch
 Patch22:       %{name}-threads-acfix.patch
-Patch23:       %{name}-gmp.patch
+
 Patch24:       %{name}-qt.patch
 Patch25:       %{name}-no_pear_install.patch
 Patch26:       %{name}-zlib.patch
@@ -150,6 +151,9 @@ Patch53:    %{name}-silent-session-cleanup.patch
 Patch54:       %{name}-m4-divert.patch
 Patch55:       %{name}-libpng.patch
 Patch56:       %{name}-gmp.patch
+Patch57:       %{name}-pcre.patch
+Patch58:       %{name}-apache24.patch
+Patch59:       php-bug-68486.patch
 URL:           http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:       Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:  aspell-devel >= 2:0.50.0}
@@ -375,7 +379,6 @@ Summary:    php4 as CLI interpreter
 Summary(pl.UTF-8):     php4 jako interpreter działający z linii poleceń
 Group:         Development/Languages/PHP
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
-Provides:      php-cli = %{epoch}:%{version}-%{release}
 
 %description cli
 php4 as CLI interpreter.
@@ -1591,7 +1594,7 @@ cp php.ini-dist php.ini
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
-# %patch23 -p1
+
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
@@ -1626,6 +1629,9 @@ cp php.ini-dist php.ini
 %patch54 -p1
 %patch55 -p1
 %patch56 -p1
+%patch57 -p1
+%patch58 -p1
+%patch59 -p1
 
 %if %{with hardening}
 zcat %{SOURCE8} | patch -p1
@@ -1741,7 +1747,7 @@ for sapi in $sapis; do
        %{?with_wddx:--enable-wddx=shared} \
        %{!?with_xml:--disable-xml}%{?with_xml:--enable-xml=shared} \
        %{?with_xslt:--enable-xslt=shared} \
-       --enable-yp=shared \
+       %{?with_yp:--enable-yp=shared} \
        --with-bz2=shared \
        %{?with_cpdf:--with-cpdflib=shared} \
        --with-crack=shared \
@@ -1811,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
@@ -1858,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?
@@ -2008,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
 
@@ -2625,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}
@@ -2635,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}
@@ -2690,6 +2713,7 @@ fi
 # FIXME: how exactly this is needed? as it contains libdir for apache1 or apache2
 %{_libdir}/libphp_common.la
 %{_includedir}/php
+%dir %{_libdir}/php
 %{_libdir}/php/build
 %{_mandir}/man1/php-config.1*
 %{_mandir}/man1/phpize.1*
@@ -3149,11 +3173,13 @@ fi
 %attr(755,root,root) %{extensionsdir}/yaz.so
 %endif
 
+%if %{with yp}
 %files yp
 %defattr(644,root,root,755)
 %doc ext/yp/CREDITS
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/yp.ini
 %attr(755,root,root) %{extensionsdir}/yp.so
+%endif
 
 %files zip
 %defattr(644,root,root,755)