SPECS (DEVEL): php4.spec - cosmetics

[glen]

Author: glen                         Date: Sat Jul  9 19:21:23 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- cosmetics

---- Files affected:
SPECS:
   php4.spec (1.421.2.3.2.29 -> 1.421.2.3.2.30) 

---- Diffs:

================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.421.2.3.2.29 SPECS/php4.spec:1.421.2.3.2.30
--- SPECS/php4.spec:1.421.2.3.2.29	Sat Jul  9 21:18:01 2005
+++ SPECS/php4.spec	Sat Jul  9 21:21:18 2005
@@ -201,15 +201,14 @@
 BuildRequires:	zip
 BuildRequires:	zlib-devel >= 1.0.9
 BuildRequires:	zziplib-devel
-# apache 1.3 vs apache 2.0
+%if %{with apache1}
+BuildRequires:	apache1-devel >= 1.3.33-2
+%endif
 %if %{with apache2}
 BuildRequires:	apache-devel >= 2.0.52-2
 BuildRequires:	apr-devel >= 1:1.0.0
 BuildRequires:	apr-util-devel >= 1:1.0.0
 %endif
-%if %{with apache1}
-BuildRequires:	apache1-devel >= 1.3.33-2
-%endif
 PreReq:		%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php = %{epoch}:%{version}-%{release}
 Obsoletes:	phpfi
@@ -1663,7 +1662,6 @@
 apxs2
 %endif
 "
-
 # Apache2 CFLAGS. should be harmless for other SAPIs.
 CFLAGS="$CFLAGS $(%{_bindir}/apr-1-config --cppflags --includes) $(%{_bindir}/apu-1-config --includes)"
 
@@ -1826,7 +1824,6 @@
 # for fcgi: -DDISCARD_PATH=0 -DENABLE_PATHINFO_CHECK=1 -DFORCE_CGI_REDIRECT=0
 # -DHAVE_FILENO_PROTO=1 -DHAVE_FPOS=1 -DHAVE_LIBNSL=1(die) -DHAVE_SYS_PARAM_H=1
 # -DPHP_FASTCGI=1 -DPHP_FCGI_STATIC=1 -DPHP_WRITE_STDOUT=1
-
 %{__make} sapi/cgi/php -f Makefile.fcgi \
 	CFLAGS_CLEAN="%{rpmcflags} -DDISCARD_PATH=0 -DENABLE_PATHINFO_CHECK=1 -DFORCE_CGI_REDIRECT=0 -DHAVE_FILENO_PROTO=1 -DHAVE_FPOS=1 -DHAVE_LIBNSL=1 -DHAVE_SYS_PARAM_H=1 -DPHP_FASTCGI=1 -DPHP_FCGI_STATIC=1 -DPHP_WRITE_STDOUT=1"
 cp -r sapi/cgi sapi/fcgi
@@ -1835,10 +1832,10 @@
 # notes:
 # -DENABLE_CHROOT_FUNC=1 (cgi,fcgi) is used in ext/standard/dir.c (libphp_common)
 # -DPHP_WRITE_STDOUT is used also for cli, but not set by its config.m4
-
 %{__make} sapi/cgi/php -f Makefile.cgi \
 	CFLAGS_CLEAN="%{rpmcflags} -DDISCARD_PATH=1 -DENABLE_PATHINFO_CHECK=1 -DFORCE_CGI_REDIRECT=0 -DPHP_WRITE_STDOUT=1"
 
+# CLI
 %{__make} sapi/cli/php -f Makefile.cli
 
 %install
@@ -2923,6 +2920,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.421.2.3.2.30  2005/07/09 19:21:18  glen
+- cosmetics
+
 Revision 1.421.2.3.2.29  2005/07/09 19:18:01  glen
 - update from HEAD: Hardening patch updated to 0.3.1
 
================================================================

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