summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Horde_Test-rpm.patch20
-rw-r--r--php-horde-Horde-Test.spec5
2 files changed, 16 insertions, 9 deletions
diff --git a/Horde_Test-rpm.patch b/Horde_Test-rpm.patch
index 543de27..9b21443 100644
--- a/Horde_Test-rpm.patch
+++ b/Horde_Test-rpm.patch
@@ -1,6 +1,6 @@
-diff -up Horde_Test-2.4.0/lib/Horde/Test/AllTests.php.rpm Horde_Test-2.4.0/lib/Horde/Test/AllTests.php
---- Horde_Test-2.4.0/lib/Horde/Test/AllTests.php.rpm 2014-05-06 07:24:13.000000000 +0200
-+++ Horde_Test-2.4.0/lib/Horde/Test/AllTests.php 2014-05-06 07:24:37.000000000 +0200
+diff -up Horde_Test-2.4.1/lib/Horde/Test/AllTests.php.rpm Horde_Test-2.4.1/lib/Horde/Test/AllTests.php
+--- Horde_Test-2.4.1/lib/Horde/Test/AllTests.php.rpm 2014-05-06 08:42:59.000000000 +0200
++++ Horde_Test-2.4.1/lib/Horde/Test/AllTests.php 2014-05-06 14:15:13.780403549 +0200
@@ -12,15 +12,7 @@
* @link http://www.horde.org/components/Horde_Test
*/
@@ -18,14 +18,18 @@ diff -up Horde_Test-2.4.0/lib/Horde/Test/AllTests.php.rpm Horde_Test-2.4.0/lib/H
/**
* Horde base test suite
-diff -up Horde_Test-2.4.0/lib/Horde/Test/Autoload.php.rpm Horde_Test-2.4.0/lib/Horde/Test/Autoload.php
---- Horde_Test-2.4.0/lib/Horde/Test/Autoload.php.rpm 2014-05-06 07:23:59.000000000 +0200
-+++ Horde_Test-2.4.0/lib/Horde/Test/Autoload.php 2014-05-06 07:24:50.000000000 +0200
-@@ -41,7 +41,7 @@ class Horde_Test_Autoload
+diff -up Horde_Test-2.4.1/lib/Horde/Test/Autoload.php.rpm Horde_Test-2.4.1/lib/Horde/Test/Autoload.php
+--- Horde_Test-2.4.1/lib/Horde/Test/Autoload.php.rpm 2014-05-06 14:15:13.781403553 +0200
++++ Horde_Test-2.4.1/lib/Horde/Test/Autoload.php 2014-05-06 14:16:25.522649055 +0200
+@@ -41,11 +41,7 @@ class Horde_Test_Autoload
return;
}
-- require __DIR__ . '/../../../bundle/vendor/autoload.php';
+- if (file_exists(__DIR__ . '/vendor/autoload.php')) {
+- require __DIR__ . '/vendor/autoload.php';
+- } else {
+- require __DIR__ . '/../../../bundle/vendor/autoload.php';
+- }
+ require_once 'PHPUnit/Autoload.php';
spl_autoload_register(
diff --git a/php-horde-Horde-Test.spec b/php-horde-Horde-Test.spec
index 9791ff7..683f642 100644
--- a/php-horde-Horde-Test.spec
+++ b/php-horde-Horde-Test.spec
@@ -12,7 +12,7 @@
%global pear_channel pear.horde.org
Name: php-horde-Horde-Test
-Version: 2.4.0
+Version: 2.4.1
Release: 1%{?dist}
Summary: Horde testing base classes
@@ -111,6 +111,9 @@ fi
%changelog
+* Tue May 06 2014 Remi Collet <remi@fedoraproject.org> - 2.4.1-1
+- Update to 2.4.1
+
* Tue May 06 2014 Remi Collet <remi@fedoraproject.org> - 2.4.0-1
- Update to 2.4.0
- drop bundled PHPUnit and use system one