summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-05-14 07:26:28 +0200
committerRemi Collet <remi@remirepo.net>2018-05-14 07:26:28 +0200
commitefb0c4d8a5f1c0f9ae91fc258795d50e2446336b (patch)
treea0c0773ee8e422bf8cf4fb58f8f4b6d354af94f4
parentc60073201aa5a61b3c72a303966f382a33914356 (diff)
update to 1.6.7 (no change)
switch to phpunit7
-rw-r--r--php-tecnickcom-tc-lib-unicode-data.spec20
1 files changed, 15 insertions, 5 deletions
diff --git a/php-tecnickcom-tc-lib-unicode-data.spec b/php-tecnickcom-tc-lib-unicode-data.spec
index f4e270e..9bbf9aa 100644
--- a/php-tecnickcom-tc-lib-unicode-data.spec
+++ b/php-tecnickcom-tc-lib-unicode-data.spec
@@ -15,7 +15,7 @@
%global with_tests 0%{!?_without_tests:1}
Name: php-%{gh_owner}-%{gh_project}
-Version: 1.6.6
+Version: 1.6.7
Release: 1%{?dist}
Summary: PHP library containing UTF-8 font definitions
@@ -27,7 +27,12 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
BuildArch: noarch
%if %{with_tests}
# For tests
-BuildRequires: php-composer(phpunit/phpunit)
+%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
+%global phpunit %{_bindir}/phpunit7
+%else
+%global phpunit %{_bindir}/phpunit
+%endif
+BuildRequires: %{phpunit}
BuildRequires: php(language) >= 5.4
%endif
@@ -54,8 +59,9 @@ The initial source code has been extracted from TCPDF (http://www.tcpdf.org).
%prep
%setup -q -n %{gh_project}-%{gh_commit}
+# See https://github.com/tecnickcom/tc-lib-unicode-data/issues/3
: Sanity check
-grep -q '^%{version}$' VERSION
+#grep -q '^%{version}$' VERSION
%build
@@ -78,10 +84,10 @@ require '%{buildroot}%{php_project}/autoload.php';
EOF
ret=0
-for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do
+for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" "php70 %{_bindir}/phpunit6" php71 php72; do
if which $cmdarg; then
set $cmdarg
- $1 ${2:-%{_bindir}/phpunit6} --no-coverage --verbose || ret=1
+ $1 ${2:-%{_bindir}/phpunit7} --no-coverage --verbose || ret=1
fi
done
exit $ret
@@ -102,6 +108,10 @@ exit $ret
%changelog
+* Mon May 14 2018 Remi Collet <remi@remirepo.net> - 1.6.7-1
+- update to 1.6.7 (no change)
+- switch to phpunit7
+
* Tue Jan 2 2018 Remi Collet <remi@remirepo.net> - 1.6.6-1
- Update to 1.6.6 (no change)