packages: php/php.spec - revert rev1.954 - causes segfaults in zip file pro...

[adamg]

Author: adamg                        Date: Mon Oct 24 20:16:20 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- revert rev1.954 - causes segfaults in zip file processing; rel 9

---- Files affected:
packages/php:
   php.spec (1.960 -> 1.961) 

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.960 packages/php/php.spec:1.961
--- packages/php/php.spec:1.960	Tue Oct 18 18:07:47 2011
+++ packages/php/php.spec	Mon Oct 24 22:16:15 2011
@@ -110,7 +110,7 @@
 %undefine	with_filter
 %endif
 
-%define		rel	8
+%define		rel	9
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -195,8 +195,6 @@
 Patch62:	mcrypt-libs.patch
 Patch63:	%{name}-mysql-nowarning.patch
 Patch64:	%{name}-m4.patch
-# http://spot.fedorapeople.org/php-5.3.6-libzip.patch
-Patch65:	system-libzip.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}
@@ -211,7 +209,6 @@
 #BuildRequires:	fcgi-devel
 #BuildRequires:	flex
 %{?with_kerberos5:BuildRequires:	heimdal-devel}
-BuildRequires:	libzip-devel >= 0.10-3
 BuildRequires:	mysql-devel
 BuildRequires:	pkgconfig
 BuildRequires:	sed >= 4.0
@@ -1797,7 +1794,6 @@
 Group:		Libraries
 URL:		http://www.php.net/manual/en/book.zip.php
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-Requires:	libzip >= 0.10-3
 Provides:	php(zip)
 Obsoletes:	php-pecl-zip
 
@@ -1894,7 +1890,6 @@
 %patch62 -p1
 %patch63 -p1
 %patch64 -p1
-%patch65 -p1
 %{__rm} -r sapi/litespeed
 gzip -dc %{SOURCE15} | tar xf - -C sapi/
 
@@ -2140,7 +2135,6 @@
 	--with-xsl=shared \
 	--with-zlib=shared \
 	--with-zlib-dir=shared,/usr \
-	--with-libzip \
 	--enable-zip=shared,/usr \
 
 	# save for debug
@@ -3218,6 +3212,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.961  2011/10/24 20:16:15  adamg
+- revert rev1.954 - causes segfaults in zip file processing; rel 9
+
 Revision 1.960  2011/10/18 16:07:47  glen
 - ac fix
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.960&r2=1.961&f=u