From 6320242afd8ace088d3c6205401b2c9f335f0e09 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 9 Jul 2020 14:09:08 +0200
Subject: update to 2.0.1 switch to phpunit7

---
 composer.json      | 11 +++++------
 php-hamcrest2.spec | 31 +++++++++++++++++--------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/composer.json b/composer.json
index 5349f5f..712ad96 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
 	"type": "library",
 	"description": "This is the PHP port of Hamcrest Matchers",
 	"keywords": ["test"],
-	"license": "BSD",
+	"license": "BSD-3-Clause",
 	"authors": [
 	],
 
@@ -15,13 +15,12 @@
 	},
 
 	"require": {
-		"php": "^5.3|^7.0"
+		"php": "^5.3|^7.0|^8.0"
 	},
 
 	"require-dev": {
-		"satooshi/php-coveralls": "^1.0",
-		"phpunit/php-file-iterator": "1.3.3",
-		"phpunit/phpunit": "~4.0"
+		"phpunit/php-file-iterator": "^1.4 || ^2.0",
+		"phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0"
 	},
 
 	"replace": {
@@ -32,7 +31,7 @@
 
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0-dev"
+            "dev-master": "2.1-dev"
         }
     }
 }
diff --git a/php-hamcrest2.spec b/php-hamcrest2.spec
index 5e38d9c..82226ad 100644
--- a/php-hamcrest2.spec
+++ b/php-hamcrest2.spec
@@ -1,21 +1,21 @@
 # remirepo/fedora spec file for php-hamcrest
 #
-# Copyright (c) 2015-2018 Remi Collet
+# Copyright (c) 2015-2020 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    776503d3a8e85d4f9a1148614f95b7a608b046ad
+%global gh_commit    8c3d0a3f6af734494ad8f6fbbee0ba92422859f3
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     hamcrest
 %global gh_project   hamcrest-php
 %global ns_project   Hamcrest
 %global major        2
-%global with_tests   0%{!?_without_tests:1}
+%bcond_without       tests
 
 Name:           php-hamcrest2
-Version:        2.0.0
+Version:        2.0.1
 Release:        1%{?dist}
 Summary:        PHP port of Hamcrest Matchers
 
@@ -29,14 +29,13 @@ Patch0:         bootstrap-autoload.patch
 
 BuildArch:      noarch
 BuildRequires:  php-fedora-autoloader-devel
-%if %{with_tests}
+%if %{with tests}
 # From composer.json, require-dev:
-#               "satooshi/php-coveralls": "^1.0",
-#               "phpunit/php-file-iterator": "1.3.3",
-#               "phpunit/phpunit": "~4.0"
-BuildRequires:  php-composer(phpunit/phpunit)
+#               "phpunit/php-file-iterator": "^1.4 || ^2.0",
+#               "phpunit/phpunit": "^4.8.36 || ^5.7 || ^6.5 || ^7.0"
+BuildRequires:  phpunit7
 # composer.json, require:
-#      "php": "^5.3|^7.0"
+#      "php": "^5.3|^7.0|^8.0"
 BuildRequires:  php(language) >= 5.3
 # From phpcompatinfo report for 2.0.0
 BuildRequires:  php-reflection
@@ -99,12 +98,12 @@ cp -pr hamcrest/%{ns_project} %{buildroot}%{_datadir}/php/%{ns_project}%{major}
 
 
 %check
-%if %{with_tests}
+%if %{with tests}
 cd tests
 ret=0
-for cmd in php php56 php70 php71 php72 php73; do
+for cmd in php php72 php73 php74; do
   if which $cmd; then
-    $cmd %{_bindir}/phpunit --verbose || ret=1
+    $cmd %{_bindir}/phpunit7 --verbose || ret=1
   fi
 done
 exit $ret
@@ -116,12 +115,16 @@ exit $ret
 %files
 %{!?_licensedir:%global license %%doc}
 %license LICENSE.txt
-%doc CHANGES.txt README.md TODO.txt
+%doc CHANGES.txt README.md
 %doc composer.json
 %{_datadir}/php/%{ns_project}%{major}
 
 
 %changelog
+* Thu Jul  9 2020 Remi Collet <remi@remirepo.net> - 2.0.1-1
+- update to 2.0.1
+- switch to phpunit7
+
 * Mon Jan 22 2018 Remi Collet <remi@remirepo.net> - 2.0.0-1
 - Update to 2.0.0
 - rename to php-hamcrest2
-- 
cgit