summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-horde-Horde-Autoloader-Sabre.patch20
-rw-r--r--php-horde-Horde-Autoloader.spec21
2 files changed, 27 insertions, 14 deletions
diff --git a/php-horde-Horde-Autoloader-Sabre.patch b/php-horde-Horde-Autoloader-Sabre.patch
index c02bad3..cd12651 100644
--- a/php-horde-Horde-Autoloader-Sabre.patch
+++ b/php-horde-Horde-Autoloader-Sabre.patch
@@ -1,17 +1,17 @@
-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 @@
+diff -up Horde_Autoloader-2.1.0/lib/Horde/Autoloader/Default.php.fedora Horde_Autoloader-2.1.0/lib/Horde/Autoloader/Default.php
+--- Horde_Autoloader-2.1.0/lib/Horde/Autoloader/Default.php.fedora 2014-03-04 07:18:14.580352294 +0100
++++ Horde_Autoloader-2.1.0/lib/Horde/Autoloader/Default.php 2014-03-04 07:20:42.591840198 +0100
+@@ -14,6 +14,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,14 @@ class Horde_Autoloader_Default extends H
- $this->addClassPathMapper(new Horde_Autoloader_ClassPathMapper_Default($path));
- }
+ /**
+ * Default autoloader definition that uses the include path with default
+@@ -45,6 +46,14 @@ class Horde_Autoloader_Default extends H
+ 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')) {
@@ -22,5 +22,5 @@ diff -up Horde_Autoloader-2.0.1/lib/Horde/Autoloader/Default.php.fedora Horde_Au
+ $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 b21598b..fb62386 100644
--- a/php-horde-Horde-Autoloader.spec
+++ b/php-horde-Horde-Autoloader.spec
@@ -1,3 +1,12 @@
+# spec file for php-horde-Horde-Autoloader
+#
+# Copyright (c) 2012-2014 Nick Bebout, Remi Collet
+#
+# License: MIT
+# https://fedoraproject.org/wiki/Licensing:MIT#Modern_Style_with_sublicense
+#
+# Please, preserve the changelog entries
+#
%{!?__pear: %global __pear %{_bindir}/pear}
%global pear_name Horde_Autoloader
%global pear_channel pear.horde.org
@@ -6,8 +15,8 @@
%global with_tests %{?_with_tests:1}%{!?_with_tests:0}
Name: php-horde-Horde-Autoloader
-Version: 2.0.1
-Release: 5%{?dist}
+Version: 2.1.0
+Release: 1%{?dist}
Summary: Horde Autoloader
Group: Development/Libraries
@@ -71,9 +80,10 @@ install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
%check
%if %{with_tests}
+src=$(pwd)/%{pear_name}-%{version}
cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
-phpunit\
- -d include_path=%{buildroot}%{pear_phpdir}:.:%{pear_phpdir} \
+phpunit \
+ -d include_path=$src/lib:.:%{pear_phpdir} \
-d date.timezone=UTC \
.
%else
@@ -102,6 +112,9 @@ fi
%changelog
+* Tue Mar 04 2014 Remi Collet <remi@fedoraproject.org> - 2.1.0-1
+- Update to 2.1.0
+
* Thu Feb 20 2014 Remi Collet <remi@fedoraproject.org> - 2.0.1-5
- new autoloader patch for SabreDAV and VObject