Author: glen                         Date: Fri Jan 13 09:45:40 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix older triggers, --enable-inline-optimization

---- Files affected:
SPECS:
   php4.spec (1.514 -> 1.515) 

---- Diffs:

================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.514 SPECS/php4.spec:1.515
--- SPECS/php4.spec:1.514       Sun Jan  8 00:41:28 2006
+++ SPECS/php4.spec     Fri Jan 13 10:45:35 2006
@@ -1758,6 +1758,7 @@
        --with-exec-dir=%{_bindir} \
        --%{!?debug:dis}%{?debug:en}able-debug \
        %{?with_zts:--enable-experimental-zts} \
+       --enable-inline-optimization \
        --enable-shared \
        --disable-static \
        --enable-magic-quotes \
@@ -2036,14 +2037,7 @@
 [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart
 
 %if %{with apache2}
-%triggerpostun -- php4 < 3:4.3.11-4.16
-# 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
-# extra trigger, if they did not upgrade to 3:4.4.0-2 but still had old 
php-apache.ini
-%triggerpostun -n apache-mod_php4 -- apache-mod_php4 < 3:4.4.0-2.16
+%triggerpostun -n apache-mod_php4 -- apache-mod_php4 < 3:4.4.0-2.16, php4 < 
3:4.3.11-4.16
 # 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}
@@ -3254,6 +3248,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.515  2006/01/13 09:45:35  glen
+- fix older triggers, --enable-inline-optimization
+
 Revision 1.514  2006/01/07 23:41:28  glen
 - apache modules api dep should be sufficent
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php4.spec?r1=1.514&r2=1.515&f=u

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to