From 2cad8f700849d06000ccfc1d877a0c6bf508d090 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 8 Nov 2018 17:03:56 +0100
Subject: add upstream patches from merged PRs add weak dependencies on
 geolite2 databases

---
 php-maxminddb.spec | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

(limited to 'php-maxminddb.spec')

diff --git a/php-maxminddb.spec b/php-maxminddb.spec
index a9a0eb5..4b3e7b5 100644
--- a/php-maxminddb.spec
+++ b/php-maxminddb.spec
@@ -25,19 +25,30 @@
 Summary:       MaxMind DB Reader extension
 Name:          %{?sub_prefix}php-maxminddb
 Version:       1.3.0
-Release:       1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:       2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:       ASL 2.0
 URL:           https://github.com/%{gh_owner}/%{gh_project}
 
 Source0:       %{pkg_name}-%{version}-%{gh_short}.tgz
 Source1:       makesrc.sh
 
+# Upstream patches
+Patch0:        https://github.com/maxmind/MaxMind-DB-Reader-php/commit/d4d7845adb0b08d294a9255d9254b5f5cc6aba80.patch
+Patch1:        https://github.com/maxmind/MaxMind-DB-Reader-php/commit/73320ff0c35fe102944eae1fb4ed36bfb7d63b18.patch
+Patch2:        https://github.com/maxmind/MaxMind-DB-Reader-php/commit/c8bf723822ef48f722b78cff240e886cb5907edd.patch
+Patch3:        https://github.com/maxmind/MaxMind-DB-Reader-php/commit/4b3e00c2b4f33124dbc2cf94f472c66d5c44b4cc.patch
+
 BuildRequires: %{?scl_prefix}php-devel
-BuildRequires: libmaxminddb-devel
+BuildRequires: pkgconfig(libmaxminddb) >= 1.0.0
 
 Requires:      %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:      %{?scl_prefix}php(api) = %{php_core_api}
 %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
+# Weak dependencies
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Recommends:    geolite2-country
+Suggests:      geolite2-city
+%endif
 
 %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 %if "%{php_version}" > "5.6"
@@ -81,6 +92,11 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
+%patch0 -p1 -b up0
+%patch1 -p1 -b up1
+%patch2 -p1 -b up2
+%patch3 -p1 -b up3
+
 mv ext NTS
 
 cd NTS
@@ -187,5 +203,12 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Thu Nov  8 2018 Remi Collet <remi@remirepo.net> - 1.3.0-2
+- add upstream patches from merged PRs
+- add weak dependencies on geolite2 databases
+
 * Wed Nov  7 2018 Remi Collet <remi@remirepo.net> - 1.3.0-1
 - new package, version 1.3.0
+- open https://github.com/maxmind/MaxMind-DB-Reader-php/pull/73 pkg-config
+- open https://github.com/maxmind/MaxMind-DB-Reader-php/pull/74 MINFO
+- open https://github.com/maxmind/MaxMind-DB-Reader-php/pull/75 arginfo
-- 
cgit