diff options
| -rw-r--r-- | Horde_Share-tests.patch | 76 | ||||
| -rw-r--r-- | php-horde-Horde-Share.spec | 7 |
2 files changed, 3 insertions, 80 deletions
diff --git a/Horde_Share-tests.patch b/Horde_Share-tests.patch deleted file mode 100644 index a596706..0000000 --- a/Horde_Share-tests.patch +++ /dev/null @@ -1,76 +0,0 @@ -From eefe220034aeb37c9b755e6ac262887b4c92040c Mon Sep 17 00:00:00 2001 -From: Remi Collet <fedora@famillecollet.com> -Date: Wed, 16 Jan 2013 08:50:19 +0100 -Subject: [PATCH] Fix Horde_Share: test fails (Bug #11966) - -Rename Horde_Share_Test_Base::callback() to callbackSetShareOb() -Avoid name conflict with PHPUnit_Framework_Assert::callback() ---- - framework/Share/test/Horde/Share/Base.php | 2 +- - framework/Share/test/Horde/Share/Kolab/MockTest.php | 4 ++-- - framework/Share/test/Horde/Share/Sql/Base.php | 2 +- - framework/Share/test/Horde/Share/Sqlng/Base.php | 2 +- - 4 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/framework/Share/test/Horde/Share/Base.php b/framework/Share/test/Horde/Share/Base.php -index d2fb25c..1df3be6 100644 ---- a/framework/Share/test/Horde/Share/Base.php -+++ b/framework/Share/test/Horde/Share/Base.php -@@ -585,7 +585,7 @@ public function renameShare() - $this->assertArrayHasKey('joeshare', self::$share->listAllShares()); - } - -- public function callback($share) -+ public function callbackSetShareOb($share) - { - $share->setShareOb(new Horde_Support_Stub()); - $this->assertEquals($share, unserialize(serialize($share))); -diff --git a/framework/Share/test/Horde/Share/Kolab/MockTest.php b/framework/Share/test/Horde/Share/Kolab/MockTest.php -index b56f747..88c1f78 100644 ---- a/framework/Share/test/Horde/Share/Kolab/MockTest.php -+++ b/framework/Share/test/Horde/Share/Kolab/MockTest.php -@@ -231,7 +231,7 @@ public function testRemoveShare() - - public function testCallback() - { -- $this->callback(new Horde_Share_Object_Sql(array())); -+ $this->callbackSetShareOb(new Horde_Share_Object_Sql(array())); - } - - protected function switchAuth($user) -@@ -251,4 +251,4 @@ protected function getCache() - - - Check extra API calls in SQL driver - - add server test --*/ -\ No newline at end of file -+*/ -diff --git a/framework/Share/test/Horde/Share/Sql/Base.php b/framework/Share/test/Horde/Share/Sql/Base.php -index 1b0fc3e..417a43e 100644 ---- a/framework/Share/test/Horde/Share/Sql/Base.php -+++ b/framework/Share/test/Horde/Share/Sql/Base.php -@@ -184,7 +184,7 @@ public function testRenameShare() - - public function testCallback() - { -- $this->callback(new Horde_Share_Object_Sql(array())); -+ $this->callbackSetShareOb(new Horde_Share_Object_Sql(array())); - } - - public static function setUpBeforeClass() -diff --git a/framework/Share/test/Horde/Share/Sqlng/Base.php b/framework/Share/test/Horde/Share/Sqlng/Base.php -index f658fc5..a10fc9d 100644 ---- a/framework/Share/test/Horde/Share/Sqlng/Base.php -+++ b/framework/Share/test/Horde/Share/Sqlng/Base.php -@@ -185,7 +185,7 @@ public function testRenameShare() - - public function testCallback() - { -- parent::callback(new Horde_Share_Object_Sqlng(array())); -+ $this->callbackSetShareOb(new Horde_Share_Object_Sqlng(array())); - } - - public static function setUpBeforeClass() --- -1.7.10 - diff --git a/php-horde-Horde-Share.spec b/php-horde-Horde-Share.spec index e826727..5253117 100644 --- a/php-horde-Horde-Share.spec +++ b/php-horde-Horde-Share.spec @@ -6,8 +6,7 @@ # # Please, preserve the changelog entries # -%{!?pear_metadir: %global pear_metadir %{pear_phpdir}} -%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} +%{!?__pear: %global __pear %{_bindir}/pear} %global pear_name Horde_Share %global pear_channel pear.horde.org @@ -30,7 +29,7 @@ BuildRequires: gettext # To run unit tests BuildRequires: php-pear(%{pear_channel}/Horde_Test) >= 2.1.0 BuildRequires: php-pear(%{pear_channel}/Horde_Group) >= 2.0.0 -BuildRequires: php-pear(%{pear_channel}/Horde_Perms) >= 2.0.0 +BuildRequires: php-pear(%{pear_channel}/Horde_Perms) >= 2.1.0 BuildRequires: php-pear(%{pear_channel}/Horde_Injector) >= 2.0.0 Requires(post): %{__pear} @@ -45,7 +44,7 @@ Requires: php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0 Requires: php-pear(%{pear_channel}/Horde_Exception) < 3.0.0 Requires: php-pear(%{pear_channel}/Horde_Group) >= 2.0.0 Requires: php-pear(%{pear_channel}/Horde_Group) < 3.0.0 -Requires: php-pear(%{pear_channel}/Horde_Perms) >= 2.0.0 +Requires: php-pear(%{pear_channel}/Horde_Perms) >= 2.1.0 Requires: php-pear(%{pear_channel}/Horde_Perms) < 3.0.0 Requires: php-pear(%{pear_channel}/Horde_Support) >= 2.0.0 Requires: php-pear(%{pear_channel}/Horde_Support) < 3.0.0 |