summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-06-08 09:49:19 +0200
committerRemi Collet <fedora@famillecollet.com>2014-06-08 09:49:19 +0200
commit5a9caac7b2a5c655b15e02f8933fa331811f5832 (patch)
treedea7104af61b835246a91f9afaf4cd34f166d47c
parent88ff688c5f377f3e2c4fcc9f170a33b9e900ea48 (diff)
horde: fix FTBFS (include path) + cleanups
-rw-r--r--php-horde-Horde-Notification.spec23
1 files changed, 15 insertions, 8 deletions
diff --git a/php-horde-Horde-Notification.spec b/php-horde-Horde-Notification.spec
index 7017b57..c2a38da 100644
--- a/php-horde-Horde-Notification.spec
+++ b/php-horde-Horde-Notification.spec
@@ -1,5 +1,13 @@
-%{!?pear_metadir: %global pear_metadir %{pear_phpdir}}
-%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}}
+# spec file for php-horde-Horde-Notification
+#
+# 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_Notification
%global pear_channel pear.horde.org
@@ -28,14 +36,13 @@ Requires: php-gettext
Requires: php-pear(PEAR) >= 1.7.0
Requires: php-channel(%{pear_channel})
Requires: php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0
-Conflicts: php-pear(%{pear_channel}/Horde_Exception) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Exception) < 3.0.0
Requires: php-pear(%{pear_channel}/Horde_Util) >= 2.0.0
-Conflicts: php-pear(%{pear_channel}/Horde_Util) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Util) < 3.0.0
# Optional
Requires: php-pear(%{pear_channel}/Horde_Alarm) >= 2.0.0
-Conflicts: php-pear(%{pear_channel}/Horde_Alarm) >= 3.0.0
-Requires: php-pear(%{pear_channel}/Horde_Nls) >= 2.0.0
-Conflicts: php-pear(%{pear_channel}/Horde_Nls) >= 3.0.0
+Requires: php-pear(%{pear_channel}/Horde_Alarm) < 3.0.0
+# Horde_Nls optional and implicitly required
Provides: php-pear(%{pear_channel}/%{pear_name}) = %{version}
@@ -73,7 +80,7 @@ install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
src=$(pwd)/%{pear_name}-%{version}
cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
phpunit \
- -d include_path=$src/lib:.:%{pear_phpdir} \
+ --include-path=$src/lib \
-d date.timezone=UTC \
.