From 122edc9ae0bfe968947801e1ff5c931bbf52c5c8 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 21 Nov 2018 07:25:25 +0100
Subject: update to 1.4.0 open
 https://github.com/maxmind/MaxMind-DB-Reader-php/issues/79 to report test
 failure on 32-bit

---
 php-maxminddb.spec | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

(limited to 'php-maxminddb.spec')

diff --git a/php-maxminddb.spec b/php-maxminddb.spec
index a9c229f..74b2892 100644
--- a/php-maxminddb.spec
+++ b/php-maxminddb.spec
@@ -22,7 +22,7 @@
 %endif
 
 
-%global gh_commit   e042b4f8a2dff41e19019faf16427178b07fbd58
+%global gh_commit   2f1086e38939e808cc23b17daa469da094af9125
 %global gh_short    %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner    maxmind
 %global gh_project  MaxMind-DB-Reader-php
@@ -35,8 +35,8 @@
 
 Summary:       MaxMind DB Reader extension
 Name:          %{?sub_prefix}php-maxminddb
-Version:       1.3.0
-%global rpmrel 3
+Version:       1.4.0
+%global rpmrel 1
 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}
@@ -44,12 +44,6 @@ 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: pkgconfig(libmaxminddb) >= 1.0.0
 
@@ -99,6 +93,8 @@ IP address subnets (IPv4 or IPv6).
 This optional PHP C Extension is a drop-in replacement for
 MaxMind\Db\Reader.
 
+Databases are available in geolite2-country and geolite2-city packages.
+
 Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}.
 
 
@@ -145,17 +141,17 @@ MaxMind DB Reader PHP API.
 MaxMind DB is a binary file format that stores data indexed by
 IP address subnets (IPv4 or IPv6).
 
+Databases are available in geolite2-country and geolite2-city packages.
+
+The extension available in php-maxminddb package allow better
+performance.
+
 Autoloader: %{_datadir}/php/MaxMind/Db/Reader/autoload.php
 %endif
 
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
-%patch0 -p1 -b up0
-%patch1 -p1 -b up1
-%patch2 -p1 -b up2
-%patch3 -p1 -b up3
-
 %if %{with_lib}
 %{_bindir}/phpab \
     --template fedora \
@@ -273,6 +269,13 @@ for cmd in php php56 php70 php71 php72 php73; do
 %endif
   fi
 done
+
+: Upstream test suite for the library with the extension
+php --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
+  %{_bindir}/phpunit \
+    --bootstrap %{buildroot}%{_datadir}/php/MaxMind/Db/Reader/autoload.php \
+    --filter '^((?!(testDecoder)).)*$' \
+    --verbose || ret=1
 %endif
 exit $ret
 
@@ -302,6 +305,11 @@ exit $ret
 
 
 %changelog
+* Wed Nov 21 2018 Remi Collet <remi@remirepo.net> - 1.4.0-1
+- update to 1.4.0
+- open https://github.com/maxmind/MaxMind-DB-Reader-php/issues/79
+  to report test failure on 32-bit
+
 * Wed Nov 14 2018 Remi Collet <remi@remirepo.net> - 1.3.0-3
 - add php-maxmind-db-reader sub-package providing the library
 - open https://github.com/maxmind/MaxMind-DB-Reader-php/issues/77
-- 
cgit