Author: arekm Date: Tue Jan 3 14:39:56 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- up to 5.1.2 snap; 5.1.1 is too broken
---- Files affected:
SPECS:
php.spec (1.538 -> 1.539)
---- Diffs:
================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.538 SPECS/php.spec:1.539
--- SPECS/php.spec:1.538 Mon Jan 2 00:25:01 2006
+++ SPECS/php.spec Tue Jan 3 15:39:51 2006
@@ -14,6 +14,7 @@
# - make additional headers added by mail patch configurable
# - apply -hardened patch by default ?
# - modularize session, standard (output from pure php -m)?
+# - fix reflection module to build it statically
#
# Conditional build:
%bcond_with db3 # use db3 packages instead of db (4.x) for
Berkeley DB support
@@ -79,14 +80,15 @@
Summary(ru): PHP ÷ĹŇÓÉÉ 5 - ŃÚŮË ĐŇĹĐŇĎĂĹÓÓÉŇĎ×ÁÎÉŃ HTML-ĆÁĘĚĎ×, ×ŮĐĎĚÎŃĹÍŮĘ
ÎÁ ÓĹŇ×ĹŇĹ
Summary(uk): PHP ÷ĹŇÓŚ§ 5 - ÍĎ×Á ĐŇĹĐŇĎĂĹÓŐ×ÁÎÎŃ HTML-ĆÁĘĚŚ×, ×ÉËĎÎŐ×ÁÎÁ ÎÁ
ÓĹŇ×ĹŇŚ
Name: php
-Version: 5.1.1
-%define _rel 6.3
+Version: 5.1.2
+%define _rel 0.1
Release: %{_rel}%{?with_hardening:hardened}
Epoch: 4
License: PHP
Group: Libraries
-Source0: http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-# Source0-md5: 70a7c90de182d1a1901c390b844153c7
+# Source0: http://www.php.net/distributions/%{name}-%{version}.tar.bz2
+Source0: http://snaps.php.net/php5.1-200601031130.tar.bz2
+# Source0-md5: f47e4528c30fb9865bebdd2ebbf66c8f
Source1: FAQ.%{name}
Source2: zend.gif
Source3: %{name}-module-install
@@ -123,7 +125,6 @@
Patch30: %{name}-hardening-fix.patch
Patch31: %{name}-both-apxs.patch
Patch32: %{name}-builddir.patch
-Patch33: %{name}-libmbfl-shared.patch
Icon: php.gif
URL: http://www.php.net/
%{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel
>= 1.0.2.908-2}}
@@ -1522,7 +1523,7 @@
Moduł PHP umożliwiający używanie kompresji zlib.
%prep
-%setup -q
+%setup -q -n php5.1-200601031130
# this patch is broken by design, breaks --enable-versioning for example
# update: --enable-version is broken by itself, it disables dynamic modules.
%patch0 -p1
@@ -1558,7 +1559,6 @@
%endif
%patch31 -p1
%patch32 -p1
-%patch33 -p1
# conflict seems to be resolved by recode patches
rm -f ext/recode/config9.m4
@@ -1574,7 +1574,7 @@
#rm -rf ext/dba/libflatfile
#rm -rf ext/dba/libinifile
#rm -rf ext/gd/libgd
-rm -rf ext/mbstring/libmbfl
+#rm -rf ext/mbstring/libmbfl
#rm -rf ext/mbstring/oniguruma
rm -rf ext/pcre/pcrelib
rm -rf ext/pdo_sqlite/sqlite
@@ -1672,7 +1672,7 @@
--enable-gd-jus-conf \
--enable-libxml \
--enable-magic-quotes \
- --enable-mbstring=shared,all --with-libmbfl=%{_prefix} \
+ --enable-mbstring=shared,all \
--enable-mbregex \
--enable-pcntl=shared \
--enable-pdo=shared \
@@ -1688,6 +1688,7 @@
%{?with_pgsql:--with-pdo-pgsql=shared} \
%{?with_sqlite:--with-pdo-sqlite=shared,/usr} \
--enable-posix=shared \
+ --disable-reflection \
--enable-session \
--enable-shared \
--enable-shmop=shared \
@@ -1704,7 +1705,7 @@
--enable-ucd-snmp-hack \
%{?with_wddx:--enable-wddx=shared} \
--enable-xml=shared \
- --with-xmlreader=shared \
+ --enable-xmlreader=shared \
--with-bz2=shared \
%{!?with_curl:--without-curl}%{?with_curl:--with-curl=shared} \
%{?with_db3:--with-db3}%{!?with_db3:--with-db4} \
@@ -3076,6 +3077,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.539 2006/01/03 14:39:51 arekm
+- up to 5.1.2 snap; 5.1.1 is too broken
+
Revision 1.538 2006/01/01 23:25:01 glen
- package pdo_firebird
- link pdo-sqlite with shared sqlite
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/php.spec?r1=1.538&r2=1.539&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
