[php-horde-Horde-Test/el6] update to 2.4.2
Remi Collet
remi at fedoraproject.org
Mon Jul 7 11:48:12 UTC 2014
commit 70247fa78d09ca01b637cf913c4a9e29c4d5d5d7
Author: Remi Collet <remi at fedoraproject.org>
Date: Mon Jul 7 13:46:07 2014 +0200
update to 2.4.2
(cherry picked from commit 0e8e4cc9798322942fe01af1aeff3bd7ceb944f6)
.gitignore | 1 +
Horde_Test-rpm.patch | 20 --------------------
php-horde-Horde-Test.spec | 8 ++++++--
sources | 2 +-
4 files changed, 8 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c406e17..c818eaa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ clog
/Horde_Test-2.2.6.tgz
/Horde_Test-2.3.0.tgz
/Horde_Test-2.4.1.tgz
+/Horde_Test-2.4.2.tgz
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 fef964e..48e3b2d 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
#
@@ -13,7 +13,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
@@ -110,6 +111,9 @@ fi
%changelog
+* Mon Jul 07 2014 Remi Collet <remi at fedoraproject.org> - 2.4.2-1
+- Update to 2.4.2 (no change)
+
* Tue May 06 2014 Remi Collet <remi at fedoraproject.org> - 2.4.1-1
- Update to 2.4.1
- drop bundled PHPUnit and use system one
diff --git a/sources b/sources
index ec1f3eb..8143787 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c20711f66c9fff9e1e2c7fb5ca6dcfad Horde_Test-2.4.1.tgz
+c6bc818d10b00dd7271429173c6b28fe Horde_Test-2.4.2.tgz
More information about the scm-commits
mailing list