From c86ebd874f479ca8c5650294308d11d443421af0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 15 Apr 2021 09:22:43 +0200 Subject: [PATCH 1/2] v1.10.1 (cherry picked from commit 92a127ada31db68b57b5e2bc2a06ed2dc230a597) --- .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 32115cb..b2d0d89 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 From 3ac9d542273b95bd8bc37fa39f0029e15755790f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 19 Oct 2021 09:27:00 +0200 Subject: [PATCH 2/2] v1.11.0 (cherry picked from commit 02545757d279c87219a9c69347fd9d9732b3eb65) --- .gitignore | 1 + php-maxminddb.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ce0500b..a1e3bb6 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ clog /php-maxminddb-1.9.0-9ee9ba9.tgz /php-maxminddb-1.10.0-07f84d9.tgz /php-maxminddb-1.10.1-569bd44.tgz +/php-maxminddb-1.11.0-f7cc1a1.tgz diff --git a/php-maxminddb.spec b/php-maxminddb.spec index b2d0d89..f33cf38 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -9,7 +9,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 569bd44d97d30a4ec12c7793a33004a76d4caf18 +%global gh_commit f7cc1a1472868f25a02636c99d1054232292bc26 %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.1 +Version: 1.11.0 Release: 1%{?dist} License: ASL 2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -221,7 +221,7 @@ REPORT_EXIT_STATUS=1 \ cd .. : Upstream test suite for the library -for cmd in php php72 php73 php74 php80; do +for cmd in php php72 php73 php74 php80 php81; do if which $cmd; then $cmd %{_bindir}/phpunit8 \ --bootstrap %{buildroot}%{_datadir}/php/MaxMind/Db/Reader/autoload.php \ @@ -262,6 +262,9 @@ exit $ret %changelog +* Tue Oct 19 2021 Remi Collet - 1.11.0-1 +- update to 1.11.0 + * Thu Apr 15 2021 Remi Collet - 1.10.1-1 - update to 1.10.1 diff --git a/sources b/sources index fc97a6a..42e5840 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-maxminddb-1.10.1-569bd44.tgz) = cf4c4081a3d11766eaa294c80364d840592f29871226d1596532456870575deaa1ddcc444930fa48b184786cb7916b8be14d563486d6da00a378dbad7e5c300a +SHA512 (php-maxminddb-1.11.0-f7cc1a1.tgz) = d0d7ce79ed152ba9277997515cade9a8c7a043d1a23a27e6838ad48b3e4f8854327356f3a1d30dff156a203ec65329d3f1d936a26a1e9ee5ae87c4ff400f2997