From e582d768cdc8b70d2ad88e8eb1c5e37353f1f208 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 10 Nov 2014 09:28:18 +0100 Subject: php-horde-Horde-Test: add upstream patch to fix test failure in turba and kronolith, thanks to Koschei --- php-horde-Horde-Test.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'php-horde-Horde-Test.spec') diff --git a/php-horde-Horde-Test.spec b/php-horde-Horde-Test.spec index 8a41517..d627a54 100644 --- a/php-horde-Horde-Test.spec +++ b/php-horde-Horde-Test.spec @@ -13,7 +13,7 @@ Name: php-horde-Horde-Test Version: 2.4.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Horde testing base classes Group: Development/Libraries @@ -23,6 +23,7 @@ Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz # Use unbundled PHPUnit Patch0: %{pear_name}-rpm.patch +Patch1: %{pear_name}-upstream.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch @@ -66,12 +67,14 @@ Horde-specific PHPUnit base classes. cd %{pear_name}-%{version} %patch0 -p1 -b .rpm +%patch1 -p3 -b .upstream # Don't install bundled PHPUnit # Don't check md5sum for patched files sed -e '/bundle\/vendor/d' \ -e '/Autoload.php/s/md5sum="[^"]*"//' \ -e '/AllTests.php/s/md5sum="[^"]*"//' \ + -e '/Registry.php/s/md5sum="[^"]*"//' \ ../package.xml >%{name}.xml touch -r ../package.xml %{name}.xml @@ -112,6 +115,10 @@ fi %changelog +* Mon Nov 10 2014 Remi Collet - 2.4.5-2 +- add upstream patch to fix test failure in turba + and kronolith, thanks to Koschei + * Tue Oct 28 2014 Remi Collet - 2.4.5-1 - Update to 2.4.5 -- cgit