summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-02-25 15:25:40 +0100
committerRemi Collet <remi@remirepo.net>2019-02-25 15:25:40 +0100
commite01b0a0d4f2047ec013a3212874d4b00e802638c (patch)
tree1946953ca330ac7118e627e893aabcdc0fa58417
parente8450bba4f439aa0f53f1f25ec5a1339a25e8d1e (diff)
update to 2.10.0
use range dependencies
-rw-r--r--composer.json2
-rw-r--r--php-zendframework-zend-db.spec32
2 files changed, 27 insertions, 7 deletions
diff --git a/composer.json b/composer.json
index f9f96e4..5f75f91 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
"phpunit/phpunit": "^5.7.25 || ^6.4.4",
"zendframework/zend-coding-standard": "~1.0.0",
"zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
- "zendframework/zend-hydrator": "^1.1 || ^2.1",
+ "zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0",
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
},
"suggest": {
diff --git a/php-zendframework-zend-db.spec b/php-zendframework-zend-db.spec
index 09d0a63..9edc285 100644
--- a/php-zendframework-zend-db.spec
+++ b/php-zendframework-zend-db.spec
@@ -1,13 +1,13 @@
# remirepo/Fedora spec file for php-zendframework-zend-db
#
-# Copyright (c) 2015-2018 Remi Collet
+# Copyright (c) 2015-2019 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit 5b4f2c42f94c9f7f4b2f456a0ebe459fab12b3d9
+%global gh_commit 77022f06f6ffd384fa86d22ab8d8bbdb925a1e8e
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner zendframework
%global gh_project zend-db
@@ -20,7 +20,7 @@
%endif
Name: php-%{gh_owner}-%{gh_project}
-Version: 2.9.3
+Version: 2.10.0
Release: 2%{?dist}
Summary: Zend Framework %{library} component
@@ -37,16 +37,25 @@ BuildRequires: php-date
BuildRequires: php-pcre
BuildRequires: php-pdo
BuildRequires: php-spl
-BuildRequires: 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)
# From composer, "require-dev": {
# "phpunit/phpunit": "^5.7.25 || ^6.4.4",
# "zendframework/zend-coding-standard": "~1.0.0",
# "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-# "zendframework/zend-hydrator": ""^1.1 || ^2.1",
+# "zendframework/zend-hydrator": ""^1.1 || ^2.1 || ^3.0",
# "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
+BuildRequires: (php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.6.2 with php-autoloader(%{gh_owner}/zend-eventmanager) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-hydrator) >= 1.1 with php-autoloader(%{gh_owner}/zend-hydrator) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5 with php-autoloader(%{gh_owner}/zend-servicemanager) < 4)
+# remirepo:6
+%else
+BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7
BuildRequires: php-autoloader(%{gh_owner}/zend-eventmanager) >= 2.6.2
BuildRequires: php-autoloader(%{gh_owner}/zend-hydrator) >= 1.1
BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.7.5
+%endif
%global phpunit %{_bindir}/phpunit6
BuildRequires: phpunit6 >= 6.4.4
%endif
@@ -58,8 +67,14 @@ BuildRequires: php-fedora-autoloader-devel
# "zendframework/zend-stdlib": "^2.7 || ^3.0"
Requires: php(language) >= 5.6
%if ! %{bootstrap}
+# 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) >= 2.7
Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4
+%endif
# From composer, "suggest": {
# "zendframework/zend-eventmanager": "Zend\\EventManager component",
# "zendframework/zend-servicemanager": "Zend\\ServiceManager component"
@@ -129,7 +144,7 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php';
EOF
ret=0
-for cmdarg in "php %{phpunit}" php70 php71 php72; do
+for cmdarg in "php %{phpunit}" php70 php71 php72 php73; do
if which $cmdarg; then
set $cmdarg
$1 ${2:-%{_bindir}/phpunit6} --verbose || ret=1
@@ -142,6 +157,7 @@ exit $ret
%files
+# remirepo:1
%{!?_licensedir:%global license %%doc}
%license LICENSE
%doc *.md
@@ -150,6 +166,10 @@ exit $ret
%changelog
+* Mon Feb 25 2019 Remi Collet <remi@remirepo.net> - 2.10.0-1
+- update to 2.10.0
+- use range dependencies
+
* Wed Apr 11 2018 Remi Collet <remi@remirepo.net> - 2.9.3-2
- update to 2.9.3
- only use phpunit6