[php-pear-Image-Color] fix FTBFS, update tests suite from git

[Remi Collet]

commit 778fd89d88aa6a02f9427f648cffb6b6fde4230b
Author: remi <fedora at famillecollet.com>
Date:   Mon Jan 16 10:28:31 2012 +0100

    fix FTBFS, update tests suite from git

 .gitignore                |    2 +-
 Image_Color-git.patch     |   45 +++++++++++++++++++++++++++++++++++++++++++++
 php-pear-Image-Color.spec |   18 +++++++++++-------
 3 files changed, 57 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b3e4edb..00685e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-Image_Color-1.0.3.tgz
+*spec~
 Image_Color-1.0.4.tgz
diff --git a/Image_Color-git.patch b/Image_Color-git.patch
new file mode 100644
index 0000000..e1f5638
--- /dev/null
+++ b/Image_Color-git.patch
@@ -0,0 +1,45 @@
+diff -up Image_Color-1.0.4/php-pear-Image-Color.xml.orig Image_Color-1.0.4/php-pear-Image-Color.xml
+--- Image_Color-1.0.4/php-pear-Image-Color.xml.orig	2012-01-16 10:23:57.000000000 +0100
++++ Image_Color-1.0.4/php-pear-Image-Color.xml	2012-01-16 10:24:08.000000000 +0100
+@@ -38,8 +38,8 @@ Relicensing under LGPL 2.1.
+  </notes>
+  <contents>
+   <dir baseinstalldir="Image" name="/">
+-   <file baseinstalldir="Image" md5sum="6bd25f4b2246f1a6f4093c22d4429773" name="Tests/AllTests.php" role="php" />
+-   <file baseinstalldir="Image" md5sum="8058266508aaa75b4343d56b3aa92ee2" name="Tests/ColorTest.php" role="php" />
++   <file baseinstalldir="Image" name="Tests/AllTests.php" role="php" />
++   <file baseinstalldir="Image" name="Tests/ColorTest.php" role="php" />
+    <file baseinstalldir="Image" md5sum="74d7459a8f2c1e1567d37a31fb14bce8" name="Color.php" role="php" />
+   </dir>
+  </contents>
+diff -up Image_Color-1.0.4/Tests/AllTests.php.orig Image_Color-1.0.4/Tests/AllTests.php
+--- Image_Color-1.0.4/Tests/AllTests.php.orig	2012-01-16 10:21:32.000000000 +0100
++++ Image_Color-1.0.4/Tests/AllTests.php	2012-01-16 10:21:43.000000000 +0100
+@@ -3,7 +3,7 @@ if (!defined('PHPUnit_MAIN_METHOD')) {
+     define('PHPUnit_MAIN_METHOD', 'AllTests::main');
+ }
+ 
+-require_once 'PHPUnit/TextUI/TestRunner.php';
++require_once 'PHPUnit/Autoload.php';
+ 
+ require_once 'ColorTest.php';
+ 
+diff -up Image_Color-1.0.4/Tests/ColorTest.php.orig Image_Color-1.0.4/Tests/ColorTest.php
+--- Image_Color-1.0.4/Tests/ColorTest.php.orig	2012-01-16 10:23:13.000000000 +0100
++++ Image_Color-1.0.4/Tests/ColorTest.php	2012-01-16 10:23:39.000000000 +0100
+@@ -37,13 +37,13 @@ class ColorTest extends PHPUnit_Framewor
+     function testGetGetRange_DefaultParam() {
+         $this->color->setColors('#ffffff', '#000000');
+         $result = $this->color->getRange();
+-        $this->assertType('array', $result);
++        $this->assertInternalType('array', $result);
+         $this->assertEquals(2, count($result));
+     }
+     function testGetGetRange_Param5() {
+         $this->color->setColors('#ffffff', '#000000');
+         $result = $this->color->getRange(5);
+-        $this->assertType('array', $result);
++        $this->assertInternalType('array', $result);
+         $this->assertEquals(5, count($result));
+     }
+ 
diff --git a/php-pear-Image-Color.spec b/php-pear-Image-Color.spec
index 031efc7..0f78d18 100644
--- a/php-pear-Image-Color.spec
+++ b/php-pear-Image-Color.spec
@@ -3,7 +3,7 @@
 
 Name:           php-pear-Image-Color
 Version:        1.0.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Manage and handles color data and conversions
 
 Group:          Development/Libraries
@@ -12,6 +12,10 @@ License:        LGPLv2
 URL:            http://pear.php.net/package/Image_Color
 Source0:        http://pear.php.net/get/%{pear_name}-%{version}.tgz
 
+# https://github.com/pear/Image_Color/commit/ae130396859c7cbb3e15d02bc1f2f561db9f67e8
+# https://github.com/pear/Image_Color/commit/ea9cb3e57177c931ac484f69ee3ceaa196636311
+Patch1:         Image_Color-git.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -32,15 +36,12 @@ Provides:       php-pear(%{pear_name}) = %{version}
 %prep
 %setup -qc
 
-# Create a "localized" php.ini to avoid build warning
-cp /etc/php.ini .
-echo "date.timezone=UTC" >>php.ini
-
-
 cd %{pear_name}-%{version}
 # Package.xml is V2
 mv ../package.xml %{name}.xml
 
+%patch1 -p1 -b .orig
+
 
 %build
 cd %{pear_name}-%{version}
@@ -50,7 +51,7 @@ cd %{pear_name}-%{version}
 %install
 cd %{pear_name}-%{version}
 rm -rf $RPM_BUILD_ROOT docdir
-PHPRC=../php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
+%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{name}.xml
 
 # Clean up unnecessary files
 rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??*
@@ -87,6 +88,9 @@ fi
 
 
 %changelog
+* Mon Jan 16 2012 Remi Collet <remi at fedoraproject.org> - 1.0.4-4
+- fix from GIT for test suite
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild