SPECS: php.spec - rel 17; fix bug 33720 (mbstring)

[arekm]

Author: arekm                        Date: Wed Nov 16 11:07:26 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 17; fix bug 33720 (mbstring)

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

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.510 SPECS/php.spec:1.511
--- SPECS/php.spec:1.510	Tue Nov  8 19:34:21 2005
+++ SPECS/php.spec	Wed Nov 16 12:07:20 2005
@@ -84,13 +84,11 @@
 Summary(uk):	PHP ÷ĹŇÓŚ§ 5 - ÍĎ×Á ĐŇĹĐŇĎĂĹÓŐ×ÁÎÎŃ HTML-ĆÁĘĚŚ×, ×ÉËĎÎŐ×ÁÎÁ ÎÁ ÓĹŇ×ĹŇŚ
 Name:		php
 Version:	5.0.5
-#define	_snap	200510281645
-%define	_rel	16
-Release:	%{?_snap:12.11.%{_snap}.}%{_rel}%{?with_hardening:hardened}
+%define	_rel	17
+Release:	%{_rel}%{?with_hardening:hardened}
 Epoch:		4
 Group:		Libraries
 License:	PHP
-#Source0:	http://snaps.php.net/%{name}5-STABLE-%{_snap}.tar.bz2
 Source0:	http://www.php.net/distributions/%{name}-%{version}.tar.bz2
 # Source0-md5:	b5d4ca75bbb11ee5b830fa67213d9f7f
 Source1:	FAQ.%{name}
@@ -138,6 +136,7 @@
 Patch32:	%{name}_bug34435.patch
 Patch33:	%{name}-ftp-ssllibs.patch
 Patch34:	%{name}-bug-35009.patch
+Patch35:	%{name}-bug-33720.patch
 Icon:		php.gif
 URL:		http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
@@ -1490,7 +1489,7 @@
 Moduł PHP umożliwiający używanie kompresji zlib.
 
 %prep
-%setup -q %{?_snap:-n php5-STABLE-%{_snap}}
+%setup -q
 # this patch is broken by design, breaks --enable-versioning for example
 # update: --enable-version is broken by itself, it disables dynamic modules.
 %patch0 -p1
@@ -1534,9 +1533,10 @@
 %endif
 %patch30 -p1
 %patch31 -p1
-%{!?_snap:%patch32 -p0}
+%patch32 -p0
 %patch33 -p1
 %patch34 -p1
+%patch35 -p1
 
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4
@@ -3025,6 +3025,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.511  2005/11/16 11:07:20  arekm
+- rel 17; fix bug 33720 (mbstring)
+
 Revision 1.510  2005/11/08 18:34:21  glen
 - fix #35009: ZTS: Persistent resource destruct crashes when extension is compiled as shared
 - rel 16
================================================================

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