summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php-cache-integration-tests.spec16
1 files changed, 9 insertions, 7 deletions
diff --git a/php-cache-integration-tests.spec b/php-cache-integration-tests.spec
index 9064290..e7a28f9 100644
--- a/php-cache-integration-tests.spec
+++ b/php-cache-integration-tests.spec
@@ -31,10 +31,9 @@
Name: php-%{composer_vendor}-%{composer_project}
Version: %{github_version}
-Release: 1%{?github_release}%{?dist}
+Release: 2%{?github_release}%{?dist}
Summary: Integration tests for PSR-6 and PSR-16 cache implementations
-Group: Development/Libraries
License: MIT
URL: http://www.php-cache.com
Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz
@@ -42,7 +41,7 @@ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{githu
BuildArch: noarch
# Minimal autoloader test
BuildRequires: php-cli
-BuildRequires: php-composer(phpunit/phpunit)
+BuildRequires: phpunit9
## composer.json
BuildRequires: php(language) >= %{php_min_ver}
# remirepo:1
@@ -68,12 +67,11 @@ Requires: (php-composer(psr/cache) >= %{psr_cache_min_ver} with php-composer
# 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-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)
+# phpcompatinfo (computed from version 0.17.0)
Requires: php-date
# Autoloader
Requires: php-composer(fedora/autoloader)
@@ -110,7 +108,6 @@ require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
\Fedora\Autoloader\Dependencies::required([
'%{phpdir}/Cache/TagInterop/autoload.php',
- '%{phpdir}/PHPUnit/Autoload.php',
'%{phpdir}/Psr/Cache/autoload.php',
]);
AUTOLOAD
@@ -124,6 +121,7 @@ cp -rp src %{buildroot}%{phpdir}/Cache/IntegrationTests
%check
: Minimal autoloader test
php -r '
+ require_once "%{phpdir}/PHPUnit9/autoload.php";
require_once "%{buildroot}%{phpdir}/Cache/IntegrationTests/autoload.php";
exit(class_exists("Cache\\IntegrationTests\\CachePoolTest") ? 0 : 1);
'
@@ -138,6 +136,10 @@ php -r '
%changelog
+* Mon May 3 2021 Remi Collet <remi@remirepo.net> - 0.17.0-2
+- Fix dependencies: don't require PHPUnit autoloader as
+ will always be used from phpunit command, various versions
+
* Mon May 3 2021 Remi Collet <remi@remirepo.net> - 0.17.0-1
- update to 0.17.0