summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-horde-Horde-Core.spec29
1 files changed, 14 insertions, 15 deletions
diff --git a/php-horde-Horde-Core.spec b/php-horde-Horde-Core.spec
index d62edfe..73dbbf2 100644
--- a/php-horde-Horde-Core.spec
+++ b/php-horde-Horde-Core.spec
@@ -13,7 +13,7 @@
%global with_sysjs 0
Name: php-horde-Horde-Core
-Version: 2.28.3
+Version: 2.29.0
Release: 1%{?dist}
Summary: Horde Core Framework libraries
@@ -162,6 +162,9 @@ Requires: php-pear(%{pear_channel}/Horde_SpellChecker) >= 2.0.0
Requires: php-pear(%{pear_channel}/Horde_SpellChecker) < 3.0.0
Requires: php-pear(%{pear_channel}/Horde_Vfs) >= 2.2.0
Requires: php-pear(%{pear_channel}/Horde_Vfs) < 3.0.0
+%if 0%{?fedora} >= 21
+Recommends: php-pear(%{pear_channel}/Horde_Backup)
+%endif
# Optional and omited to avoid circular dep:
# Horde_Dav
@@ -231,21 +234,13 @@ done | tee ../%{pear_name}.lang
%check
cd %{pear_name}-%{version}/test/$(echo %{pear_name} | sed -e s:_:/:g)
-# remirepo:11
-run=0
ret=0
-if which php56; then
- php56 %{_bindir}/phpunit . || ret=1
- run=1
-fi
-if which php71; then
- php71 %{_bindir}/phpunit . || ret=1
- run=1
-fi
-if [ $run -eq 0 ]; then
-%{_bindir}/phpunit --verbose .
-# remirepo:2
-fi
+# PHP 7.2: session_name(): Cannot change session name when headers already sent
+for cmd in php php56 php70 php71; do
+ if which $cmd; then
+ $cmd %{_bindir}/phpunit --verbose . || ret=1
+ fi
+done
exit $ret
@@ -291,6 +286,10 @@ fi
%changelog
+* Tue May 30 2017 Remi Collet <remi@remirepo.net> - 2.29.0-1
+- Update to 2.29.0
+- add optional dependency on Horde_Backup
+
* Sat Apr 1 2017 Remi Collet <remi@remirepo.net> - 2.28.3-1
- Update to 2.28.3