From ab9b50e4d94533dfd041899f30a79cc4668f4a0b Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 5 Sep 2018 09:53:07 +0200
Subject: minor

---
 makesrc.sh                      | 2 +-
 php-netresearch-jsonmapper.spec | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/makesrc.sh b/makesrc.sh
index 87d223d..37cb6a2 100755
--- a/makesrc.sh
+++ b/makesrc.sh
@@ -20,7 +20,7 @@ cp composer.json ../composer.json
 popd
 
 echo "Archiving..."
-tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT
+tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs $PROJECT-$COMMIT
 
 echo "Cleaning..."
 rm -rf $PROJECT-$COMMIT
diff --git a/php-netresearch-jsonmapper.spec b/php-netresearch-jsonmapper.spec
index 6cad459..f90701d 100644
--- a/php-netresearch-jsonmapper.spec
+++ b/php-netresearch-jsonmapper.spec
@@ -22,7 +22,6 @@ Version:        1.4.0
 Release:        1%{?dist}
 Summary:        Map nested JSON structures onto PHP classes
 
-Group:          Development/Libraries
 License:        OSL 3.0
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        %{name}-%{version}-%{gh_short}.tgz
@@ -38,7 +37,7 @@ BuildRequires:  php-spl
 # From composer.json, "require-dev": {
 #        "phpunit/phpunit": "~4.8.35 || ~5.7 || ~6.4",
 #        "squizlabs/php_codesniffer": "~1.5"
-%if 0%{?fedora} >= 26
+%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
 %global phpunit %{_bindir}/phpunit6
 BuildRequires: phpunit6 >= 6.4
 %else
@@ -100,7 +99,7 @@ mkdir vendor
 
 : Run upstream test suite
 ret=0
-for cmd in "php %{phpunit}" php70 php71 php72; do
+for cmd in "php %{phpunit}" php70 php71 php72 php73; do
   if which $cmd; then
     set $cmd
     $1 ${2:-%{_bindir}/phpunit6} \
-- 
cgit