diff options
| -rw-r--r-- | php-horde-Horde-Autoloader-Sabre.patch | 12 | ||||
| -rw-r--r-- | php-horde-Horde-Autoloader.spec | 6 |
2 files changed, 13 insertions, 5 deletions
diff --git a/php-horde-Horde-Autoloader-Sabre.patch b/php-horde-Horde-Autoloader-Sabre.patch index 1bfe9ae..c02bad3 100644 --- a/php-horde-Horde-Autoloader-Sabre.patch +++ b/php-horde-Horde-Autoloader-Sabre.patch @@ -1,6 +1,6 @@ -diff -up Horde_Autoloader-2.0.1/lib/Horde/Autoloader/Default.php.old Horde_Autoloader-2.0.1/lib/Horde/Autoloader/Default.php ---- Horde_Autoloader-2.0.1/lib/Horde/Autoloader/Default.php.old 2014-01-03 15:51:31.000000000 +0100 -+++ Horde_Autoloader-2.0.1/lib/Horde/Autoloader/Default.php 2014-01-03 15:51:48.000000000 +0100 +diff -up Horde_Autoloader-2.0.1/lib/Horde/Autoloader/Default.php.fedora Horde_Autoloader-2.0.1/lib/Horde/Autoloader/Default.php +--- Horde_Autoloader-2.0.1/lib/Horde/Autoloader/Default.php.fedora 2012-11-19 14:12:28.000000000 +0100 ++++ Horde_Autoloader-2.0.1/lib/Horde/Autoloader/Default.php 2014-02-20 11:34:05.139297471 +0100 @@ -13,6 +13,7 @@ require_once 'Horde/Autoloader.php'; require_once 'Horde/Autoloader/ClassPathMapper.php'; @@ -9,7 +9,7 @@ diff -up Horde_Autoloader-2.0.1/lib/Horde/Autoloader/Default.php.old Horde_Autol class Horde_Autoloader_Default extends Horde_Autoloader { -@@ -25,6 +26,10 @@ class Horde_Autoloader_Default extends H +@@ -25,6 +26,14 @@ class Horde_Autoloader_Default extends H $this->addClassPathMapper(new Horde_Autoloader_ClassPathMapper_Default($path)); } } @@ -17,6 +17,10 @@ diff -up Horde_Autoloader-2.0.1/lib/Horde/Autoloader/Default.php.old Horde_Autol + if (is_dir($sabre = '/usr/share/php/Sabre')) { + $this->addClassPathMapper(new Horde_Autoloader_ClassPathMapper_Prefix('/^Sabre\\\\/', $sabre)); + } ++ /* Keep VObject from pear (v2.1), not ready for v3.1 */ ++ if (is_dir($vobject = '/usr/share/pear/Sabre/VObject')) { ++ $this->addClassPathMapper(new Horde_Autoloader_ClassPathMapper_Prefix('/^Sabre\\\\VObject\\\\/', $vobject)); ++ } } } diff --git a/php-horde-Horde-Autoloader.spec b/php-horde-Horde-Autoloader.spec index 5f34ef5..b21598b 100644 --- a/php-horde-Horde-Autoloader.spec +++ b/php-horde-Horde-Autoloader.spec @@ -7,7 +7,7 @@ Name: php-horde-Horde-Autoloader Version: 2.0.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Horde Autoloader Group: Development/Libraries @@ -16,6 +16,7 @@ URL: http://pear.horde.org Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz # Fedora specific - ensure Sabre is taken from /usr/share/php +# but Sabre\VObject from /usr/share/pear Patch0: %{name}-Sabre.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -101,6 +102,9 @@ fi %changelog +* Thu Feb 20 2014 Remi Collet <remi@fedoraproject.org> - 2.0.1-5 +- new autoloader patch for SabreDAV and VObject + * Fri Jan 3 2014 Remi Collet <remi@fedoraproject.org> - 2.0.1-2 - patch autoloader for Sabre |