summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json6
-rw-r--r--php-bacon-qr-code2.spec29
2 files changed, 24 insertions, 11 deletions
diff --git a/composer.json b/composer.json
index d66d586..718442e 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
{
"name": "Ben Scholzen 'DASPRiD'",
"email": "mail@dasprids.de",
- "homepage": "http://www.dasprids.de",
+ "homepage": "https://dasprids.de/",
"role": "Developer"
}
],
@@ -25,8 +25,8 @@
}
},
"require-dev": {
- "phpunit/phpunit": "^6.4",
- "squizlabs/php_codesniffer": "^3.1",
+ "phpunit/phpunit": "^7 | ^8 | ^9",
+ "squizlabs/php_codesniffer": "^3.4",
"phly/keep-a-changelog": "^1.4"
}
}
diff --git a/php-bacon-qr-code2.spec b/php-bacon-qr-code2.spec
index 31f285f..838e629 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
@@ -49,10 +50,17 @@ BuildRequires: (php-composer(dasprid/enum) >= 1.0 with php-composer(dasprid/e
BuildRequires: php-dasprid-enum
%endif
# 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
+# remirepo:1
+%if 0%{?fedora} >= 32
+%global phpunit %{_bindir}/phpunit9
+# remirepo:3
+%else
+%global phpunit %{_bindir}/phpunit8
+%endif
+BuildRequires: %{phpunit}
# Required by autoloader
BuildRequires: php-composer(fedora/autoloader)
%endif
@@ -136,9 +144,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
@@ -157,6 +166,10 @@ exit $ret
%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
- update to 2.0.1