summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-05-03 07:28:57 +0200
committerRemi Collet <remi@remirepo.net>2021-05-03 07:28:57 +0200
commit639ccd5ef8f309b014e738cdfccd19619874af44 (patch)
tree8965272022b8aa87e3d77b7c7c21558478e7093d
parent74dff0cd9339fb5835935b423312bd85df2cd969 (diff)
update to 0.17.0
-rw-r--r--php-cache-integration-tests.spec39
1 files changed, 28 insertions, 11 deletions
diff --git a/php-cache-integration-tests.spec b/php-cache-integration-tests.spec
index 6170d27..9064290 100644
--- a/php-cache-integration-tests.spec
+++ b/php-cache-integration-tests.spec
@@ -2,7 +2,7 @@
#
# Fedora spec file for php-cache-integration-tests
#
-# Copyright (c) 2017 Shawn Iwinski <shawn@iwin.ski>
+# Copyright (c) 2017-2021 Shawn Iwinski <shawn@iwin.ski>
#
# License: MIT
# http://opensource.org/licenses/MIT
@@ -12,8 +12,8 @@
%global github_owner php-cache
%global github_name integration-tests
-%global github_version 0.16.0
-%global github_commit a8d9538a44ed5a70d551f9b87f534c98dfe6b0ee
+%global github_version 0.17.0
+%global github_commit eda2e6b8bc5abcd623c8047e2345cda38dd6479e
%global composer_vendor cache
%global composer_project integration-tests
@@ -45,19 +45,33 @@ BuildRequires: php-cli
BuildRequires: php-composer(phpunit/phpunit)
## composer.json
BuildRequires: php(language) >= %{php_min_ver}
-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(psr/cache) < %{psr_cache_max_ver}
-BuildRequires: php-composer(psr/cache) >= %{psr_cache_min_ver}
+# remirepo:1
+%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})
+# remirepo:6
+%else
+BuildRequires: php-cache-tag-interop < %{cache_tag_interop_max_ver}
+BuildRequires: php-cache-tag-interop >= %{cache_tag_interop_min_ver}
+BuildRequires: php-psr-cache < %{psr_cache_max_ver}
+BuildRequires: php-psr-cache >= %{psr_cache_min_ver}
+%endif
## Autoloader
BuildRequires: php-composer(fedora/autoloader)
# composer.json
Requires: php(language) >= %{php_min_ver}
-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}
-Requires: php-composer(psr/cache) >= %{psr_cache_min_ver}
+# remirepo:1
+%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})
+# remirepo:6
+%else
+Requires: php-cache-tag-interop < %{cache_tag_interop_max_ver}
+Requires: php-cache-tag-interop- >= %{cache_tag_interop_min_ver}
+Requires: php-psr-cache < %{psr_cache_max_ver}
+Requires: php-psr-cache >= %{psr_cache_min_ver}
+%endif
# phpcompatinfo (computed from version 0.16.0)
Requires: php-composer(phpunit/phpunit)
Requires: php-date
@@ -124,5 +138,8 @@ php -r '
%changelog
+* Mon May 3 2021 Remi Collet <remi@remirepo.net> - 0.17.0-1
+- update to 0.17.0
+
* Fri Apr 14 2017 Shawn Iwinski <shawn@iwin.ski> - 0.16.0-1
- Initial package