From 8938ce4fd0ce44e7ae6bf3f7a8f888b6dfff7a49 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Sat, 15 Apr 2006 23:05:56 +0000
Subject: [PATCH] - versioning bcond - clean linkflags from CFLAGS

Changed files:
    php.spec -> 1.564
---
 php.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/php.spec b/php.spec
index 99ef28e..48e8bf5 100644
--- a/php.spec
+++ b/php.spec
@@ -49,6 +49,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
@@ -79,7 +80,7 @@ Summary(ru):	PHP 
 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
@@ -129,6 +130,8 @@ Patch34:	%{name}-ini-search-path.patch
 # 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}
@@ -1537,8 +1540,7 @@ Modu
 
 %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
@@ -1576,6 +1578,7 @@ patch -p1 < %{PATCH30} || exit 1
 %patch33 -p1
 %patch34 -p1
 %patch35 -p1
+%{?with_versioning:%patch36 -p1}
 
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4
-- 
2.44.0