- final 4.3.4 (mbstring fixes already there)

Changed files:
    php.spec -> 1.299

diff --git a/php.spec b/php.spec
index 8a48b55cde932bc0830b6a030ffda6381f38e4ee..5c2b47f36ddf53671efc25712e9d8cc4b74e3efb 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -65,14 +65,13 @@ Summary(ru):        PHP 
 Summary(uk):   PHP ÷ÅÒÓ¦§ 4 -- ÍÏ×Á ÐÒÅÐÒÏÃÅÓÕ×ÁÎÎÑ HTML-ÆÁÊ̦×, ×ÉËÏÎÕ×ÁÎÁ ÎÁ ÓÅÒ×ÅÒ¦
 Name:          php
 Version:       4.3.4
-%define                _rc     RC3
-Release:       0.%{_rc}.1
+Release:       1
 Epoch:         3
 Group:         Libraries
 License:       PHP
 #Source0:      http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-Source0:       http://downloads.php.net/ilia/%{name}-%{version}%{_rc}.tar.bz2
-# Source0-md5: 1ddd270537a798d193ba82a818cc53a7
+Source0:       http://downloads.php.net/ilia/%{name}-%{version}.tar.bz2
+# Source0-md5: b9dd601863e08e52e3c4d5e02c2627cf
 Source1:       FAQ.%{name}
 Source2:       zend.gif
 Source4:       %{name}-module-install
@@ -111,7 +110,6 @@ Patch27:    %{name}-zlib.patch
 Patch28:       %{name}-db-shared.patch
 Patch29:       %{name}-sybase-fix.patch
 Patch30:       %{name}-mssql-fix.patch
-Patch31:       %{name}-mbstring-fixes.patch
 Icon:          php4.gif
 URL:           http://www.php.net/
 %{!?_without_interbase:%{!?_with_interbase_inst:BuildRequires: Firebird-devel >= 1.0.2.908-2}}
@@ -1473,7 +1471,7 @@ PEAR/*.php), dostarczanych z PHP, zainstaluj odpowiednie pakiety
 php-pear-* (php-pear-PEAR, php-pear-Archive_Tar, itp).
 
 %prep
-%setup -q -n %{name}-%{version}%{_rc}
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -1508,7 +1506,6 @@ cp php.ini-dist php.ini
 %patch28 -p1
 %patch29 -p1
 %patch30 -p1
-%patch31 -p1
 
 %build
 CFLAGS="%{rpmcflags} -DEAPI=1 -I/usr/X11R6/include"