Compare commits

...
Sign in to create a new pull request.

1 commit

Author SHA1 Message Date
Remi Collet
2552b9f1d9 update to 2.0.2
switch to phpunit9

(cherry picked from commit 537075816f)
2020-08-11 10:32:30 +02:00
3 changed files with 17 additions and 9 deletions

1
.gitignore vendored
View file

@ -1,3 +1,4 @@
/php-bacon-qr-code-2.0.0-eaac909.tar.gz /php-bacon-qr-code-2.0.0-eaac909.tar.gz
/php-bacon-qr-code2-2.0.0-eaac909.tgz /php-bacon-qr-code2-2.0.0-eaac909.tgz
/php-bacon-qr-code2-2.0.1-6e53ced.tgz /php-bacon-qr-code2-2.0.1-6e53ced.tgz
/php-bacon-qr-code2-2.0.2-add6d9f.tgz

View file

@ -1,12 +1,14 @@
# remirepo/fedora spec file for php-bacon-qr-code2 # remirepo/fedora spec file for php-bacon-qr-code2
# #
# Copyright (c) 2017-2019 Remi Collet # Copyright (c) 2017-2020 Remi Collet
# License: CC-BY-SA # License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/ # http://creativecommons.org/licenses/by-sa/4.0/
# #
# Please, preserve the changelog entries # Please, preserve the changelog entries
# #
%global gh_commit 6e53ced3d2499cee4a0ef23a7c4d6449607ac7da %bcond_without tests
%global gh_commit add6d9ff97336b62f95a3b94f75cea4e085465b2
%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner Bacon %global gh_owner Bacon
%global gh_project BaconQrCode %global gh_project BaconQrCode
@ -18,10 +20,9 @@
%global ns_project %{gh_project} %global ns_project %{gh_project}
%global php_home %{_datadir}/php %global php_home %{_datadir}/php
%global major 2 %global major 2
%bcond_without tests
Name: php-%{pk_project}%{major} Name: php-%{pk_project}%{major}
Version: 2.0.1 Version: 2.0.2
Release: 1%{?dist} Release: 1%{?dist}
Summary: QR code generator for PHP Summary: QR code generator for PHP
@ -43,10 +44,11 @@ BuildRequires: php-xmlwriter
BuildRequires: php-reflection BuildRequires: php-reflection
BuildRequires: (php-composer(dasprid/enum) >= 1.0 with php-composer(dasprid/enum) < 2) BuildRequires: (php-composer(dasprid/enum) >= 1.0 with php-composer(dasprid/enum) < 2)
# From composer.json, "require-dev": { # From composer.json, "require-dev": {
# "phpunit/phpunit": "^6.4", # "phpunit/phpunit": "^7 | ^8 | ^9",
# "squizlabs/php_codesniffer": "^3.1", # "squizlabs/php_codesniffer": "^3.1",
# "phly/keep-a-changelog": "^1.4" # "phly/keep-a-changelog": "^1.4"
BuildRequires: phpunit6 %global phpunit %{_bindir}/phpunit9
BuildRequires: %{phpunit}
# Required by autoloader # Required by autoloader
BuildRequires: php-composer(fedora/autoloader) BuildRequires: php-composer(fedora/autoloader)
%endif %endif
@ -123,9 +125,10 @@ require '%{buildroot}%{php_home}/%{ns_project}%{major}/autoload.php';
EOF EOF
ret=0 ret=0
for cmd in php php72 php73 php74 php80; do for cmd in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do
if which $cmd; then if which $cmd; then
$cmd %{_bindir}/phpunit6 --verbose || ret=1 set $cmd
$1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1
fi fi
done done
exit $ret exit $ret
@ -142,6 +145,10 @@ exit $ret
%changelog %changelog
* Tue Aug 11 2020 Remi Collet <remi@remirepo.net> - 2.0.2-1
- update to 2.0.2
- switch to phpunit9
* Wed Jul 15 2020 Remi Collet <remi@remirepo.net> - 2.0.1-1 * Wed Jul 15 2020 Remi Collet <remi@remirepo.net> - 2.0.1-1
- update to 2.0.1 - update to 2.0.1

View file

@ -1 +1 @@
SHA512 (php-bacon-qr-code2-2.0.1-6e53ced.tgz) = f448e057e7f29d5d445dd00e363f23978b4143da8bae0761e76f78c964b4879f094c628cd966a6865ccbd8d71b25918f24cb2fa49c135423799aa3cb637442c5 SHA512 (php-bacon-qr-code2-2.0.2-add6d9f.tgz) = 47f77d07f3f249b30fda653aca7c5a7b75db2271555c28701aad8a48a27b3e018addfa00f80d14923b2f7ffaf2ff880a3732c4d331741f93b723b037e597472f