SPECS: php.spec - add kolab patches (annotations, myrights); rel 4

[glen]

Author: glen                         Date: Tue Mar 17 10:08:52 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add kolab patches (annotations, myrights); rel 4

---- Files affected:
SPECS:
   php.spec (1.785 -> 1.786) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.785 SPECS/php.spec:1.786
--- SPECS/php.spec:1.785	Mon Mar 16 20:58:57 2009
+++ SPECS/php.spec	Tue Mar 17 11:08:46 2009
@@ -84,7 +84,7 @@
 %undefine	with_filter
 %endif
 
-%define		rel 3
+%define		rel 4
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -157,6 +157,8 @@
 # drop when http://bugs.php.net/bug.php?id=45996 solved
 Patch43:	%{name}-xml-force-expat.patch
 Patch44:	%{name}-include_path.patch
+Patch45:	%{name}-imap-annotations.patch
+Patch46:	%{name}-imap-myrights.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}
@@ -187,7 +189,7 @@
 %endif
 BuildRequires:	gdbm-devel
 BuildRequires:	gmp-devel
-%{?with_imap:BuildRequires:	imap-devel >= 1:2001-0.BETA.200107022325.2}
+%{?with_imap:BuildRequires:	imap-devel >= 1:2007e-2}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libltdl-devel >= 1.4
 BuildRequires:	libmcrypt-devel >= 2.4.4
@@ -1683,6 +1685,8 @@
 
 %patch43 -p1
 %patch44 -p1
+%patch45 -p1
+%patch46 -p1
 
 # conflict seems to be resolved by recode patches
 rm -f ext/recode/config9.m4
@@ -2887,6 +2891,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.786  2009/03/17 10:08:46  glen
+- add kolab patches (annotations, myrights); rel 4
+
 Revision 1.785  2009/03/16 19:58:57  arekm
 - rel 3; use internal gd (enables few more php gd functions)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php.spec?r1=1.785&r2=1.786&f=u