SPECS: php4.spec - zlib_static bcond until better fix is available

[glen]

Author: glen                         Date: Fri Jan  6 14:59:29 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- zlib_static bcond until better fix is available

---- Files affected:
SPECS:
   php4.spec (1.510 -> 1.511) 

---- Diffs:

================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.510 SPECS/php4.spec:1.511
--- SPECS/php4.spec:1.510	Thu Jan  5 23:05:17 2006
+++ SPECS/php4.spec	Fri Jan  6 15:59:24 2006
@@ -51,7 +51,7 @@
 %bcond_without	apache1		# disable building apache 1.3.x module
 %bcond_without	apache2		# disable building apache 2.x module
 %bcond_without	zts		# disable experimental-zts
-
+%bcond_with	zlib_static	# build zlib static. needed for getimagesize() to understand flash6 files
 %define apxs1		/usr/sbin/apxs1
 %define	apxs2		/usr/sbin/apxs
 
@@ -1850,8 +1850,7 @@
 	%{?with_xslt:--with-xslt-sablot=shared} \
 	%{?with_yaz:--with-yaz=shared} \
 	--with-zip=shared \
-	--with-zlib=shared \
-	--with-zlib-dir=shared,/usr
+	--with-zlib%{!?with_zlib_static:=shared} --with-zlib-dir=shared,/usr
 
 	cp -f Makefile Makefile.$sapi
 
@@ -2499,11 +2498,13 @@
 %postun zip
 %extension_postun
 
+%if %{without zlib_static}
 %post zlib
 %extension_post
 
 %postun zlib
 %extension_postun
+%endif
 
 # openssl trigger on common package. it removes shared openssl module from php.ini, if it was there.
 %triggerun common -- %{name}-openssl < 3:4.4.0-4
@@ -3246,8 +3247,10 @@
 %files zlib
 %defattr(644,root,root,755)
 %doc ext/zlib/CREDITS
+%if %{without zlib_static}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/zlib.ini
 %attr(755,root,root) %{extensionsdir}/zlib.so
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -3255,6 +3258,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.511  2006/01/06 14:59:24  glen
+- zlib_static bcond until better fix is available
+
 Revision 1.510  2006/01/05 22:05:17  glen
 - merge from php.spec: wddx module needs xml module loaded first
 
================================================================

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