summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-09-18 06:51:19 +0200
committerRemi Collet <remi@remirepo.net>2018-09-18 06:51:19 +0200
commit20c58b0ce4a6d0e08208a5e4ad6d1f6e06aed76b (patch)
treed0c504bbf2021e8358d1ab6346d100a2fa7e6bcc
parente4f93e19de24f89d60b9854c1a504b1ad8c596b6 (diff)
-rw-r--r--composer.json1
-rw-r--r--phpcpd.spec18
2 files changed, 12 insertions, 7 deletions
diff --git a/composer.json b/composer.json
index 468546c..4725df9 100644
--- a/composer.json
+++ b/composer.json
@@ -23,6 +23,7 @@
"prefer-stable": true,
"require": {
"php": "^7.1",
+ "ext-dom": "*",
"sebastian/finder-facade": "^1.1",
"sebastian/version": "^1.0|^2.0",
"symfony/console": "^2.7|^3.0|^4.0",
diff --git a/phpcpd.spec b/phpcpd.spec
index 9497de8..3a5ac2e 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
@@ -40,7 +40,7 @@ BuildRequires: php-fedora-autoloader-devel
%if %{with_tests}
BuildRequires: phpunit7
# remirepo:1
-%if 0%{?fedora} >= 27
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires: (php-composer(sebastian/finder-facade) >= 1.1 with php-composer(sebastian/finder-facade) < 2)
BuildRequires: (php-composer(sebastian/version) >= 1.0 with php-composer(sebastian/version) < 3)
BuildRequires: (php-composer(symfony/console) >= 2.7 with php-composer(symfony/console) < 5)
@@ -56,13 +56,15 @@ BuildRequires: php-phpunit-php-timer2
# 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
# remirepo:1
-%if 0%{?fedora} >= 27
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
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)
@@ -76,7 +78,6 @@ Requires: php-phpunit-php-timer2
%endif
# From phpcompatinfo report for version 3.0.0
Requires: php-cli
-Requires: php-dom
Requires: php-mbstring
Requires: php-pcre
Requires: php-spl
@@ -84,7 +85,7 @@ Requires: php-tokenizer
Requires: php-xml
# remirepo:1
-%if 0%{?fedora} >= 26
+%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
Obsoletes: php-phpunit-%{pk_project} < 4
Provides: php-phpunit-%{pk_project} = %{version}
# remirepo:3
@@ -142,7 +143,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
@@ -163,6 +164,9 @@ exit $ret
%changelog
+* Tue Sep 18 2018 Remi Collet <remi@remirepo.net> - 4.1.0-1
+- update to 4.1.0
+
* Tue Feb 6 2018 Remi Collet <remi@remirepo.net> - 4.0.0-1
- Update to 4.0.0
- rename to phpcpd (and obsolete php-phpunit-phpcpd)