summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2017-10-22 19:07:56 +0200
committerRemi Collet <remi@remirepo.net>2017-10-22 19:07:56 +0200
commit6533b218bffaf647caf42f412831ce5f1e08b367 (patch)
treedbea9c15a0fb8f004f5a4a45368d1408c6dccd7f
parent75977d7ee0d3063802f238adc4830858c054be08 (diff)
Update to 4.0.2
raise dependency on phpunit/php-code-coverage 5.2.1 drop dependency on php-phpunit-diff add dependency on php-sebastian-diff2
-rw-r--r--composer.json4
-rw-r--r--phpcov.spec30
2 files changed, 20 insertions, 14 deletions
diff --git a/composer.json b/composer.json
index 309130b..23c7115 100644
--- a/composer.json
+++ b/composer.json
@@ -16,8 +16,8 @@
"require": {
"php": "^7.0",
"phpunit/phpunit": "^6.0",
- "phpunit/php-code-coverage": "^5.0",
- "sebastian/diff": "^1.1",
+ "phpunit/php-code-coverage": "^5.2.1",
+ "sebastian/diff": "^1.1 || ^2.0",
"sebastian/finder-facade": "^1.1",
"sebastian/version": "^2.0",
"symfony/console": "^3"
diff --git a/phpcov.spec b/phpcov.spec
index 0a1ecf7..44aa757 100644
--- a/phpcov.spec
+++ b/phpcov.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 8afb1e74ce354cc09374d81ef00a0c3d4b7eb7e9
+%global gh_commit 880a4264c927f7eb78fe42fab5ca4dc9c5ce2631
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner sebastianbergmann
%global gh_project phpcov
@@ -21,7 +21,7 @@
Name: %{pk_project}
-Version: 4.0.1
+Version: 4.0.2
Release: 1%{?dist}
Summary: CLI frontend for PHP_CodeCoverage
@@ -39,9 +39,9 @@ BuildRequires: php-fedora-autoloader-devel
%if %{with_tests}
BuildRequires: phpunit6
BuildRequires: php-composer(phpunit/php-code-coverage) < 6
-BuildRequires: php-composer(phpunit/php-code-coverage) >= 5.0
-BuildRequires: php-composer(sebastian/diff) < 2
-BuildRequires: php-composer(sebastian/diff) >= 1.1
+BuildRequires: php-composer(phpunit/php-code-coverage) >= 5.2.1
+BuildRequires: php-composer(sebastian/diff) < 3
+BuildRequires: php-composer(sebastian/diff) >= 2
BuildRequires: php-composer(sebastian/finder-facade) < 2
BuildRequires: php-composer(sebastian/finder-facade) >= 1.1
BuildRequires: php-composer(sebastian/version) < 3
@@ -54,17 +54,17 @@ BuildRequires: php-pecl(Xdebug)
# from composer.json
# "php": "^7.0",
# "phpunit/phpunit": "^6.0",
-# "phpunit/php-code-coverage": "^5.0",
-# "sebastian/diff": "^1.1",
+# "phpunit/php-code-coverage": "^5.2.1",
+# "sebastian/diff": "^1.1 || ^2.0",
# "sebastian/finder-facade": "^1.1",
# "sebastian/version": "^2.0",
# "symfony/console": "^3"
Requires: php(language) >= 7.0
Requires: phpunit6
Requires: php-composer(phpunit/php-code-coverage) < 6
-Requires: php-composer(phpunit/php-code-coverage) >= 5.0
-Requires: php-composer(sebastian/diff) < 2
-Requires: php-composer(sebastian/diff) >= 1.1
+Requires: php-composer(phpunit/php-code-coverage) >= 5.2.1
+Requires: php-composer(sebastian/diff) < 3
+Requires: php-composer(sebastian/diff) >= 2
Requires: php-composer(sebastian/finder-facade) < 2
Requires: php-composer(sebastian/finder-facade) >= 1.1
Requires: php-composer(sebastian/version) < 3
@@ -105,7 +105,7 @@ cat << 'EOF' | tee -a src/autoload.php
\Fedora\Autoloader\Dependencies::required([
'%{php_home}/PHPUnit6/autoload.php',
'%{php_home}/%{ns_vendor}/CodeCoverage5/autoload.php',
- '%{php_home}/%{ns_vendor}/Diff/autoload.php',
+ '%{php_home}/%{ns_vendor}/Diff2/autoload.php',
'%{php_home}/%{ns_vendor}/FinderFacade/autoload.php',
'%{php_home}/%{ns_vendor}/Version/autoload.php',
[
@@ -129,7 +129,7 @@ mkdir vendor
ln -s %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php vendor/autoload.php
# 7.2: XDebug not yet available
-for cmd in php php70 php71; do
+for cmd in php php70 php71 php72; do
if which $cmd; then
$cmd %{_bindir}/phpunit6 --verbose
fi
@@ -149,6 +149,12 @@ done
%changelog
+* Sun Oct 22 2017 Remi Collet <remi@remirepo.net> - 4.0.2-1
+- Update to 4.0.2
+- raise dependency on phpunit/php-code-coverage 5.2.1
+- drop dependency on php-phpunit-diff
+- add dependency on php-sebastian-diff2
+
* Fri Apr 28 2017 Remi Collet <remi@remirepo.net> - 4.0.1-1
- Update to 4.0.1