From 1ee0cbb54e048d7046deba8384197e6cd09df419 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 13 Dec 2019 09:17:08 +0100
Subject: [PATCH 1/2] v1.5.1

(cherry picked from commit cfa6bb410bac89239780567c9a77b7425cb53957)
---
 .gitignore         | 2 ++
 php-maxminddb.spec | 7 +++++--
 sources            | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6a0d77b..a088d0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+clog
 /php-maxminddb-1.4.0-2f1086e.tgz
 /php-maxminddb-1.4.1-eb83d0e.tgz
 /php-maxminddb-1.5.0-bd43609.tgz
+/php-maxminddb-1.5.1-f096bbe.tgz
diff --git a/php-maxminddb.spec b/php-maxminddb.spec
index 95fff46..a14c3c5 100644
--- a/php-maxminddb.spec
+++ b/php-maxminddb.spec
@@ -9,7 +9,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit   bd436094fc0a9b0558a899fb80b0ae34fe1808a0
+%global gh_commit   f096bbe4d37e3d93e62626297bfc2179472a972d
 %global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner    maxmind
 %global gh_project  MaxMind-DB-Reader-php
@@ -24,7 +24,7 @@
 
 Summary:       MaxMind DB Reader extension
 Name:          php-maxminddb
-Version:       1.5.0
+Version:       1.5.1
 Release:       1%{?dist}
 License:       ASL 2.0
 URL:           https://github.com/%{gh_owner}/%{gh_project}
@@ -245,6 +245,9 @@ exit $ret
 
 
 %changelog
+* Fri Dec 13 2019 Remi Collet <remi@remirepo.net> - 1.5.1-1
+- update to 1.5.1
+
 * Tue Oct  1 2019 Remi Collet <remi@remirepo.net> - 1.5.0-1
 - update to 1.5.0
 - raise dependency on PHP 5.6
diff --git a/sources b/sources
index e16c650..1d1c75f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-maxminddb-1.5.0-bd43609.tgz) = 8bf1b9e07fab0ce87acde34cf3f5e0b2958fc1f54eb938b7abaa1941712889f678a4b4ddfb9bcb41e6594f8c67e97fbf5209eb89f50f11f0cfab101b0ae7035c
+SHA512 (php-maxminddb-1.5.1-f096bbe.tgz) = 8c235674ec9e4c57df825602bb65d4a74b8c4335be9aa24b4094988f216b7a00ce994f9713d8489a1ba78fedd6a244f20ceaa997c05d8e9bd6d9cf4c1076ac1d

From aef042eaa248091d861430fddbf724d80d40d709 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 20 Dec 2019 15:13:55 +0100
Subject: [PATCH 2/2] v1.6.0

(cherry picked from commit 714e078cfc6ad88ed781d1389efba682567184e5)
---
 .gitignore         |  1 +
 php-maxminddb.spec | 10 ++++++++--
 sources            |  2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index a088d0a..9704e96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ clog
 /php-maxminddb-1.4.1-eb83d0e.tgz
 /php-maxminddb-1.5.0-bd43609.tgz
 /php-maxminddb-1.5.1-f096bbe.tgz
+/php-maxminddb-1.6.0-febd492.tgz
diff --git a/php-maxminddb.spec b/php-maxminddb.spec
index a14c3c5..40c769b 100644
--- a/php-maxminddb.spec
+++ b/php-maxminddb.spec
@@ -9,7 +9,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit   f096bbe4d37e3d93e62626297bfc2179472a972d
+%global gh_commit   febd4920bf17c1da84cef58e56a8227dfb37fbe4
 %global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner    maxmind
 %global gh_project  MaxMind-DB-Reader-php
@@ -24,7 +24,7 @@
 
 Summary:       MaxMind DB Reader extension
 Name:          php-maxminddb
-Version:       1.5.1
+Version:       1.6.0
 Release:       1%{?dist}
 License:       ASL 2.0
 URL:           https://github.com/%{gh_owner}/%{gh_project}
@@ -79,6 +79,9 @@ Requires:      php(language) >= 5.6
 Recommends:    php-bcmath
 Recommends:    php-gmp
 Recommends:    php-maxminddb
+# from composer.json "conflict": {
+#        "ext-maxminddb": "<1.6.0,>=2.0.0"
+Conflicts:     php-maxminddb < %{version}
 # Weak dependencies on databases
 Recommends:    geolite2-country
 Suggests:      geolite2-city
@@ -245,6 +248,9 @@ exit $ret
 
 
 %changelog
+* Fri Dec 20 2019 Remi Collet <remi@remirepo.net> - 1.6.0-1
+- update to 1.6.0
+
 * Fri Dec 13 2019 Remi Collet <remi@remirepo.net> - 1.5.1-1
 - update to 1.5.1
 
diff --git a/sources b/sources
index 1d1c75f..0f954d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-maxminddb-1.5.1-f096bbe.tgz) = 8c235674ec9e4c57df825602bb65d4a74b8c4335be9aa24b4094988f216b7a00ce994f9713d8489a1ba78fedd6a244f20ceaa997c05d8e9bd6d9cf4c1076ac1d
+SHA512 (php-maxminddb-1.6.0-febd492.tgz) = 0ce09d1cf08f9c7adbdea9775f7dcc8e4142350fa9b93be355c2b18636b729c112ca5dcdb07fcb7596ce5003d1f03480c10cf120d8bb59985e6bca9158d44f8f