Author: glen Date: Fri Mar 2 10:11:44 2012 GMT Module: packages Tag: DEVEL ---- Log message: - cvs ci -m '- up to 5.4.0-RELEASE (still NFY, so don't attempt to merge it anywhere)
---- Files affected: packages/php: bug-52078-fileinode.patch (1.5 -> 1.5.2.1) , php.spec (1.945.2.11 -> 1.945.2.12) ---- Diffs: ================================================================ Index: packages/php/bug-52078-fileinode.patch diff -u packages/php/bug-52078-fileinode.patch:1.5 packages/php/bug-52078-fileinode.patch:1.5.2.1 --- packages/php/bug-52078-fileinode.patch:1.5 Sun Dec 12 22:00:01 2010 +++ packages/php/bug-52078-fileinode.patch Fri Mar 2 11:11:38 2012 @@ -1,24 +1,3 @@ ---- php-5.2.13/ext/standard/tests/file/fileinode_variation3.phpt~ 2008-11-25 13:33:41.000000000 +0200 -+++ php-5.2.13/ext/standard/tests/file/fileinode_variation3.phpt 2010-06-14 00:23:51.340272864 +0300 -@@ -57,15 +57,15 @@ - --EXPECTF-- - *** Testing fileinode() with different notations of file names *** - - Iteration 1 - --int(%d) -+int(%i) - - Iteration 2 - - - Warning: fileinode(): stat failed for %s//fileinode_variation3/fileinode_variation3.tmp/ in %s on line %d - bool(false) - - Iteration 3 - --int(%d) -+int(%i) - - Iteration 4 - --int(%d) -+int(%i) - - Iteration 5 - - - Warning: fileinode(): stat failed for %s//fileinode_variation3/*.tmp in %s on line %d --- php-5.3.3/ext/standard/tests/file/fileinode_basic.phpt~ 2007-11-05 19:43:21.000000000 +0200 +++ php-5.3.3/ext/standard/tests/file/fileinode_basic.phpt 2010-07-26 19:31:43.613553760 +0300 @@ -28,9 +28,9 @@ ================================================================ Index: packages/php/php.spec diff -u packages/php/php.spec:1.945.2.11 packages/php/php.spec:1.945.2.12 --- packages/php/php.spec:1.945.2.11 Wed Feb 8 13:10:55 2012 +++ packages/php/php.spec Fri Mar 2 11:11:38 2012 @@ -123,7 +123,7 @@ %undefine with_filter %endif -%define rel 0.8 +%define rel 0.9 Summary: PHP: Hypertext Preprocessor Summary(fr.UTF-8): Le langage de script embarque-HTML PHP Summary(pl.UTF-8): Język skryptowy PHP @@ -136,9 +136,8 @@ Epoch: 4 License: PHP Group: Libraries -#Source0: http://www.php.net/distributions/%{name}-%{version}.tar.bz2 -Source0: http://downloads.php.net/stas/%{name}-%{version}RC7.tar.bz2 -# Source0-md5: 83e759b0eb87ebdf0124d64361daaf54 +Source0: http://www.php.net/distributions/%{name}-%{version}.tar.bz2 +# Source0-md5: 04bb6f9d71ea86ba05685439d50db074 Source2: %{name}-mod_%{name}.conf Source3: %{name}-cgi-fcgi.ini Source4: %{name}-apache.ini @@ -312,7 +311,7 @@ # Extension versions %define bz2ver 1.0 %define enchantver 1.1.0 -%define fileinfover 1.0.5-dev +%define fileinfover 1.0.5 %define hashver 1.0 %define intlver 1.1.0 %define jsonver 1.2.1 @@ -1855,7 +1854,7 @@ Moduł PHP umożliwiający używanie kompresji zlib. %prep -%setup -q -n %{name}-%{version}RC7 +%setup -q # prep for suhosin patch %undos Zend/Zend.dsp Zend/ZendTS.dsp %patch0 -p1 @@ -3286,6 +3285,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.945.2.12 2012/03/02 10:11:38 glen +- cvs ci -m '- up to 5.4.0-RELEASE (still NFY, so don't attempt to merge it anywhere) + Revision 1.945.2.11 2012/02/08 12:10:55 glen - up to 5.4.0RC7 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/bug-52078-fileinode.patch?r1=1.5&r2=1.5.2.1&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.945.2.11&r2=1.945.2.12&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
