SPECS: php.spec - release 5

[adamg]

Author: adamg                        Date: Wed Sep 14 15:25:24 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- release 5

---- Files affected:
SPECS:
   php.spec (1.477 -> 1.478) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.477 SPECS/php.spec:1.478
--- SPECS/php.spec:1.477	Wed Sep 14 16:19:35 2005
+++ SPECS/php.spec	Wed Sep 14 17:25:17 2005
@@ -78,7 +78,7 @@
 Summary(uk):	PHP ÷ĹŇÓŚ§ 5 - ÍĎ×Á ĐŇĹĐŇĎĂĹÓŐ×ÁÎÎŃ HTML-ĆÁĘĚŚ×, ×ÉËĎÎŐ×ÁÎÁ ÎÁ ÓĹŇ×ĹŇŚ
 Name:		php
 Version:	5.0.5
-Release:	4.1%{?with_hardening:hardened}
+Release:	5%{?with_hardening:hardened}
 Epoch:		4
 Group:		Libraries
 License:	PHP
@@ -124,10 +124,9 @@
 Patch27:	%{name}-install_gd_headers.patch
 Patch28:	%{name}-cpdf-fix.patch
 Patch29:	%{name}-gcc4.patch
-Patch30:	%{name}-hardening-fix.patch
-Patch31:	%{name}-both-apxs.patch
-Patch32:	%{name}-builddir.patch
-Patch33:	%{name}_bug34435.patch
+Patch30:	%{name}-both-apxs.patch
+Patch31:	%{name}-builddir.patch
+Patch32:	%{name}_bug34435.patch
 Icon:		php.gif
 URL:		http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
@@ -1483,11 +1482,10 @@
 
 %if %{with hardening}
 zcat %{SOURCE9} | patch -p1
-#patch -p1 < %{PATCH30}
 %endif
+%patch30 -p1
 %patch31 -p1
-%patch32 -p1
-%patch33 -p0
+%patch32 -p0
 
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4
@@ -2921,6 +2919,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.478  2005/09/14 15:25:17  adamg
+- release 5
+
 Revision 1.477  2005/09/14 14:19:35  adamg
 - hardening patch updated to 5.0.5-0.4.3; -hardening-fix.patch disabled
 
================================================================

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