From 2d108d2d5101565a206221df2909455bcf4454a9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 10 Feb 2021 07:49:04 +0100 Subject: [PATCH 1/2] v1.10.0 (cherry picked from commit 6350d9c96eb6644958948eefa2dad3ed328582e0) --- .gitignore | 2 ++ php-maxminddb.spec | 17 ++++++++++------- sources | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index ff3d209..7eaf6fc 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ clog /php-maxminddb-1.5.1-f096bbe.tgz /php-maxminddb-1.6.0-febd492.tgz /php-maxminddb-1.8.0-b566d42.tgz +/php-maxminddb-1.9.0-9ee9ba9.tgz +/php-maxminddb-1.10.0-07f84d9.tgz diff --git a/php-maxminddb.spec b/php-maxminddb.spec index 07cbf02..cdb7647 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -3,13 +3,13 @@ # # remirepo spec file for php-maxminddb # -# Copyright (c) 2018-2020 Remi Collet +# Copyright (c) 2018-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit b566d429ac9aec10594b0935be8ff38302f8d5c8 +%global gh_commit 07f84d969cfc527ce49388558a366ad376f1f35c %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.8.0 +Version: 1.10.0 Release: 1%{?dist} License: ASL 2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -69,7 +69,7 @@ BuildRequires: php-fedora-autoloader-devel BuildRequires: php-bcmath BuildRequires: php-gmp # from composer.json "require-dev": { -# "friendsofphp/php-cs-fixer": "2.*", +# "friendsofphp/php-cs-fixer": "*", # "phpunit/phpunit": ">=8.0.0,<10.0.0", # "php-coveralls/php-coveralls": "^2.1", # "phpunit/phpcov": ">=6.0.0", @@ -78,8 +78,8 @@ BuildRequires: phpunit8 %endif # from composer.json "require": { -# "php": ">=5.6" -Requires: php(language) >= 5.6 +# "php": ">=7.2" +Requires: php(language) >= 7.2 # from composer.json "suggest": { # "ext-bcmath": "bcmath or gmp is required for decoding larger integers with the pure PHP decoder", # "ext-gmp": "bcmath or gmp is required for decoding larger integers with the pure PHP decoder", @@ -88,7 +88,7 @@ Recommends: php-bcmath Recommends: php-gmp Recommends: php-maxminddb # from composer.json "conflict": { -# "ext-maxminddb": "<1.6.0,>=2.0.0" +# "ext-maxminddb": "<1.10.0,>=2.0.0" Conflicts: php-maxminddb < %{version} # Weak dependencies on databases Recommends: geolite2-country @@ -260,6 +260,9 @@ exit $ret %changelog +* Wed Feb 10 2021 Remi Collet - 1.10.0-1 +- update to 1.10.0 + * Fri Oct 2 2020 Remi Collet - 1.8.0-1 - update to 1.8.0 - now available on pecl diff --git a/sources b/sources index 2459da3..911caa2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-maxminddb-1.8.0-b566d42.tgz) = f1e625e6ffd23147c6043dc9b2d2c45cecc548849b944cef61f957e5c98947433a25fe26a3c29f6182feed8646a5eebd8d7fb2fa2b8ff3ae49b174d10ac107c0 +SHA512 (php-maxminddb-1.10.0-07f84d9.tgz) = fd95a09f38e227b9581e2f387e950ac6659788493a1ad80cc6e272a77c10f98e9be14f16a3eec11e90cc19bef3af80a73c38ca5e8c2fde8ba8f1e7e6debf336a From 5eb5fb9ea3a04fa904a1189fb995a6164ab4006a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 15 Apr 2021 09:22:43 +0200 Subject: [PATCH 2/2] v1.10.1 (cherry picked from commit 92a127ada31db68b57b5e2bc2a06ed2dc230a597) (cherry picked from commit c86ebd874f479ca8c5650294308d11d443421af0) --- .gitignore | 1 + php-maxminddb.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7eaf6fc..ce0500b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ clog /php-maxminddb-1.8.0-b566d42.tgz /php-maxminddb-1.9.0-9ee9ba9.tgz /php-maxminddb-1.10.0-07f84d9.tgz +/php-maxminddb-1.10.1-569bd44.tgz diff --git a/php-maxminddb.spec b/php-maxminddb.spec index cdb7647..76d3303 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -9,7 +9,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 07f84d969cfc527ce49388558a366ad376f1f35c +%global gh_commit 569bd44d97d30a4ec12c7793a33004a76d4caf18 %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.10.0 +Version: 1.10.1 Release: 1%{?dist} License: ASL 2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -32,6 +32,8 @@ URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh +BuildRequires: make +BuildRequires: gcc BuildRequires: php-devel >= 7.2 BuildRequires: php-pear >= 1.10 BuildRequires: pkgconfig(libmaxminddb) >= 1.0.0 @@ -260,6 +262,9 @@ exit $ret %changelog +* Thu Apr 15 2021 Remi Collet - 1.10.1-1 +- update to 1.10.1 + * Wed Feb 10 2021 Remi Collet - 1.10.0-1 - update to 1.10.0 diff --git a/sources b/sources index 911caa2..fc97a6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-maxminddb-1.10.0-07f84d9.tgz) = fd95a09f38e227b9581e2f387e950ac6659788493a1ad80cc6e272a77c10f98e9be14f16a3eec11e90cc19bef3af80a73c38ca5e8c2fde8ba8f1e7e6debf336a +SHA512 (php-maxminddb-1.10.1-569bd44.tgz) = cf4c4081a3d11766eaa294c80364d840592f29871226d1596532456870575deaa1ddcc444930fa48b184786cb7916b8be14d563486d6da00a378dbad7e5c300a