From 0e69cf855e45bea1fe28d192cad5c74f3574a881 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 11 Sep 2019 14:04:57 +0200 Subject: add LICENSE files --- php-khanamiryan-qrcode-detector-decoder.spec | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/php-khanamiryan-qrcode-detector-decoder.spec b/php-khanamiryan-qrcode-detector-decoder.spec index 9494940..25cc759 100644 --- a/php-khanamiryan-qrcode-detector-decoder.spec +++ b/php-khanamiryan-qrcode-detector-decoder.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-khanamiryan-qrcode-detector-decoder # -# Copyright (c) 2017-2018 Remi Collet +# Copyright (c) 2017-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -21,7 +21,7 @@ Name: php-%{pk_vendor}-%{pk_project} Version: 1.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: QR code generator for PHP Group: Development/Libraries @@ -30,6 +30,9 @@ 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 +# From https://github.com/khanamiryan/php-qrcode-detector-decoder/pull/80 +Patch0: https://patch-diff.githubusercontent.com/raw/khanamiryan/php-qrcode-detector-decoder/pull/80.patch + BuildArch: noarch %if %{with_tests} # For tests @@ -57,8 +60,10 @@ Requires: php-gd Requires: php-iconv Requires: php-mbstring Requires: php-spl -%if 0%{?fedora} >= 21 +# remirepo:1 +%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 Suggests: php-pecl(imagick) +# remirepo:1 %endif # Required by autoloader Requires: php-composer(fedora/autoloader) @@ -80,6 +85,7 @@ Autoloader: %{php_home}/%{ns_project}/autoload.php %prep %setup -q -n %{gh_project}-%{gh_commit} +%patch0 -p1 %build @@ -110,7 +116,7 @@ require '%{buildroot}%{php_home}/%{ns_project}/autoload.php'; EOF ret=0 -for cmd in php php56 php70 php71 php72; do +for cmd in php php56 php70 php71 php72 php73 php74; do if which $cmd; then $cmd %{_bindir}/phpunit --verbose || ret=1 fi @@ -122,14 +128,18 @@ exit $ret %files +# remirepo:1 %{!?_licensedir:%global license %%doc} -#license LICENSE +%license LICENSE* %doc composer.json %doc README.md %{php_home}/%{ns_project} %changelog +* Tue Sep 10 2019 Remi Collet - 1.0.2-2 +- add LICENSE files + * Wed May 2 2018 Remi Collet - 1.0.2-1 - update to 1.0.2 -- cgit