rpms/php-pear-PHP-CompatInfo/devel PHP_CompatInfo-path.patch, NONE, 1.1 php-pear-PHP-CompatInfo.spec, 1.14, 1.15

Remi Collet remi at fedoraproject.org
Sun Jan 24 10:32:03 UTC 2010


Author: remi

Update of /cvs/pkgs/rpms/php-pear-PHP-CompatInfo/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23174

Modified Files:
	php-pear-PHP-CompatInfo.spec 
Added Files:
	PHP_CompatInfo-path.patch 
Log Message:
oups... missing patch

PHP_CompatInfo-path.patch:
 php-pear-PHP-CompatInfo.xml |    2 +-
 scripts/configure.php       |   10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

--- NEW FILE PHP_CompatInfo-path.patch ---
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
@@ -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">
     <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
@@ -150,7 +150,7 @@ if ($args->isDefined('x')) {
         exit(1);
     }
 } else {
-    include_once dirname(__FILE__) . $ds . 'scripts' . $ds . 'exceptions.conf.php';
+    include_once 'PHP/CompatInfo/scripts/exceptions.conf.php';
 }
 
 $const_glob_list = array();
@@ -158,7 +158,11 @@ $class_glob_list = array();
 $func_glob_list  = array();
 
 // 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;
 
@@ -561,4 +565,4 @@ file_put_contents($target_directory . 'f
 ". $globals .
 "    );
 ?>");
-?>
\ Pas de fin de ligne à la fin du fichier.
+?>


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.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- php-pear-PHP-CompatInfo.spec	24 Jan 2010 10:25:56 -0000	1.14
+++ php-pear-PHP-CompatInfo.spec	24 Jan 2010 10:32:03 -0000	1.15
@@ -5,7 +5,7 @@
 
 Name:           php-pear-PHP-CompatInfo
 Version:        1.9.0
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 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
 
@@ -126,6 +126,9 @@ fi
 
 
 %changelog
+* Sun Jan 24 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.9.0-1.1
+- add missing patch
+
 * Sun Jan 24 2010 Remi Collet <Fedora at FamilleCollet.com> - 1.9.0-1
 - update to 1.9.0
 - add patch for php 5.3.0 and to redirect scripts (/usr/bin/scripts seems a bad idea)



More information about the scm-commits mailing list