summaryrefslogtreecommitdiffstats
path: root/php-zendframework-zend-config.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-02-05 09:58:37 +0100
committerRemi Collet <remi@remirepo.net>2019-02-05 09:58:37 +0100
commita8582bcbf0af55cd634f254e3a8e43fd4e0378e4 (patch)
treed0fe4a8e82eb9078f19112e572b0c25ff03a4c3f /php-zendframework-zend-config.spec
parent33e040624b5f182b8e514e0efec2ba10370b537a (diff)
fix FTBFS with PHP 7.3, patch from https://github.com/zendframework/zend-config/pull/54HEADmaster
use range dependencies
Diffstat (limited to 'php-zendframework-zend-config.spec')
-rw-r--r--php-zendframework-zend-config.spec52
1 files changed, 43 insertions, 9 deletions
diff --git a/php-zendframework-zend-config.spec b/php-zendframework-zend-config.spec
index c997044..7e34296 100644
--- a/php-zendframework-zend-config.spec
+++ b/php-zendframework-zend-config.spec
@@ -1,6 +1,6 @@
# remirepo/Fedora spec file for php-zendframework-zend-config
#
-# Copyright (c) 2015-2017 Remi Collet
+# Copyright (c) 2015-2019 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -21,15 +21,16 @@
Name: php-%{gh_owner}-%{gh_project}
Version: 2.6.0
-Release: 4%{?dist}
+Release: 7%{?dist}
Summary: Zend Framework %{library} component
-Group: Development/Libraries
License: BSD
URL: https://zendframework.github.io/%{gh_project}/
Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz
Source1: makesrc.sh
+Patch0: https://github.com/zendframework/zend-config/commit/27d5ba5c13cb4a576400f534057b69231190ac9d.patch
+
BuildArch: noarch
# Tests
%if %{with_tests}
@@ -39,7 +40,14 @@ BuildRequires: php-pcre
BuildRequires: php-spl
BuildRequires: php-xmlreader
BuildRequires: php-xmlwriter
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4)
+# remirepo:4
+%else
+BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) < 4
BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7
+%endif
# From composer, "require-dev": {
# "zendframework/zend-filter": "^2.6",
# "zendframework/zend-i18n": "^2.5",
@@ -47,10 +55,24 @@ BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7
# "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
# "fabpot/php-cs-fixer": "1.7.*",
# "phpunit/PHPUnit": "~4.0"
-BuildRequires: php-autoloader(%{gh_owner}/zend-filter) >= 2.5
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-autoloader(%{gh_owner}/zend-filter) >= 2.6 with php-autoloader(%{gh_owner}/zend-filter) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-i18n) >= 2.5 with php-autoloader(%{gh_owner}/zend-i18n) < 3)
+# ignore max version, as test suite passes with v3
+BuildRequires: (php-autoloader(%{gh_owner}/zend-json) >= 2.6.1 with php-autoloader(%{gh_owner}/zend-json) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 with php-autoloader(%{gh_owner}/zend-servicemanager) < 4)
+# remirepo:10
+%else
+BuildRequires: php-autoloader(%{gh_owner}/zend-filter) < 3
+BuildRequires: php-autoloader(%{gh_owner}/zend-filter) >= 2.6
+BuildRequires: php-autoloader(%{gh_owner}/zend-i18n) < 3
BuildRequires: php-autoloader(%{gh_owner}/zend-i18n) >= 2.5
-BuildRequires: php-autoloader(%{gh_owner}/zend-json) >= 2.5
-BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.5
+BuildRequires: php-autoloader(%{gh_owner}/zend-json) < 4
+BuildRequires: php-autoloader(%{gh_owner}/zend-json) >= 2.6.1
+BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) < 4
+BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5
+%endif
BuildRequires: php-composer(phpunit/phpunit) >= 4.0
%endif
# Autoloader
@@ -60,8 +82,14 @@ BuildRequires: php-fedora-autoloader-devel
# "php": "^5.5 || ^7.0",
# "zendframework/zend-stdlib": "^2.7 || ^3.0"
Requires: php(language) >= 5.5
-Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4)
+# remirepo:4
+%else
Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4
+Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7
+%endif
# Autoloader
Requires: php-composer(fedora/autoloader)
# From phpcompatinfo report for version 2.5.2
@@ -76,7 +104,7 @@ Requires: php-xmlwriter
# "zendframework/zend-i18n": "Zend\\I18n component",
# "zendframework/zend-json": "Zend\\Json to use the Json reader or writer classes",
# "zendframework/zend-servicemanager": "Zend\\ServiceManager for use with the Config Factory to retrieve reader and writer instances"
-%if 0%{?fedora} >= 21
+%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
Suggests: php-autoloader(%{gh_owner}/zend-filter)
Suggests: php-autoloader(%{gh_owner}/zend-i18n)
Suggests: php-autoloader(%{gh_owner}/zend-json)
@@ -102,6 +130,7 @@ Documentation: https://zendframework.github.io/%{gh_project}/
%prep
%setup -q -n %{gh_project}-%{gh_commit}
+%patch0 -p1
mv LICENSE.md LICENSE
@@ -136,7 +165,7 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php';
EOF
ret=0
-for cmd in php php56 php70 php71 php72; do
+for cmd in php php56 php70 php71 php72 php73; do
if which $cmd; then
$cmd %{_bindir}/phpunit || ret=1
fi
@@ -156,6 +185,11 @@ exit $ret
%changelog
+* Tue Feb 5 2019 Remi Collet <remi@remirepo.net> - 2.6.0-7
+- fix FTBFS with PHP 7.3, patch from
+ https://github.com/zendframework/zend-config/pull/54
+- use range dependencies
+
* Thu Dec 7 2017 Remi Collet <remi@remirepo.net> - 2.6.0-4
- switch from zend-loader to fedora/autoloader