diff options
| -rwxr-xr-x | makesrc.sh | 2 | ||||
| -rw-r--r-- | php-zendframework-zend-expressive-helpers.spec | 53 |
2 files changed, 40 insertions, 15 deletions
@@ -20,7 +20,7 @@ cp composer.json ../composer.json popd echo "Archiving..." -tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT +tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs $PROJECT-$COMMIT echo "Cleaning..." rm -rf $PROJECT-$COMMIT diff --git a/php-zendframework-zend-expressive-helpers.spec b/php-zendframework-zend-expressive-helpers.spec index 3b3a057..1f173c2 100644 --- a/php-zendframework-zend-expressive-helpers.spec +++ b/php-zendframework-zend-expressive-helpers.spec @@ -1,6 +1,6 @@ # remirepo/Fedora spec file for php-zendframework-zend-expressive-helpers # -# Copyright (c) 2016-2017 Remi Collet +# Copyright (c) 2016-2018 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -22,7 +22,7 @@ Name: php-%{gh_owner}-%{gh_project} Version: 3.0.1 -Release: 3%{?dist} +Release: 6%{?dist} Summary: Helper/Utility classes for Expressive Group: Development/Libraries @@ -35,22 +35,36 @@ BuildArch: noarch # Tests %if %{with_tests} BuildRequires: php(language) >= 5.6 -BuildRequires: php-composer(psr/http-message) >= 1.0 BuildRequires: php-json BuildRequires: php-pcre BuildRequires: php-spl -BuildRequires: php-composer(container-interop/container-interop) >= 1.1 -BuildRequires: php-composer(psr/http-message) >= 1.0 -BuildRequires: php-autoloader(%{gh_owner}/zend-expressive-router) >= 2.0 +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(container-interop/container-interop) >= 1.1 with php-composer(container-interop/container-interop) < 2) +BuildRequires: (php-composer(psr/http-message) >= 1.0 with php-composer(psr/http-message) < 2) +BuildRequires: (php-autoloader(%{gh_owner}/zend-expressive-router) >= 2.0 with php-autoloader(%{gh_owner}/zend-expressive-router) < 3) # From composer, "require-dev": { # "phpunit/phpunit": "^4.7", # "zendframework/zend-diactoros": "^1.2", # "mockery/mockery": "^0.9.5", # "zendframework/zend-coding-standard": "~1.0.0", # "malukenho/docheader": "^0.1.5" -BuildRequires: php-composer(phpunit/phpunit) >= 4.7 -BuildRequires: php-autoloader(%{gh_owner}/zend-diactoros) >= 1.2 -BuildRequires: php-composer(mockery/mockery) >= 0.9.5 +BuildRequires: (php-autoloader(%{gh_owner}/zend-diactoros) >= 1.2 with php-autoloader(%{gh_owner}/zend-diactoros) < 2) +BuildRequires: (php-composer(mockery/mockery) >= 0.9.5 with php-composer(mockery/mockery) < 1) +# remirepo:12 +%else +BuildRequires: php-composer(container-interop/container-interop) < 2 +BuildRequires: php-composer(container-interop/container-interop) >= 1.1 +BuildRequires: php-composer(psr/http-message) < 2 +BuildRequires: php-composer(psr/http-message) >= 1.0 +BuildRequires: php-autoloader(%{gh_owner}/zend-expressive-router) < 3 +BuildRequires: php-autoloader(%{gh_owner}/zend-expressive-router) >= 2.0 +BuildRequires: php-autoloader(%{gh_owner}/zend-diactoros) < 2 +BuildRequires: php-autoloader(%{gh_owner}/zend-diactoros) >= 1.2 +BuildRequires: php-composer(mockery/mockery) < 1 +BuildRequires: php-composer(mockery/mockery) >= 0.9.5 +%endif +BuildRequires: php-composer(phpunit/phpunit) >= 4.7 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel @@ -61,12 +75,20 @@ BuildRequires: php-fedora-autoloader-devel # "psr/http-message": "^1.0", # "zendframework/zend-expressive-router": "^2.0" Requires: php(language) >= 5.5 -Requires: php-composer(container-interop/container-interop) >= 1.1 -Requires: php-composer(container-interop/container-interop) < 2 -Requires: php-composer(psr/http-message) >= 1.0 -Requires: php-composer(psr/http-message) < 2 -Requires: php-autoloader(%{gh_owner}/zend-expressive-router) >= 2.0 +# remirepo:1 +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(container-interop/container-interop) >= 1.1 with php-composer(container-interop/container-interop) < 2) +Requires: (php-composer(psr/http-message) >= 1.0 with php-composer(psr/http-message) < 2) +Requires: (php-autoloader(%{gh_owner}/zend-expressive-router) >= 2.0 with php-autoloader(%{gh_owner}/zend-expressive-router) < 3) +# remirepo:8 +%else +Requires: php-composer(container-interop/container-interop) < 2 +Requires: php-composer(container-interop/container-interop) >= 1.1 +Requires: php-composer(psr/http-message) < 2 +Requires: php-composer(psr/http-message) >= 1.0 Requires: php-autoloader(%{gh_owner}/zend-expressive-router) < 3 +Requires: php-autoloader(%{gh_owner}/zend-expressive-router) >= 2.0 +%endif # Autoloader Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 1.4.0 @@ -155,6 +177,9 @@ exit $ret %changelog +* Wed Sep 5 2018 Remi Collet <remi@remirepo.net> - 3.0.1-6 +- use range dependencies + * Mon Dec 11 2017 Remi Collet <remi@remirepo.net> - 3.0.1-3 - switch from zend-loader to fedora/autoloader |