From 688875632df21d9924b7fcfa1e09973a1af3071c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 15 Jul 2020 13:51:40 +0200 Subject: [PATCH 1/2] v2.0.1 (cherry picked from commit 50fbd4b88fd81ab9e506fb2121a81a77dad982c5) --- .gitignore | 1 + php-bacon-qr-code2.spec | 15 +++++++++------ sources | 3 +-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index af4a17d..636ce02 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /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.1-6e53ced.tgz diff --git a/php-bacon-qr-code2.spec b/php-bacon-qr-code2.spec index 3dc1981..e4741b2 100644 --- a/php-bacon-qr-code2.spec +++ b/php-bacon-qr-code2.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit eaac909da3ccc32b748a65b127acd8918f58d9b0 +%global gh_commit 6e53ced3d2499cee4a0ef23a7c4d6449607ac7da %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner Bacon %global gh_project BaconQrCode @@ -18,10 +18,10 @@ %global ns_project %{gh_project} %global php_home %{_datadir}/php %global major 2 -%global with_tests 0%{!?_without_tests:1} +%bcond_without tests Name: php-%{pk_project}%{major} -Version: 2.0.0 +Version: 2.0.1 Release: 1%{?dist} Summary: QR code generator for PHP @@ -32,7 +32,7 @@ Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh BuildArch: noarch -%if %{with_tests} +%if %{with tests} # For tests BuildRequires: php(language) >= 7.1 BuildRequires: php-iconv @@ -109,7 +109,7 @@ cp -pr src %{buildroot}%{php_home}/%{ns_project}%{major} %check -%if %{with_tests} +%if %{with tests} if php -r 'exit(PHP_INT_SIZE<8 ? 0 : 1);' then : ignore test suite because of https://github.com/Bacon/BaconQrCode/issues/31 @@ -123,7 +123,7 @@ require '%{buildroot}%{php_home}/%{ns_project}%{major}/autoload.php'; EOF ret=0 -for cmd in php php71 php72 php73 php74; do +for cmd in php php72 php73 php74 php80; do if which $cmd; then $cmd %{_bindir}/phpunit6 --verbose || ret=1 fi @@ -142,6 +142,9 @@ exit $ret %changelog +* Wed Jul 15 2020 Remi Collet - 2.0.1-1 +- update to 2.0.1 + * Mon Sep 2 2019 Remi Collet - 2.0.0-1 - update to 2.0.0 - rename to php-bacon-qr-code2 diff --git a/sources b/sources index 34864bb..5df78fd 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (php-bacon-qr-code-2.0.0-eaac909.tar.gz) = 7bb152c2aa374b1a754a08fd3e1224617e209012d064b94ca4920597b2b4a3101c096f473fb623bd00b8252a69498eaa94366176c5f9b389d0141108af5260ef -SHA512 (php-bacon-qr-code2-2.0.0-eaac909.tgz) = 62d898771109832eea0369a7999e85dd27dc7a7dfb8bc0f53d7dc177100d195af919714aff119b793fed9468560f3ec992e50e953d18e4c0113e7dc1139327f1 +SHA512 (php-bacon-qr-code2-2.0.1-6e53ced.tgz) = f448e057e7f29d5d445dd00e363f23978b4143da8bae0761e76f78c964b4879f094c628cd966a6865ccbd8d71b25918f24cb2fa49c135423799aa3cb637442c5 From 63f32fe26019f4201a3434699ad288dcea22c2f6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 11 Aug 2020 10:31:45 +0200 Subject: [PATCH 2/2] update to 2.0.2 switch to phpunit9 (cherry picked from commit 537075816f6f65b9ab1910febdf982bc9aa7595c) (cherry picked from commit 2552b9f1d9740f7becba52d139dc721e64d3f4f5) --- .gitignore | 1 + php-bacon-qr-code2.spec | 23 +++++++++++++++-------- sources | 2 +- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 636ce02..7ffc974 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /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.1-6e53ced.tgz +/php-bacon-qr-code2-2.0.2-add6d9f.tgz diff --git a/php-bacon-qr-code2.spec b/php-bacon-qr-code2.spec index e4741b2..6c69212 100644 --- a/php-bacon-qr-code2.spec +++ b/php-bacon-qr-code2.spec @@ -1,12 +1,14 @@ # 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 # http://creativecommons.org/licenses/by-sa/4.0/ # # 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_owner Bacon %global gh_project BaconQrCode @@ -18,10 +20,9 @@ %global ns_project %{gh_project} %global php_home %{_datadir}/php %global major 2 -%bcond_without tests Name: php-%{pk_project}%{major} -Version: 2.0.1 +Version: 2.0.2 Release: 1%{?dist} Summary: QR code generator for PHP @@ -43,10 +44,11 @@ BuildRequires: php-xmlwriter BuildRequires: php-reflection BuildRequires: (php-composer(dasprid/enum) >= 1.0 with php-composer(dasprid/enum) < 2) # From composer.json, "require-dev": { -# "phpunit/phpunit": "^6.4", +# "phpunit/phpunit": "^7 | ^8 | ^9", # "squizlabs/php_codesniffer": "^3.1", # "phly/keep-a-changelog": "^1.4" -BuildRequires: phpunit6 +%global phpunit %{_bindir}/phpunit9 +BuildRequires: %{phpunit} # Required by autoloader BuildRequires: php-composer(fedora/autoloader) %endif @@ -123,9 +125,10 @@ require '%{buildroot}%{php_home}/%{ns_project}%{major}/autoload.php'; EOF 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 - $cmd %{_bindir}/phpunit6 --verbose || ret=1 + set $cmd + $1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1 fi done exit $ret @@ -142,6 +145,10 @@ exit $ret %changelog +* Tue Aug 11 2020 Remi Collet - 2.0.2-1 +- update to 2.0.2 +- switch to phpunit9 + * Wed Jul 15 2020 Remi Collet - 2.0.1-1 - update to 2.0.1 diff --git a/sources b/sources index 5df78fd..cce25bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-bacon-qr-code2-2.0.1-6e53ced.tgz) = f448e057e7f29d5d445dd00e363f23978b4143da8bae0761e76f78c964b4879f094c628cd966a6865ccbd8d71b25918f24cb2fa49c135423799aa3cb637442c5 +SHA512 (php-bacon-qr-code2-2.0.2-add6d9f.tgz) = 47f77d07f3f249b30fda653aca7c5a7b75db2271555c28701aad8a48a27b3e018addfa00f80d14923b2f7ffaf2ff880a3732c4d331741f93b723b037e597472f