php-horde-Horde-Autoloader: patch autoloader for Sabre

2 files changed, 40 insertions, 11 deletions

diff --git a/php-horde-Horde-Autoloader-Sabre.patch b/php-horde-Horde-Autoloader-Sabre.patch
new file mode 100644
index 0000000..1bfe9ae
--- /dev/null
+++ b/php-horde-Horde-Autoloader-Sabre.patch
@@ -0,0 +1,22 @@
+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
+@@ -13,6 +13,7 @@
+ require_once 'Horde/Autoloader.php';
+ require_once 'Horde/Autoloader/ClassPathMapper.php';
+ require_once 'Horde/Autoloader/ClassPathMapper/Default.php';
++require_once 'Horde/Autoloader/ClassPathMapper/Prefix.php';
+ 
+ class Horde_Autoloader_Default extends Horde_Autoloader
+ {
+@@ -25,6 +26,10 @@ class Horde_Autoloader_Default extends H
+                 $this->addClassPathMapper(new Horde_Autoloader_ClassPathMapper_Default($path));
+             }
+         }
++        /* Ensure Sabre is taken from /usr/share/php, as /usr/share/pear may contains old version */
++        if (is_dir($sabre = '/usr/share/php/Sabre')) {
++            $this->addClassPathMapper(new Horde_Autoloader_ClassPathMapper_Prefix('/^Sabre\\\\/', $sabre));
++        }
+     }
+ }
+ 
diff --git a/php-horde-Horde-Autoloader.spec b/php-horde-Horde-Autoloader.spec
index cca8cbd..00a3b3b 100644
--- a/php-horde-Horde-Autoloader.spec
+++ b/php-horde-Horde-Autoloader.spec
@@ -1,5 +1,4 @@
-%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
-%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+%{!?__pear: %global __pear %{_bindir}/pear}
 %global pear_name    Horde_Autoloader
 %global pear_channel pear.horde.org
 
@@ -8,7 +7,7 @@
 
 Name:           php-horde-Horde-Autoloader
 Version:        2.0.1
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        Horde Autoloader
 
 Group:          Development/Libraries
@@ -16,6 +15,9 @@ License:        LGPLv2
 URL:            http://pear.horde.org
 Source0:        http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
 
+# Fedora specific - ensure Sabre is taken from /usr/share/php
+Patch0:         %{name}-Sabre.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
 BuildRequires:  php-pear(PEAR) >= 1.7.0
@@ -30,7 +32,7 @@ Requires(postun): %{__pear}
 Requires:       php(language) >= 5.3.0
 Requires:       php-pcre
 Requires:       php-spl
-BuildRequires:  php-pear(PEAR) >= 1.7.0
+Requires:       php-pear(PEAR) >= 1.7.0
 Requires:       php-channel(%{pear_channel})
 
 Provides:       php-pear(%{pear_channel}/Horde_Autoloader) = %{version}
@@ -45,7 +47,9 @@ Autoload implementation and class loading manager for Horde.
 tar xif %{SOURCE0}
 
 cd %{pear_name}-%{version}
-mv ../package.xml %{name}.xml
+%patch0 -p1 -b .fedora
+sed -e '/Default.php/s/md5sum=".*" name/name/' \
+    ../package.xml >%{name}.xml
 
 
 %build
@@ -98,19 +102,22 @@ fi
 
 
 %changelog
-* Mon Nov 19 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.0.1-1
-- Update to 2.0.1 for remi repo
+* Fri Jan  3 2014 Remi Collet <remi@fedoraproject.org> - 2.0.1-2
+- patch autoloader for Sabre
+
+* Mon Nov 19 2012 Remi Collet <remi@fedoraproject.org> - 2.0.1-1
+- Update to 2.0.1
 
-* Mon Nov  5 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.0.0-2
+* Mon Nov  5 2012 Remi Collet <remi@fedoraproject.org> - 2.0.0-2
 - make test optional
 
-* Thu Nov  1 2012 Remi Collet <RPMS@FamilleCollet.com> - 2.0.0-1
-- Update to 2.0.0 for remi repo
+* Thu Nov  1 2012 Remi Collet <remi@fedoraproject.org> - 2.0.0-1
+- Update to 2.0.0
 
 * Tue Aug 14 2012 Remi Collet <remi@fedoraproject.org> - 1.0.1-3
 - rebuilt for new pear_testdir
 
-* Sat Jun 16 2012 Remi Collet <RPMS@FamilleCollet.com> - 1.0.1-1
+* Sat Jun 16 2012 Remi Collet <remi@fedoraproject.org> - 1.0.1-1
 - backport for remi repo
 
 * Sat Jan 28 2012 Nick Bebout <nb@fedoraproject.org> - 1.0.1-1