summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json3
-rw-r--r--php-zendframework-zend-mime.spec35
2 files changed, 25 insertions, 13 deletions
diff --git a/composer.json b/composer.json
index 8bfed71..356e974 100644
--- a/composer.json
+++ b/composer.json
@@ -54,8 +54,7 @@
"cs-check": "phpcs",
"cs-fix": "phpcbf",
"test": "phpunit --colors=always",
- "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
- "upload-coverage": "coveralls -v"
+ "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
},
"homepage": "https://github.com/zendframework/zend-mime"
}
diff --git a/php-zendframework-zend-mime.spec b/php-zendframework-zend-mime.spec
index 4e3825b..dfb0bb7 100644
--- a/php-zendframework-zend-mime.spec
+++ b/php-zendframework-zend-mime.spec
@@ -1,13 +1,13 @@
# remirepo/Fedora spec file for php-zendframework-zend-mime
#
-# Copyright (c) 2015-2017 Remi Collet
+# Copyright (c) 2015-2018 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 5db38e92f8a6c7c5e25c8afce6e2d0bd49340c5f
+%global gh_commit 52ae5fa9f12845cae749271034a2d594f0e4c6f2
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner zendframework
%global gh_project zend-mime
@@ -20,7 +20,7 @@
%endif
Name: php-%{gh_owner}-%{gh_project}
-Version: 2.7.0
+Version: 2.7.1
Release: 2%{?dist}
Summary: Zend Framework %{library} component
@@ -37,17 +37,22 @@ BuildRequires: php(language) >= 5.6
BuildRequires: php-iconv
BuildRequires: php-pcre
BuildRequires: php-spl
-BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7
# From composer, "require-dev": {
# "zendframework/zend-mail": "^2.6"",
# "phpunit/PHPUnit": "^5.7.21 || ^6.3",
# "zendframework/zend-coding-standard": "~1.0.0"
-BuildRequires: php-composer(%{gh_owner}/zend-mail) >= 2.6
-%if 0%{?fedora} >= 26
-%global phpunit %{_bindir}/phpunit6
+# 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)
+BuildRequires: (php-composer(%{gh_owner}/zend-mail) >= 2.6 with php-composer(%{gh_owner}/zend-mail) < 3)
+# remirepo:6
%else
-%global phpunit %{_bindir}/phpunit
+BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) < 4
+BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7
+BuildRequires: php-composer(%{gh_owner}/zend-mail) < 3
+BuildRequires: php-composer(%{gh_owner}/zend-mail) >= 2.6
%endif
+%global phpunit %{_bindir}/phpunit6
BuildRequires: %{phpunit}
# Autoloader
BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5
@@ -59,14 +64,18 @@ BuildRequires: php-fedora-autoloader-devel
# "zendframework/zend-stdlib": "^2.7 || ^3.0"
Requires: php(language) >= 5.6
%if ! %{bootstrap}
-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
# From composer, "suggest": {
# "zendframework/zend-mail": "Zend\\Mail component"
-%if 0%{?fedora} >= 21
Suggests: php-composer(%{gh_owner}/zend-mail)
%endif
-%endif
# Autoloader
Requires: php-composer(fedora/autoloader)
# From phpcompatinfo report for version 2.5.1
@@ -147,6 +156,10 @@ exit $ret
%changelog
+* Tue May 15 2018 Remi Collet <remi@remirepo.net> - 2.7.1-2
+- update to 2.7.1
+- use range dependencies on F27+
+
* Mon Dec 11 2017 Remi Collet <remi@remirepo.net> - 2.7.0-2
- switch from zend-loader to fedora/autoloader