From b774ef80ba57463f571dcc84ec0f6a11ffc76a92 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 22 Mar 2018 16:52:53 +0100
Subject: update to 3.0.1 license have be changed to MIT

---
 composer.json               |  2 +-
 php-pragmarx-google2fa.spec | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index 897c259..a8df986 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "pragmarx/google2fa",
     "description": "A One Time Password Authentication package, compatible with Google Authenticator.",
     "keywords": ["authentication", "two factor authentication", "google2fa", "laravel", "2fa"],
-    "license": "BSD-3-Clause",
+    "license": "MIT",
     "authors": [
         {
             "name": "Antonio Carlos Ribeiro",
diff --git a/php-pragmarx-google2fa.spec b/php-pragmarx-google2fa.spec
index f0ba78e..f7f0e14 100644
--- a/php-pragmarx-google2fa.spec
+++ b/php-pragmarx-google2fa.spec
@@ -9,7 +9,7 @@
 
 %global with_tests   0%{!?_without_tests:1}
 # Github
-%global gh_commit    5a818bda62fab0c0a79060b06d50d50b5525d631
+%global gh_commit    40b3ce025bed0f9cd0c1c8ab7fc8265344c73de0
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     antonioribeiro
 %global gh_project   google2fa
@@ -21,11 +21,11 @@
 %global ns_project   Google2FA
 
 Name:           php-%{pk_vendor}-%{pk_project}
-Version:        2.0.7
+Version:        3.0.1
 Release:        1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist}
 Summary:        Google Two-Factor Authentication for PHP Package
 
-License:        BSD
+License:        MIT
 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
 
@@ -139,7 +139,7 @@ ret=0
 for cmd in php php70 php71 php72; do
    if which $cmd; then
       if [ $($cmd -r 'echo PHP_VERSION_ID;') -lt 70200 ]; then
-        $cmd %{_bindir}/phpunit --no-coverage --verbose --filter '^((?!(test_qrcode_inline)).)*$' || ret=1
+        $cmd %{_bindir}/phpunit --no-coverage --verbose --filter '^((?!(testQrcodeInline)).)*$' || ret=1
       else
         $cmd %{_bindir}/phpunit --no-coverage --verbose || ret=1
       fi
@@ -153,13 +153,21 @@ exit $ret
 
 %files
 %{!?_licensedir:%global license %%doc}
-%license LICENSE
+%license LICENSE.md RELICENSED.md
 %doc composer.json
-%doc *.md
+%doc README.md changelog.md
 %dir %{_datadir}/php/%{ns_vendor}
      %{_datadir}/php/%{ns_vendor}/%{ns_project}
 
 
 %changelog
+* Thu Mar 22 2018 Remi Collet <remi@remirepo.net> - 3.0.1-1
+- update to 3.0.1
+- license have be changed to MIT
+
+* Wed Mar  7 2018 Remi Collet <remi@remirepo.net> - 2.0.7-2
+- add GPLv3+ to License field and ask upstream for clarification
+  https://github.com/antonioribeiro/google2fa/issues/95
+
 * Wed Mar  7 2018 Remi Collet <remi@remirepo.net> - 2.0.7-1
 - initial package
-- 
cgit