summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Horde_Test-rpm.patch20
-rw-r--r--php-horde-Horde-Test.spec8
2 files changed, 6 insertions, 22 deletions
diff --git a/Horde_Test-rpm.patch b/Horde_Test-rpm.patch
index 9b21443..c2db15b 100644
--- a/Horde_Test-rpm.patch
+++ b/Horde_Test-rpm.patch
@@ -1,23 +1,3 @@
-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
- */
-
--if (!@include_once 'PHPUnit/Autoload.php') {
-- /* Try to load PHAR-based phpunit. */
-- set_include_path(get_include_path() . PATH_SEPARATOR . getenv('PATH'));
-- $GLOBALS['_SERVER']['SCRIPT_NAME'] = '-';
-- ob_start();
-- @include_once 'phpunit';
-- ob_end_clean();
-- restore_include_path();
--}
-+require_once 'PHPUnit/Autoload.php';
-
- /**
- * Horde base test suite
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
diff --git a/php-horde-Horde-Test.spec b/php-horde-Horde-Test.spec
index 683f642..5edfaf7 100644
--- a/php-horde-Horde-Test.spec
+++ b/php-horde-Horde-Test.spec
@@ -1,4 +1,4 @@
-# spec file for php-horde-Horde-Autoloader
+# spec file for php-horde-Horde-Test
#
# Copyright (c) 2012-2014 Nick Bebout, Remi Collet
#
@@ -12,7 +12,7 @@
%global pear_channel pear.horde.org
Name: php-horde-Horde-Test
-Version: 2.4.1
+Version: 2.4.2
Release: 1%{?dist}
Summary: Horde testing base classes
@@ -73,6 +73,7 @@ sed -e '/bundle\/vendor/d' \
-e '/Autoload.php/s/md5sum="[^"]*"//' \
-e '/AllTests.php/s/md5sum="[^"]*"//' \
../package.xml >%{name}.xml
+touch -r ../package.xml %{name}.xml
%build
@@ -111,6 +112,9 @@ fi
%changelog
+* Mon Jul 07 2014 Remi Collet <remi@fedoraproject.org> - 2.4.2-1
+- Update to 2.4.2 (no change)
+
* Tue May 06 2014 Remi Collet <remi@fedoraproject.org> - 2.4.1-1
- Update to 2.4.1