summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-06-02 14:32:11 +0200
committerRemi Collet <remi@remirepo.net>2020-06-02 14:32:11 +0200
commit2830f1167b9139f673103deae67fdbf060bee018 (patch)
treee45419db0815a8a6d06e5bfb7eb8e6346b47b416
parent2a2848b9d43df4b93d009cd2cc92649c8f2a76f3 (diff)
fix FTBFS from Koschei
add patch for PHP 7.4 from https://github.com/horde/wicked/pull/1 use range dependencies
Diffstat
-rw-r--r--php-horde-wicked.spec65
1 files changed, 61 insertions, 4 deletions
diff --git a/php-horde-wicked.spec b/php-horde-wicked.spec
index 588201f..d52a345 100644
--- a/php-horde-wicked.spec
+++ b/php-horde-wicked.spec
@@ -1,6 +1,6 @@
# remirepo/fedora spec file for php-horde-wicked
#
-# Copyright (c) 2014-2017 Remi Collet
+# Copyright (c) 2014-2020 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -13,14 +13,15 @@
Name: php-horde-wicked
Version: 2.0.8
-Release: 1%{?dist}
+Release: 6%{?dist}
Summary: Wiki application
-Group: Development/Libraries
License: GPLv2
URL: http://www.horde.org/apps/wicked
Source0: http://%{pear_channel}/get/%{pear_name}-%{version}.tgz
+Patch0: %{pear_name}-php74.patch
+
BuildArch: noarch
BuildRequires: gettext
BuildRequires: php(language) >= 5.3.0
@@ -28,6 +29,29 @@ BuildRequires: php-pear(PEAR) >= 1.7.0
BuildRequires: php-channel(%{pear_channel})
BuildRequires: php-pear(%{pear_channel}/Horde_Role) >= 1.0.0
%if %{with_tests}
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-pear(%{pear_channel}/horde) >= 5.0.0 with php-pear(%{pear_channel}/horde) < 6)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Auth) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Auth) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Autoloader) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Autoloader) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Core) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Core) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Db) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Db) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Exception) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Form) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Form) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Http) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Http) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Lock) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Lock) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Mail) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Mail) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Mime) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Mime) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Mime_Viewer) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Mime_Viewer) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Notification) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Notification) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Perms) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Perms) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Prefs) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Prefs) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Rpc) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Rpc) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Text_Diff) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Text_Diff) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Url) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Url) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Util) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Util) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Vfs) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Vfs) < 3)
+BuildRequires: (php-pear(%{pear_channel}/Horde_Test) >= 2.1.0 with php-pear(%{pear_channel}/Horde_Test) < 3)
+%else
BuildRequires: php-pear(%{pear_channel}/horde) >= 5.0.0
BuildRequires: php-pear(%{pear_channel}/Horde_Auth) >= 2.0.0
BuildRequires: php-pear(%{pear_channel}/Horde_Autoloader) >= 2.0.0
@@ -50,6 +74,7 @@ BuildRequires: php-pear(%{pear_channel}/Horde_Util) >= 2.0.0
BuildRequires: php-pear(%{pear_channel}/Horde_Vfs) >= 2.0.0
BuildRequires: php-pear(%{pear_channel}/Horde_Test) >= 2.1.0
%endif
+%endif
Requires(post): %{__pear}
Requires(postun): %{__pear}
@@ -62,6 +87,28 @@ Requires: php(language) >= 5.3.0
Requires: php-gettext
Requires: php-pear(PEAR) >= 1.7.0
Requires: php-channel(%{pear_channel})
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires: (php-pear(%{pear_channel}/horde) >= 5.0.0 with php-pear(%{pear_channel}/horde) < 6)
+Requires: (php-pear(%{pear_channel}/Horde_Auth) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Auth) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Autoloader) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Autoloader) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Core) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Core) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Db) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Db) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Exception) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Exception) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Form) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Form) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Http) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Http) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Lock) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Lock) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Mail) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Mail) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Mime) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Mime) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Mime_Viewer) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Mime_Viewer) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Notification) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Notification) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Perms) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Perms) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Prefs) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Prefs) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Rpc) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Rpc) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Text_Diff) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Text_Diff) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Url) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Url) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Util) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Util) < 3)
+Requires: (php-pear(%{pear_channel}/Horde_Vfs) >= 2.0.0 with php-pear(%{pear_channel}/Horde_Vfs) < 3)
+%else
Requires: php-pear(%{pear_channel}/horde) >= 5.0.0
Requires: php-pear(%{pear_channel}/horde) < 6.0.0
Requires: php-pear(%{pear_channel}/Horde_Auth) >= 2.0.0
@@ -102,6 +149,7 @@ Requires: php-pear(%{pear_channel}/Horde_Util) >= 2.0.0
Requires: php-pear(%{pear_channel}/Horde_Util) < 3.0.0
Requires: php-pear(%{pear_channel}/Horde_Vfs) >= 2.0.0
Requires: php-pear(%{pear_channel}/Horde_Vfs) < 3.0.0
+%endif
# From package.xml, optional
Requires: php-pear(Text_Figlet)
# Optional and not yet available:
@@ -148,9 +196,12 @@ cd %{pear_name}-%{version}
sed -e '/%{pear_name}.po/d' \
-e '/htaccess/d' \
-e '/%{pear_name}.mo/s/md5sum=.*name=/name=/' \
+ -e '/.php/s/md5sum=.*name=/name=/' \
../package.xml >%{name}.xml
touch -r ../package.xml %{name}.xml
+%patch0 -p1 -b .php74
+
%build
cd %{pear_name}-%{version}
@@ -201,7 +252,7 @@ sed -e 's:#!/usr/bin/env php:#!%{_bindir}/php:' \
cd %{pear_name}-%{version}/test/Wicked
ret=0
-for cmd in php php56 php70 php71 php72; do
+for cmd in php php71 php72 php73 php74; do
if which $cmd; then
$cmd %{_bindir}/phpunit --verbose . || ret=1
fi
@@ -247,6 +298,12 @@ fi
%changelog
+* Fri Nov 15 2019 Remi Collet <remi@remirepo.net> - 2.0.8-6
+- fix FTBFS from Koschei
+- add patch for PHP 7.4 from
+ https://github.com/horde/wicked/pull/1
+- use range dependencies
+
* Thu Sep 21 2017 Remi Collet <remi@remirepo.net> - 2.0.8-1
- Update to 2.0.8
- drop dependency on Text_Wiki
generated by cgit (git 2.34.1) at 2024-11-21 23:11:25 +0000