SPECS: php4.spec - cosmetics

[glen]

Author: glen                         Date: Fri Aug 12 18:17:55 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cosmetics

---- Files affected:
SPECS:
   php4.spec (1.461 -> 1.462) 

---- Diffs:

================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.461 SPECS/php4.spec:1.462
--- SPECS/php4.spec:1.461	Tue Aug  9 16:21:14 2005
+++ SPECS/php4.spec	Fri Aug 12 20:17:49 2005
@@ -1631,14 +1631,18 @@
 
 %build
 CFLAGS="%{rpmcflags} -DEAPI=1 -I/usr/X11R6/include"
+%if %{with apache2}
+# Apache2 CFLAGS. harmless for other SAPIs.
+CFLAGS="$CFLAGS $(%{_bindir}/apr-1-config --cppflags --includes) $(%{_bindir}/apu-1-config --includes)"
+%endif
 
 EXTENSION_DIR="%{extensionsdir}"; export EXTENSION_DIR
 if [ ! -f _built-conf ]; then # configure once (for faster debugging purposes)
-./buildconf --force
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-touch _built-conf
+	./buildconf --force
+	%{__libtoolize}
+	%{__aclocal}
+	%{__autoconf}
+	touch _built-conf
 fi
 PROG_SENDMAIL="/usr/lib/sendmail"; export PROG_SENDMAIL
 
@@ -1651,11 +1655,6 @@
 apxs2
 %endif
 "
-%if %{with apache2}
-# Apache2 CFLAGS. harmless for other SAPIs.
-CFLAGS="$CFLAGS $(%{_bindir}/apr-1-config --cppflags --includes) $(%{_bindir}/apu-1-config --includes)"
-%endif
-
 for sapi in $sapis; do
 	[ -f Makefile.$sapi ] && continue # skip if already configured (for faster debugging purposes)
 
@@ -1923,7 +1922,13 @@
 %postun	common -p /sbin/ldconfig
 
 %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 -- 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
+%triggerpostun -n apache-mod_php4 -- apache-mod_php4 < 3:4.4.0-2.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}
@@ -2454,8 +2459,8 @@
 %files -n apache1-mod_php4
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/apache/conf.d/*_mod_php4.conf
-%attr(755,root,root) %{_libdir}/apache1/libphp4.so
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-apache.ini
+%attr(755,root,root) %{_libdir}/apache1/libphp4.so
 /home/services/apache/icons/*
 %endif
 
@@ -2463,8 +2468,8 @@
 %files -n apache-mod_php4
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/httpd/httpd.conf/*_mod_php4.conf
-%attr(755,root,root) %{_libdir}/apache/libphp4.so
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php-apache2handler.ini
+%attr(755,root,root) %{_libdir}/apache/libphp4.so
 /home/services/httpd/icons/*
 %endif
 
@@ -2921,6 +2926,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.462  2005/08/12 18:17:49  glen
+- cosmetics
+
 Revision 1.461  2005/08/09 14:21:14  glen
 - proper openssl trigger
 
@@ -2953,7 +2961,7 @@
   - removed obsolete TODO, TODO corrections
 
 Revision 1.453  2005/07/13 11:28:19  arekm
-- rel2; fix phpize
+- rel 2; fix phpize
 
 Revision 1.452  2005/07/12 06:09:26  arekm
 - rel 1
@@ -3102,7 +3110,7 @@
 
 Revision 1.407  2004/12/28 01:16:20  adamg
 - epoch bumped to 3 (see
-  http://lists.pld-linux.org/pipermail/pld-devel-en/2004-December/003522.html(
+  http://lists.pld-linux.org/pipermail/pld-devel-en/2004-December/003522.html)
 
 Revision 1.406  2004/12/26 20:16:08  qboosh
 - added mail patch todo
@@ -3166,7 +3174,7 @@
 
 Revision 1.390  2004/12/02 16:59:10  baggins
 - release 2.2
-- building opennsl ext as shared DLO is pointless - you get no SSL
+- building openssl ext as shared DLO is pointless - you get no SSL
   functionality in php, so build it built in and now it works
 
 Revision 1.389  2004/12/02 13:34:20  baggins
================================================================

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