summaryrefslogtreecommitdiffstats
path: root/php-khanamiryan-qrcode-detector-decoder.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-04-21 10:14:23 +0200
committerRemi Collet <remi@remirepo.net>2021-04-21 10:14:23 +0200
commitf871a468165fc6d548e49ee7a2237830415e434e (patch)
treeee915ce3b04108a7da5af2d151ec68a893c58556 /php-khanamiryan-qrcode-detector-decoder.spec
parent02a05a4e60c4333712b476b26a4f28876bbfaf4f (diff)
update to 1.0.5.1
drop license patch merged upstream
Diffstat (limited to 'php-khanamiryan-qrcode-detector-decoder.spec')
-rw-r--r--php-khanamiryan-qrcode-detector-decoder.spec23
1 files changed, 12 insertions, 11 deletions
diff --git a/php-khanamiryan-qrcode-detector-decoder.spec b/php-khanamiryan-qrcode-detector-decoder.spec
index 163e080..47092b0 100644
--- a/php-khanamiryan-qrcode-detector-decoder.spec
+++ b/php-khanamiryan-qrcode-detector-decoder.spec
@@ -1,12 +1,14 @@
# remirepo/fedora spec file for php-khanamiryan-qrcode-detector-decoder
#
-# Copyright (c) 2017-2020 Remi Collet
+# Copyright (c) 2017-2021 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
-%global gh_commit 6c8c23003a87ecd7458807cd49372b1fb590d1f5
+%bcond_without tests
+
+%global gh_commit b96163d4f074970dfe67d4185e75e1f4541b30ca
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner khanamiryan
%global gh_project php-qrcode-detector-decoder
@@ -17,10 +19,9 @@
%global ns_vendor %nil
%global ns_project Zxing
%global php_home %{_datadir}/php
-%global with_tests 0%{!?_without_tests:1}
Name: php-%{pk_vendor}-%{pk_project}
-Version: 1.0.5
+Version: 1.0.5.1
Release: 1%{?dist}
Summary: QR code decoder / reader
@@ -30,11 +31,8 @@ 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}
+%if %{with tests}
# For tests
BuildRequires: php(language) >= 5.6
BuildRequires: php-reflection
@@ -50,8 +48,8 @@ BuildRequires: php-spl
%else
%global phpunit %{_bindir}/phpunit8
%endif
-# Required by autoloader
%endif
+# Required by autoloader
BuildRequires: php-fedora-autoloader-devel
# From composer.json, "require": {
@@ -86,7 +84,6 @@ Autoloader: %{php_home}/%{ns_project}/autoload.php
%prep
%setup -q -n %{gh_project}-%{gh_commit}
-%patch0 -p1
%build
@@ -109,7 +106,7 @@ cp -pr lib %{buildroot}%{php_home}/%{ns_project}
%check
-%if %{with_tests}
+%if %{with tests}
mkdir vendor
cat << 'EOF' | tee vendor/autoload.php
<?php
@@ -139,6 +136,10 @@ exit $ret
%changelog
+* 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
+
* Wed Apr 21 2021 Remi Collet <remi@remirepo.net> - 1.0.5-1
- update to 1.0.5
- drop PHP 8 patch merged upstream