From 5df63439ed2e39604ab324e95dd9f8766b3c59af Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 20 Nov 2020 09:17:36 +0100
Subject: update to 8.1.1 drop patch merged upstream

---
 PHPINFO                   |  2 +-
 REFLECTION                |  2 +-
 php-pecl-ip2location.spec | 11 ++++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/PHPINFO b/PHPINFO
index 3807e2c..412c3ef 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,5 +2,5 @@
 ip2location
 
 ip2location support => enabled
-extension version => 8.1.0
+extension version => 8.1.1
 library version => 8.3.1
diff --git a/REFLECTION b/REFLECTION
index 7328f28..61954f1 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #78 ip2location version 8.1.0 ] {
+Extension [ <persistent> extension #78 ip2location version 8.1.1 ] {
 
   - Constants [4] {
     Constant [ int IP2LOCATION_FILE_IO ] { 0 }
diff --git a/php-pecl-ip2location.spec b/php-pecl-ip2location.spec
index e436964..d74f1c2 100644
--- a/php-pecl-ip2location.spec
+++ b/php-pecl-ip2location.spec
@@ -19,7 +19,7 @@
 %global ini_name   40-%{pecl_name}.ini
 %endif
 
-%global upstream_version 8.1.0
+%global upstream_version 8.1.1
 #global upstream_prever  RC1
 
 Summary:        Get geo location information of an IP address
@@ -30,9 +30,6 @@ Release:        1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.
 URL:            https://pecl.php.net/package/%{pecl_name}
 Source0:        https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
 
-# Fix test with old library < 8.3
-Patch0:         %{pecl_name}-tests.patch
-
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  %{?scl_prefix}php-pear
 BuildRequires:  %{?scl_prefix}php-devel
@@ -91,11 +88,11 @@ mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS
 sed -e 's/role="test"/role="src"/' \
     %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
     -e '/README.TXT/s/role="doc"/role="test"/' \
+    -e '/AGREEMENT.PDF/s/role="doc"/role="test"/' \
     -i package.xml
 
 cd NTS
 sed -e "s/\r//" -i LICENSE CREDITS *.md *.c *.h
-%patch0 -p0
 
 # Check version
 extver=$(sed -n '/#define PHP_IP2LOCATION_VERSION/{s/.* "//;s/".*$//;p}' php_ip2location.h)
@@ -217,6 +214,10 @@ fi
 
 
 %changelog
+* Fri Nov 20 2020 Remi Collet <remi@remirepo.net> - 8.1.1-1
+- update to 8.1.1
+- drop patch merged upstream
+
 * Thu Nov 19 2020 Remi Collet <remi@remirepo.net> - 8.1.0-1
 - update to 8.1.0
 - drop all patches merged upstream
-- 
cgit