[php-horde-Horde-Test] update to 2.4.1
Remi Collet
remi at fedoraproject.org
Wed May 7 07:30:24 UTC 2014
commit 635c90ca35cbd39d6f3cc79855616512c2976752
Author: Remi Collet <remi at fedoraproject.org>
Date: Wed May 7 09:30:43 2014 +0200
update to 2.4.1
.gitignore | 1 +
Horde_Test-rpm.patch | 36 ++++++++++++++++++++++++++++++++++++
php-horde-Horde-Test.spec | 32 ++++++++++++++++++++++++++------
sources | 2 +-
4 files changed, 64 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index da3aa16..c406e17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ clog
/Horde_Test-2.2.5.tgz
/Horde_Test-2.2.6.tgz
/Horde_Test-2.3.0.tgz
+/Horde_Test-2.4.1.tgz
diff --git a/Horde_Test-rpm.patch b/Horde_Test-rpm.patch
new file mode 100644
index 0000000..9b21443
--- /dev/null
+++ b/Horde_Test-rpm.patch
@@ -0,0 +1,36 @@
+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
+@@ -41,11 +41,7 @@ class Horde_Test_Autoload
+ return;
+ }
+
+- 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(
+ function($class) {
diff --git a/php-horde-Horde-Test.spec b/php-horde-Horde-Test.spec
index 937f391..5e9e386 100644
--- a/php-horde-Horde-Test.spec
+++ b/php-horde-Horde-Test.spec
@@ -13,7 +13,7 @@
%global pear_channel pear.horde.org
Name: php-horde-Horde-Test
-Version: 2.3.0
+Version: 2.4.1
Release: 1%{?dist}
Summary: Horde testing base classes
@@ -22,6 +22,9 @@ License: LGPLv2
URL: http://%{pear_channel}
Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
+# Use unbundled PHPUnit
+Patch0: %{pear_name}-rpm.patch
+
BuildArch: noarch
BuildRequires: php(language) >= 5.3.0
BuildRequires: php-pear(PEAR) >= 1.7.0
@@ -29,34 +32,47 @@ BuildRequires: php-channel(%{pear_channel})
Requires(post): %{__pear}
Requires(postun): %{__pear}
+# From package.xml, required
Requires: php(language) >= 5.3.0
Requires: php-dom
Requires: php-json
-Requires: php-pcre
-Requires: php-pdo
-Requires: php-spl
Requires: php-pear(PEAR) >= 1.7.0
Requires: php-channel(%{pear_channel})
Requires: php-pear(%{pear_channel}/Horde_Support) >= 2.0.0
Requires: php-pear(%{pear_channel}/Horde_Support) < 3.0.0
Requires: php-pear(%{pear_channel}/Horde_Util) >= 2.0.0
Requires: php-pear(%{pear_channel}/Horde_Util) < 3.0.0
+# From package.xml, optional
Requires: php-pear(%{pear_channel}/Horde_Cli) >= 2.0.0
Requires: php-pear(%{pear_channel}/Horde_Cli) < 3.0.0
Requires: php-pear(%{pear_channel}/Horde_Log) >= 2.0.0
Requires: php-pear(%{pear_channel}/Horde_Log) < 3.0.0
-Requires: php-pear(pear.phpunit.de/PHPUnit) >= 3.5.0
+# From phpcompatinfo report for version 2.4.0
+Requires: php-pcre
+Requires: php-pdo
+Requires: php-spl
+# Required as we drop bundled copy
+Requires: php-phpunit-PHPUnit >= 3.5.0
Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version}
+
%description
Horde-specific PHPUnit base classes.
+
%prep
%setup -q -c
cd %{pear_name}-%{version}
-mv ../package.xml %{name}.xml
+%patch0 -p1 -b .rpm
+
+# 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="[^"]*"//' \
+ ../package.xml >%{name}.xml
%build
@@ -94,6 +110,10 @@ fi
%changelog
+* 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
+
* Tue Mar 11 2014 Remi Collet <remi at fedoraproject.org> - 2.3.0-1
- Update to 2.3.0
diff --git a/sources b/sources
index 2b344bf..ec1f3eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9cd0b67eb949a558edf1526f6e001ff4 Horde_Test-2.3.0.tgz
+c20711f66c9fff9e1e2c7fb5ca6dcfad Horde_Test-2.4.1.tgz
More information about the scm-commits
mailing list