Author: glen Date: Sat Apr 15 23:06:02 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- versioning bcond
- clean linkflags from CFLAGS
---- Files affected:
SPECS:
php.spec (1.563 -> 1.564)
---- Diffs:
================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.563 SPECS/php.spec:1.564
--- SPECS/php.spec:1.563 Sat Apr 1 19:34:06 2006
+++ SPECS/php.spec Sun Apr 16 01:05:56 2006
@@ -50,6 +50,7 @@
%bcond_without apache2 # disable building apache 2.x module
%bcond_without fcgi # disable building FCGI SAPI
%bcond_without zts # disable experimental-zts
+%bcond_with versioning # build with experimental versioning
(to load php4/php5 into same apache)
%define apxs1 /usr/sbin/apxs1
%define apxs2 /usr/sbin/apxs
@@ -80,7 +81,7 @@
Summary(uk): PHP ÷ĹŇÓŚ§ 5 - ÍĎ×Á ĐŇĹĐŇĎĂĹÓŐ×ÁÎÎŃ HTML-ĆÁĘĚŚ×, ×ÉËĎÎŐ×ÁÎÁ ÎÁ
ÓĹŇ×ĹŇŚ
Name: php
Version: 5.1.2
-%define _rel 8
+%define _rel 8.4
Release: %{_rel}%{?with_hardening:hardened}
Epoch: 4
License: PHP
@@ -130,6 +131,8 @@
# The case with threaded MPMs is lost even without this hack.
# http://bugs.php.net/bug.php?id=36152
Patch35: %{name}-openssl-huge-hack.patch
+Patch36: %{name}-versioning.patch
+Patch37: %{name}-linkflags-clean.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}
@@ -1538,8 +1541,7 @@
%prep
%setup -q
-# this patch is broken by design, breaks --enable-versioning for example
-# update: --enable-version is broken by itself, it disables dynamic modules.
+%patch37 -p1
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -1577,6 +1579,7 @@
%patch33 -p1
%patch34 -p1
%patch35 -p1
+%{?with_versioning:%patch36 -p1}
# conflict seems to be resolved by recode patches
rm -f ext/recode/config9.m4
@@ -3085,6 +3088,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.564 2006/04/15 23:05:56 glen
+- versioning bcond
+- clean linkflags from CFLAGS
+
Revision 1.563 2006/04/01 17:34:06 glen
- obsolete PDO* for pdo packages (they are the same, pecl ones are usually way
behind)
- rel 8
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/php.spec?r1=1.563&r2=1.564&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
