- cvs ci -m '- up to 5.4.0-RELEASE (still NFY, so don't attempt to merge it anywhere)

Changed files:
    bug-52078-fileinode.patch -> 1.5.2.1
    php.spec -> 1.945.2.12

diff --git a/bug-52078-fileinode.patch b/bug-52078-fileinode.patch
index 151f4ed07a30c512e72e890cf97879e355a1cf92..0fd016326bb1f7ddddf78907c28fd3aefb2dce0e 100644 (file)
--- a/bug-52078-fileinode.patch
+++ b/bug-52078-fileinode.patch
@@ -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 @@

diff --git a/php.spec b/php.spec
index c00b5264ce5942187c4719303d37420187bdb4a3..e8956af08ab4bb299d037b894932c70d572bc945 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -122,7 +122,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %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
@@ -135,9 +135,8 @@ Release:    %{rel}%{?with_type_hints:.th}%{?with_oci8:.oci}
 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
@@ -311,7 +310,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # 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
@@ -1854,7 +1853,7 @@ compression support to PHP.
 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