Author: hawk Date: Fri May 26 09:05:58 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- added fix for CLI SEGVs with tidy or sybase_ct enabled
- renumbered patches, cleanup
- release 2
---- Files affected:
SPECS:
php.spec (1.575 -> 1.576)
---- Diffs:
================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.575 SPECS/php.spec:1.576
--- SPECS/php.spec:1.575 Mon May 8 20:04:29 2006
+++ SPECS/php.spec Fri May 26 11:05:52 2006
@@ -67,7 +67,7 @@
ERROR: You need to select at least one Apache SAPI to build shared modules.
%endif
-%define _rel 1
+%define _rel 2
Summary: PHP: Hypertext Preprocessor
Summary(fr): Le langage de script embarque-HTML PHP
Summary(pl): Język skryptowy PHP
@@ -96,7 +96,6 @@
Patch2: %{name}-mail.patch
Patch3: %{name}-link-libs.patch
Patch4: %{name}-libpq_fs_h_path.patch
-
Patch6: %{name}-build_modules.patch
Patch7: %{name}-sapi-ini-file.patch
Patch8: %{name}-no-metaccld.patch
@@ -120,9 +119,9 @@
Patch32: %{name}-builddir.patch
Patch33: %{name}-zlib-for-getimagesize.patch
Patch34: %{name}-ini-search-path.patch
-
-Patch36: %{name}-versioning.patch
-Patch37: %{name}-linkflags-clean.patch
+Patch35: %{name}-versioning.patch
+Patch36: %{name}-linkflags-clean.patch
+Patch37: %{name}-cli-segv-fixes.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}
@@ -1509,7 +1508,7 @@
%prep
%setup -q
-%patch37 -p1
+%patch36 -p1
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -1546,7 +1545,8 @@
%patch32 -p1
%patch33 -p1
%patch34 -p1
-%{?with_versioning:%patch36 -p1}
+%{?with_versioning:%patch35 -p1}
+%patch37 -p1
# conflict seems to be resolved by recode patches
rm -f ext/recode/config9.m4
@@ -2999,6 +2999,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.576 2006/05/26 09:05:52 hawk
+- added fix for CLI SEGVs with tidy or sybase_ct enabled
+- renumbered patches, cleanup
+- release 2
+
Revision 1.575 2006/05/08 18:04:29 glen
- openssl-huge-hack.patch dropped (unable to reproduce)
- rel 1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/php.spec?r1=1.575&r2=1.576&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
