From 73834bcea29569113cd3cf505671913c7c8de734 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 2 Nov 2018 06:52:50 +0100
Subject: update to 1.5.0 (SPDX 3.3)

---
 php-composer-spdx-licenses.spec | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'php-composer-spdx-licenses.spec')

diff --git a/php-composer-spdx-licenses.spec b/php-composer-spdx-licenses.spec
index 396bef9..096b9c8 100644
--- a/php-composer-spdx-licenses.spec
+++ b/php-composer-spdx-licenses.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    cb17687e9f936acd7e7245ad3890f953770dec1b
+%global gh_commit    7a9556b22bd9d4df7cad89876b00af58ef20d3a2
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 #global gh_date      20150717
 %global gh_owner     composer
@@ -15,11 +15,10 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-composer-spdx-licenses
-Version:        1.4.0
+Version:        1.5.0
 Release:        1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
 Summary:        SPDX licenses list and validation library
 
-Group:          Development/Libraries
 License:        MIT
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 # git snapshot to get upstream test suite
@@ -39,7 +38,7 @@ BuildRequires:  php-spl
 # From composer.json, "require-dev": {
 #        "phpunit/phpunit": "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
 #        "phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
-%if 0%{?fedora} >= 26
+%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
 %global phpunit %{_bindir}/phpunit6
 # ignore min version, test suite passes with 6.4
 BuildRequires: phpunit6 >= 6.4
@@ -111,7 +110,7 @@ rm tests/SpdxLicensesUpdaterTest.php
 export BUILDROOT_SPDX=%{buildroot}
 
 ret=0
-for cmd in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do
+for cmd in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72 php73; do
   if which $cmd; then
     set $cmd
     $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit6} \
@@ -137,14 +136,17 @@ exit $ret
 
 
 %changelog
+* Fri Nov  2 2018 Remi Collet <remi@remirepo.net> - 1.5.0-1
+- update to 1.5.0 (SPDX 3.3)
+
 * Mon May 14 2018 Remi Collet <remi@remirepo.net> - 1.4.0-1
-- update to 1.4.0
+- update to 1.4.0 (SPDX 3.1)
 
 * Thu Feb  1 2018 Remi Collet <remi@remirepo.net> - 1.3.0-1
 - Update to 1.3.0
 
 * Thu Jan  4 2018 Remi Collet <remi@remirepo.net> - 1.2.0-1
-- Update to 1.2.0
+- Update to 1.2.0 (SPDX 3.0)
 - use phpunit6 on Fedora
 
 * Tue Apr  4 2017 Remi Collet <remi@remirepo.net> - 1.1.6-1
-- 
cgit