diff options
| -rw-r--r-- | composer.json | 5 | ||||
| -rw-r--r-- | php-khanamiryan-qrcode-detector-decoder.spec | 14 |
2 files changed, 10 insertions, 9 deletions
diff --git a/composer.json b/composer.json index ba76df8..66be008 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,10 @@ "barcode" ], "homepage": "https://github.com/khanamiryan/php-qrcode-detector-decoder/", - "license": "MIT", + "license": [ + "MIT", + "Apache-2.0" + ], "authors": [ { "name": "Ashot Khanamiryan", diff --git a/php-khanamiryan-qrcode-detector-decoder.spec b/php-khanamiryan-qrcode-detector-decoder.spec index 47092b0..57b8103 100644 --- a/php-khanamiryan-qrcode-detector-decoder.spec +++ b/php-khanamiryan-qrcode-detector-decoder.spec @@ -8,7 +8,7 @@ # %bcond_without tests -%global gh_commit b96163d4f074970dfe67d4185e75e1f4541b30ca +%global gh_commit 04fdd58d86a387065f707dc6d3cc304c719910c1 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner khanamiryan %global gh_project php-qrcode-detector-decoder @@ -21,12 +21,11 @@ %global php_home %{_datadir}/php Name: php-%{pk_vendor}-%{pk_project} -Version: 1.0.5.1 +Version: 1.0.5.2 Release: 1%{?dist} Summary: QR code decoder / reader Group: Development/Libraries -# https://github.com/khanamiryan/php-qrcode-detector-decoder/issues/29 License: MIT and ASL 2.0 URL: https://github.com/%{gh_owner}/%{gh_project} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz @@ -43,11 +42,7 @@ BuildRequires: php-mbstring BuildRequires: php-spl # From composer.json, "require-dev": { # "phpunit/phpunit": "^9.0" -%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9 %global phpunit %{_bindir}/phpunit9 -%else -%global phpunit %{_bindir}/phpunit8 -%endif %endif # Required by autoloader BuildRequires: php-fedora-autoloader-devel @@ -114,7 +109,7 @@ require '%{buildroot}%{php_home}/%{ns_project}/autoload.php'; EOF ret=0 -for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do +for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} $filter --verbose || ret=1 @@ -136,6 +131,9 @@ exit $ret %changelog +* Tue Oct 5 2021 Remi Collet <remi@remirepo.net> - 1.0.5.2-1 +- update to 1.0.5.2 + * Wed Apr 21 2021 Remi Collet <remi@remirepo.net> - 1.0.5.1-1 - update to 1.0.5.1 - drop license patch merged upstream |