rpms/php-pear-PHP-CompatInfo/devel PHP_CompatInfo-path.patch, 1.1, 1.2 php-pear-PHP-CompatInfo.spec, 1.15, 1.16
Remi Collet
remi at fedoraproject.org
Sun Jan 24 17:13:09 UTC 2010
Author: remi
Update of /cvs/pkgs/rpms/php-pear-PHP-CompatInfo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24590
Modified Files:
PHP_CompatInfo-path.patch php-pear-PHP-CompatInfo.spec
Log Message:
improved php 5.3.0 patch
PHP_CompatInfo-path.patch:
php-pear-PHP-CompatInfo.xml | 2 +-
scripts/configure.php | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
Index: PHP_CompatInfo-path.patch
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-PHP-CompatInfo/devel/PHP_CompatInfo-path.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- PHP_CompatInfo-path.patch 24 Jan 2010 10:32:03 -0000 1.1
+++ PHP_CompatInfo-path.patch 24 Jan 2010 17:13:09 -0000 1.2
@@ -1,18 +1,18 @@
diff -up PHP_CompatInfo-1.9.0/php-pear-PHP-CompatInfo.xml.scriptspath PHP_CompatInfo-1.9.0/php-pear-PHP-CompatInfo.xml
--- PHP_CompatInfo-1.9.0/php-pear-PHP-CompatInfo.xml.scriptspath 2009-01-19 11:09:40.000000000 +0100
-+++ PHP_CompatInfo-1.9.0/php-pear-PHP-CompatInfo.xml 2010-01-24 11:05:36.000000000 +0100
++++ PHP_CompatInfo-1.9.0/php-pear-PHP-CompatInfo.xml 2010-01-24 17:51:28.000000000 +0100
@@ -220,7 +220,7 @@ which shows which functions require whic
<tasks:replace from="@php_bin@" to="php_bin" type="pear-config" />
<tasks:replace from="@bin_dir@" to="bin_dir" type="pear-config" />
</file>
- <file baseinstalldir="" md5sum="0a0b44b17894b65a27bd39bb68dccf22" name="scripts/configure.php" role="script">
-+ <file baseinstalldir="" md5sum="cb4a1b3b216d72534ff66c2b7aaa226d" name="scripts/configure.php" role="script">
++ <file baseinstalldir="" md5sum="e1b0f3961c3f35b2b75e627c10c27828" name="scripts/configure.php" role="script">
<tasks:unixeol />
<tasks:replace from="@php_bin@" to="php_bin" type="pear-config" />
<tasks:replace from="@php_dir@" to="php_dir" type="pear-config" />
diff -up PHP_CompatInfo-1.9.0/scripts/configure.php.scriptspath PHP_CompatInfo-1.9.0/scripts/configure.php
--- PHP_CompatInfo-1.9.0/scripts/configure.php.scriptspath 2009-01-19 11:09:38.000000000 +0100
-+++ PHP_CompatInfo-1.9.0/scripts/configure.php 2010-01-24 11:04:06.000000000 +0100
++++ PHP_CompatInfo-1.9.0/scripts/configure.php 2010-01-24 17:56:31.000000000 +0100
@@ -150,7 +150,7 @@ if ($args->isDefined('x')) {
exit(1);
}
@@ -22,20 +22,27 @@ diff -up PHP_CompatInfo-1.9.0/scripts/co
}
$const_glob_list = array();
-@@ -158,7 +158,11 @@ $class_glob_list = array();
- $func_glob_list = array();
+@@ -169,7 +169,7 @@ if ($ver === false) {
+ }
+
+ $constants = array();
+-foreach ($extConstants[$extName] as $cst => $val) {
++foreach ($extConstants[(version_compare(PHP_VERSION, '5.3.0')<0 ? 'internal' : 'Core')] as $cst => $val) {
+ $constants[$cst]['init'] = $ver;
+ $constants[$cst]['name'] = $cst;
+ }
+@@ -206,8 +206,8 @@ file_put_contents($target_directory . $e
- // PHP Core constants
--$extName = 'internal';
-+if (version_compare(PHP_VERSION, '5.3.0') < 0) {
-+ $extName = 'internal';
-+} else {
-+ $extName = 'Core';
-+}
- $extConstants = get_defined_constants(true);
- $const_glob_list[] = $extName;
+ foreach ($extensions as $extension) {
+
+- if (!extension_loaded($extension)) {
+- continue; // skip this extension if not loaded : prevent error
++ if ($extension=='Core' || !extension_loaded($extension)) {
++ continue; // skip this extension if 'Core' or not loaded : prevent error
+ }
-@@ -561,4 +565,4 @@ file_put_contents($target_directory . 'f
+ $ext = new ReflectionExtension($extension);
+@@ -561,4 +561,4 @@ file_put_contents($target_directory . 'f
". $globals .
" );
?>");
Index: php-pear-PHP-CompatInfo.spec
===================================================================
RCS file: /cvs/pkgs/rpms/php-pear-PHP-CompatInfo/devel/php-pear-PHP-CompatInfo.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- php-pear-PHP-CompatInfo.spec 24 Jan 2010 10:32:03 -0000 1.15
+++ php-pear-PHP-CompatInfo.spec 24 Jan 2010 17:13:09 -0000 1.16
@@ -5,7 +5,7 @@
Name: php-pear-PHP-CompatInfo
Version: 1.9.0
-Release: 1%{?dist}.1
+Release: 2%{?dist}
Summary: Find out version and extensions required for a piece of code to run
Summary(fr): Trouver version et extensions nécessaires à l'exécution d'un code
@@ -15,6 +15,7 @@ URL: http://pear.php.net/pack
Source0: http://pear.php.net/get/%{pear_name}-%{version}%{?beta}.tgz
Source2: xml2changelog
+# See http://pear.php.net/bugs/bug.php?id=17029
Patch0: PHP_CompatInfo-path.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -126,6 +127,9 @@ fi
%changelog
+* Sun Jan 24 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.9.0-2
+- improved PHP 5.3.0 patch
+
* Sun Jan 24 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.9.0-1.1
- add missing patch
More information about the scm-commits
mailing list