From ec546752769681144b07e6d4dba0045023f0c49d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 12 Jun 2019 16:24:21 +0200 Subject: v1.1.0 from Fedora --- php-cache-adapter-common.spec | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) (limited to 'php-cache-adapter-common.spec') diff --git a/php-cache-adapter-common.spec b/php-cache-adapter-common.spec index 7ce1026..ebcbd57 100644 --- a/php-cache-adapter-common.spec +++ b/php-cache-adapter-common.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-cache-adapter-common # -# Copyright (c) 2017 Shawn Iwinski +# Copyright (c) 2017-2019 Shawn Iwinski # # License: MIT # http://opensource.org/licenses/MIT @@ -12,8 +12,8 @@ %global github_owner php-cache %global github_name adapter-common -%global github_version 0.4.0 -%global github_commit 2adecd1375fe2ce15b1679349965d7fa73f2676b +%global github_version 1.1.0 +%global github_commit 6320bb5f5574cb88438059b59f8708da6b6f1d32 %global composer_vendor cache %global composer_project adapter-common @@ -43,26 +43,36 @@ Version: %{github_version} Release: 1%{?github_release}%{?dist} Summary: Common classes for PSR-6 adapters -Group: Development/Libraries License: MIT URL: https://github.com/%{github_owner}/%{github_name} -Source0: %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz + +# GitHub export does not include tests +# Run php-cache-adapter-common-get-source.sh to create full source +Source0: %{name}-%{github_version}-%{github_commit}.tar.gz +Source1: %{name}-get-source.sh BuildArch: noarch # Tests %if %{with_tests} ## composer.json BuildRequires: php(language) >= %{php_min_ver} +BuildRequires: php-composer(phpunit/phpunit) +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +BuildRequires: (php-composer(cache/tag-interop) >= %{cache_tag_interop_min_ver} with php-composer(cache/tag-interop) < %{cache_tag_interop_max_ver}) +BuildRequires: (php-composer(psr/cache) >= %{psr_cache_min_ver} with php-composer(psr/cache) < %{psr_cache_max_ver}) +BuildRequires: (php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver}) +BuildRequires: (php-composer(psr/simple-cache) >= %{psr_simple_cache_min_ver} with php-composer(psr/simple-cache) < %{psr_simple_cache_max_ver}) +%else BuildRequires: php-composer(cache/tag-interop) < %{cache_tag_interop_max_ver} BuildRequires: php-composer(cache/tag-interop) >= %{cache_tag_interop_min_ver} -BuildRequires: php-composer(phpunit/phpunit) BuildRequires: php-composer(psr/cache) < %{psr_cache_max_ver} BuildRequires: php-composer(psr/cache) >= %{psr_cache_min_ver} BuildRequires: php-composer(psr/log) < %{psr_log_max_ver} BuildRequires: php-composer(psr/log) >= %{psr_log_min_ver} BuildRequires: php-composer(psr/simple-cache) < %{psr_simple_cache_max_ver} BuildRequires: php-composer(psr/simple-cache) >= %{psr_simple_cache_min_ver} -## phpcompatinfo (computed from version 0.4.0) +%endif +## phpcompatinfo (computed from version 1.1.0) BuildRequires: php-date BuildRequires: php-pcre BuildRequires: php-reflection @@ -73,6 +83,12 @@ BuildRequires: php-composer(fedora/autoloader) # composer.json Requires: php(language) >= %{php_min_ver} +%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 +Requires: (php-composer(cache/tag-interop) >= %{cache_tag_interop_min_ver} with php-composer(cache/tag-interop) < %{cache_tag_interop_max_ver}) +Requires: (php-composer(psr/cache) >= %{psr_cache_min_ver} with php-composer(psr/cache) < %{psr_cache_max_ver}) +Requires: (php-composer(psr/log) >= %{psr_log_min_ver} with php-composer(psr/log) < %{psr_log_max_ver}) +Requires: (php-composer(psr/simple-cache) >= %{psr_simple_cache_min_ver} with php-composer(psr/simple-cache) < %{psr_simple_cache_max_ver}) +%else Requires: php-composer(cache/tag-interop) < %{cache_tag_interop_max_ver} Requires: php-composer(cache/tag-interop) >= %{cache_tag_interop_min_ver} Requires: php-composer(psr/cache) < %{psr_cache_max_ver} @@ -81,7 +97,8 @@ Requires: php-composer(psr/log) < %{psr_log_max_ver} Requires: php-composer(psr/log) >= %{psr_log_min_ver} Requires: php-composer(psr/simple-cache) < %{psr_simple_cache_max_ver} Requires: php-composer(psr/simple-cache) >= %{psr_simple_cache_min_ver} -# phpcompatinfo (computed from version 0.4.0) +%endif +# phpcompatinfo (computed from version 1.1.0) Requires: php-date Requires: php-pcre Requires: php-spl @@ -138,7 +155,7 @@ BOOTSTRAP : Upstream tests RETURN_CODE=0 -for PHP_EXEC in php php70 php71 php72; do +for PHP_EXEC in php php71 php72 php73 php74; do if which $PHP_EXEC; then $PHP_EXEC %{_bindir}/phpunit --verbose --bootstrap bootstrap.php \ || RETURN_CODE=1 @@ -165,5 +182,9 @@ exit $RETURN_CODE %changelog +* Sat Jun 01 2019 Shawn Iwinski - 1.1.0-1 +- Update to 1.1.0 (RHBZ #1474797) +- Add range version dependencies for Fedora >= 27 || RHEL >= 8 + * Fri Apr 14 2017 Shawn Iwinski - 0.4.0-1 - Initial package -- cgit