SPECS: php.spec - AC-branch merge

[glen]

Author: glen                         Date: Thu Jan 11 00:24:30 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- AC-branch merge

---- Files affected:
SPECS:
   php.spec (1.646 -> 1.647) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.646 SPECS/php.spec:1.647
--- SPECS/php.spec:1.646	Sun Jan  7 19:39:54 2007
+++ SPECS/php.spec	Thu Jan 11 01:24:25 2007
@@ -70,7 +70,7 @@
 %undefine	with_filter
 %endif
 
-%define	_rel 8
+%define	_rel 11
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr):	Le langage de script embarque-HTML PHP
 Summary(pl):	Język skryptowy PHP
@@ -108,6 +108,7 @@
 Patch10:	%{name}-ini.patch
 Patch11:	%{name}-acam.patch
 Patch12:	%{name}-curl.patch
+Patch13:	%{name}-bug-40073.patch
 Patch15:	%{name}-threads-acfix.patch
 Patch16:	%{name}-tsrmlsfetchgcc2.patch
 Patch17:	%{name}-no_pear_install.patch
@@ -1563,6 +1564,9 @@
 # conditionally...
 %patch11 -p1
 %patch12 -p1
+cd ext/exif
+%patch13 -p0
+cd ../../
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
@@ -2287,7 +2291,6 @@
 %doc CREDITS Zend/ZEND_CHANGES
 %doc LICENSE Zend/LICENSE.Zend EXTENSIONS NEWS TODO*
 %doc README.PHP4-TO-PHP5-THIN-CHANGES README.UPDATE_5_2
-%doc README.input_filter
 
 %dir %{_sysconfdir}
 %dir %{_sysconfdir}/conf.d
@@ -2364,6 +2367,7 @@
 %if %{with filter}
 %files filter
 %defattr(644,root,root,755)
+%doc README.input_filter
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/filter.ini
 %attr(755,root,root) %{extensionsdir}/filter.so
 %endif
@@ -2723,6 +2727,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.647  2007/01/11 00:24:25  glen
+- AC-branch merge
+
 Revision 1.646  2007/01/07 18:39:54  qboosh
 - Obsoletes: php-pecl-hash
 
================================================================

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