From a08e1fbed649359bc3078cbb53483bf497ca23d3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 18 Sep 2018 06:52:28 +0200 Subject: [PATCH] v4.1.0 (cherry picked from commit ed761828a90e2fb5953ffbdddc0ad01230e60792) --- .gitignore | 1 + phpcpd.spec | 12 ++++++++---- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1d9b3a4..0864274 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /phpcpd-4.0.0-bb7953b.tar.gz +/phpcpd-4.1.0-0d9afa7.tar.gz diff --git a/phpcpd.spec b/phpcpd.spec index 8dd72dc..f2a8e78 100644 --- a/phpcpd.spec +++ b/phpcpd.spec @@ -9,7 +9,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit bb7953b81fb28e55964d76d5fe2dbe725d43fab3 +%global gh_commit 0d9afa762f2400de077b2192f4a9d127de0bb78e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project phpcpd @@ -23,7 +23,7 @@ %global ns_project PHPCPD Name: %{pk_project} -Version: 4.0.0 +Version: 4.1.0 Release: 1%{?dist} Summary: Copy/Paste Detector (CPD) for PHP code @@ -47,18 +47,19 @@ BuildRequires: (php-composer(phpunit/php-timer) >= 2.0 with php-compose # From composer.json, requires # "php": "^7.1", +# "ext-dom": "*", # "sebastian/finder-facade": "^1.1", # "sebastian/version": "^1.0|^2.0", # "symfony/console": "^2.7|^3.0|^4.0", # "phpunit/php-timer": "^2.0" Requires: php(language) >= 7.1 +Requires: php-dom Requires: (php-composer(sebastian/finder-facade) >= 1.1 with php-composer(sebastian/finder-facade) < 2) Requires: (php-composer(sebastian/version) >= 1.0 with php-composer(sebastian/version) < 3) Requires: (php-composer(symfony/console) >= 2.7 with php-composer(symfony/console) < 5) Requires: (php-composer(phpunit/php-timer) >= 2.0 with php-composer(phpunit/php-timer) < 3) # From phpcompatinfo report for version 3.0.0 Requires: php-cli -Requires: php-dom Requires: php-mbstring Requires: php-pcre Requires: php-spl @@ -118,7 +119,7 @@ mkdir vendor ln -s %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php vendor/autoload.php ret=0; -for cmd in php php71 php72; do +for cmd in php php71 php72 php73; do if which $cmd; then $cmd %{_bindir}/phpunit7 --verbose || ret=1 fi @@ -137,6 +138,9 @@ exit $ret %changelog +* Tue Sep 18 2018 Remi Collet - 4.1.0-1 +- update to 4.1.0 + * Tue Feb 6 2018 Remi Collet - 4.0.0-1 - Update to 4.0.0 - rename to phpcpd (and obsolete php-phpunit-phpcpd) diff --git a/sources b/sources index 21bf57f..72db30b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpcpd-4.0.0-bb7953b.tar.gz) = 6a583b85e9cd16759716e1c8743f1a9dfe762b4639ea5e59c36f2d90b015c648f8d6f8f86d27800ace250adb617149ea3c05600baebb773864ba3492bcae8ccd +SHA512 (phpcpd-4.1.0-0d9afa7.tar.gz) = 7025a8f066d24194ae095cf13f3284e914cd6afe4f0cb06f011df9bb0c0d360262174d4c1d37e09c469c6d767fd76dd46b9958598a96d4fa3cbc0726bb8ffbb6