SPECS (AC-branch): php.spec - merged obsoletes for php-pecl-filter...

[glen]

Author: glen                         Date: Thu Dec 14 00:31:43 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged obsoletes for php-pecl-filter, php-pecl-json, php-pecl-xmlwriter, php-pecl-zip from HEAD
- added --sysconfdir to php-config

---- Files affected:
SPECS:
   php.spec (1.631.2.1 -> 1.631.2.2) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.631.2.1 SPECS/php.spec:1.631.2.2
--- SPECS/php.spec:1.631.2.1	Wed Dec 13 22:10:46 2006
+++ SPECS/php.spec	Thu Dec 14 01:31:38 2006
@@ -71,7 +71,7 @@
 %undefine	with_filter
 %endif
 
-%define	_rel 1
+%define	_rel 3
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr):	Le langage de script embarque-HTML PHP
 Summary(pl):	Język skryptowy PHP
@@ -129,6 +129,7 @@
 Patch38:	%{name}-memory-limit.patch
 Patch39:	%{name}-pear.patch
 Patch40:	%{name}-db4.5.patch
+Patch41:	%{name}-config-dir.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}
@@ -600,6 +601,7 @@
 Group:		Libraries
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(filter)
+Obsoletes:	php-pecl-filter
 
 %description filter
 We all know that you should always check input variables, but PHP does
@@ -743,6 +745,7 @@
 Group:		Libraries
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(json)
+Obsoletes:	php-pecl-json
 
 %description json
 php-json is an extremely fast PHP C extension for JSON (JavaScript
@@ -1482,6 +1485,7 @@
 Group:		Libraries
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(xmlwriter)
+Obsoletes:	php-pecl-xmlwriter
 
 %description xmlwriter
 This extension wraps the libxml xmlWriter API. Represents a writer
@@ -1516,6 +1520,7 @@
 Group:		Libraries
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Provides:	php(zip)
+Obsoletes:	php-pecl-zip
 
 %description zip
 Zip is an extension to create, modify and read zip files.
@@ -1583,6 +1588,7 @@
 %endif
 %patch39 -p1
 %patch40 -p1
+%patch41 -p1
 
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4
@@ -2712,6 +2718,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.631.2.2  2006/12/14 00:31:38  glen
+- merged obsoletes for php-pecl-filter, php-pecl-json, php-pecl-xmlwriter, php-pecl-zip from HEAD
+- added --sysconfdir to php-config
+
 Revision 1.631.2.1  2006/12/13 21:10:46  glen
 - interbase on for AC
 
================================================================

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