rebuild for PHP 8.0.0RC1

add patch for PHP 8.0.0rc1 from
  https://github.com/maxmind/MaxMind-DB-Reader-php/pull/109

2 files changed, 71 insertions, 1 deletions

diff --git a/109.patch b/109.patch
new file mode 100644
index 0000000..3f8f164
--- /dev/null
+++ b/109.patch
@@ -0,0 +1,63 @@
+From 4c0a267e17dba6e205079c397a05026c887b6352 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Wed, 30 Sep 2020 09:31:32 +0200
+Subject: [PATCH] relax test for 8.0.0RC1
+
+---
+ tests/MaxMind/Db/Test/Reader/MetadataTest.php | 2 +-
+ tests/MaxMind/Db/Test/ReaderTest.php          | 8 ++++----
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/tests/MaxMind/Db/Test/Reader/MetadataTest.php b/tests/MaxMind/Db/Test/Reader/MetadataTest.php
+index af12be9..082283d 100644
+--- a/tests/MaxMind/Db/Test/Reader/MetadataTest.php
++++ b/tests/MaxMind/Db/Test/Reader/MetadataTest.php
+@@ -44,7 +44,7 @@ public function testConstructor(): void
+     public function testTooManyConstructorArgs(): void
+     {
+         $this->expectException(ArgumentCountError::class);
+-        $this->expectExceptionMessage('MaxMind\Db\Reader\Metadata::__construct() expects exactly 1 parameter, 2 given');
++        $this->expectExceptionMessage('MaxMind\Db\Reader\Metadata::__construct() expects exactly 1');
+         new Metadata([], 1);
+     }
+ 
+diff --git a/tests/MaxMind/Db/Test/ReaderTest.php b/tests/MaxMind/Db/Test/ReaderTest.php
+index bb90854..cb456c7 100644
+--- a/tests/MaxMind/Db/Test/ReaderTest.php
++++ b/tests/MaxMind/Db/Test/ReaderTest.php
+@@ -302,7 +302,7 @@ public function testNonDatabase(): void
+     public function testTooManyConstructorArgs(): void
+     {
+         $this->expectException(ArgumentCountError::class);
+-        $this->expectExceptionMessage('MaxMind\Db\Reader::__construct() expects exactly 1 parameter, 2 given');
++        $this->expectExceptionMessage('MaxMind\Db\Reader::__construct() expects exactly 1');
+         new Reader('README.md', 1);
+     }
+ 
+@@ -318,7 +318,7 @@ public function testNoConstructorArgs(): void
+     public function testTooManyGetArgs(): void
+     {
+         $this->expectException(ArgumentCountError::class);
+-        $this->expectExceptionMessage('MaxMind\Db\Reader::get() expects exactly 1 parameter, 2 given');
++        $this->expectExceptionMessage('MaxMind\Db\Reader::get() expects exactly 1');
+         $reader = new Reader(
+             'tests/data/test-data/MaxMind-DB-test-decoder.mmdb'
+         );
+@@ -340,7 +340,7 @@ public function testNoGetArgs(): void
+     public function testMetadataArgs(): void
+     {
+         $this->expectException(ArgumentCountError::class);
+-        $this->expectExceptionMessage('MaxMind\Db\Reader::metadata() expects exactly 0 parameters, 1 given');
++        $this->expectExceptionMessage('MaxMind\Db\Reader::metadata() expects exactly 0');
+         $reader = new Reader(
+             'tests/data/test-data/MaxMind-DB-test-decoder.mmdb'
+         );
+@@ -360,7 +360,7 @@ public function testClose(): void
+     public function testCloseArgs(): void
+     {
+         $this->expectException(ArgumentCountError::class);
+-        $this->expectExceptionMessage('MaxMind\Db\Reader::close() expects exactly 0 parameters, 1 given');
++        $this->expectExceptionMessage('MaxMind\Db\Reader::close() expects exactly 0');
+         $reader = new Reader(
+             'tests/data/test-data/MaxMind-DB-test-decoder.mmdb'
+         );
diff --git a/php-maxminddb.spec b/php-maxminddb.spec
index 69d1660..906b29b 100644
--- a/php-maxminddb.spec
+++ b/php-maxminddb.spec
@@ -32,7 +32,7 @@
 Summary:       MaxMind DB Reader extension
 Name:          %{?sub_prefix}php-maxminddb
 Version:       1.7.0
-%global rpmrel 2
+%global rpmrel 3
 Release:       %{rpmrel}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:       ASL 2.0
 URL:           https://github.com/%{gh_owner}/%{gh_project}
@@ -42,6 +42,7 @@ Source0:       %{pkg_name}-%{version}-%{gh_short}.tgz
 Source1:       makesrc.sh
 
 Patch0:        https://patch-diff.githubusercontent.com/raw/maxmind/MaxMind-DB-Reader-php/pull/108.patch
+Patch1:        https://patch-diff.githubusercontent.com/raw/maxmind/MaxMind-DB-Reader-php/pull/109.patch
 
 BuildRequires: %{?scl_prefix}php-devel >= 7.2
 BuildRequires: %{?scl_prefix}php-pear  >= 1.10
@@ -161,6 +162,7 @@ Autoloader: %{_datadir}/php/MaxMind/Db/Reader/autoload.php
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
 %patch0 -p1 -b .pr
+%patch1 -p1 -b .pr
 
 %if %{with_lib}
 %{_bindir}/phpab \
@@ -334,6 +336,11 @@ fi
 # when using pkgup, CHECK Release!
 
 %changelog
+* Wed Sep 30 2020 Remi Collet <remi@remirepo.net> - 1.7.0-3
+- rebuild for PHP 8.0.0RC1
+- add patch for PHP 8.0.0rc1 from
+  https://github.com/maxmind/MaxMind-DB-Reader-php/pull/109
+
 * Wed Sep  2 2020 Remi Collet <remi@remirepo.net> - 1.7.0-2
 - add patch for PHP 8.0.0beta3 from
   https://github.com/maxmind/MaxMind-DB-Reader-php/pull/108