From 42c61fc09232735a188c8fb74d6e013b898c4a8c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 5 Mar 2021 10:35:44 +0100 Subject: [PATCH 01/30] rebuild for https://fedoraproject.org/wiki/Changes/php80 --- php-maxminddb.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/php-maxminddb.spec b/php-maxminddb.spec index 32115cb..5999852 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -25,13 +25,15 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb Version: 1.10.0 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 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 +* Fri Mar 5 2021 Remi Collet - 1.10.0-2 +- rebuild for https://fedoraproject.org/wiki/Changes/php80 + * Wed Feb 10 2021 Remi Collet - 1.10.0-1 - update to 1.10.0 From 92a127ada31db68b57b5e2bc2a06ed2dc230a597 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 15 Apr 2021 09:22:43 +0200 Subject: [PATCH 02/30] v1.10.1 --- .gitignore | 1 + php-maxminddb.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 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 5999852..8478515 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,8 +24,8 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb -Version: 1.10.0 -Release: 2%{?dist} +Version: 1.10.1 +Release: 1%{?dist} License: ASL 2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -262,6 +262,9 @@ exit $ret %changelog +* Thu Apr 15 2021 Remi Collet - 1.10.1-1 +- update to 1.10.1 + * Fri Mar 5 2021 Remi Collet - 1.10.0-2 - rebuild for https://fedoraproject.org/wiki/Changes/php80 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 c86ebd874f479ca8c5650294308d11d443421af0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 15 Apr 2021 09:22:43 +0200 Subject: [PATCH 03/30] 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 e958f754d3461a7b76b2978161123925fc189669 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 02:29:52 +0000 Subject: [PATCH 04/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-maxminddb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-maxminddb.spec b/php-maxminddb.spec index 8478515..4d6a89d 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -25,7 +25,7 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb Version: 1.10.1 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -262,6 +262,9 @@ exit $ret %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.10.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Apr 15 2021 Remi Collet - 1.10.1-1 - update to 1.10.1 From 02545757d279c87219a9c69347fd9d9732b3eb65 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 19 Oct 2021 09:27:00 +0200 Subject: [PATCH 05/30] v1.11.0 --- .gitignore | 1 + php-maxminddb.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 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 4d6a89d..e98732d 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,8 +24,8 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb -Version: 1.10.1 -Release: 2%{?dist} +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 + * Fri Jul 23 2021 Fedora Release Engineering - 1.10.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild 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 From 3ac9d542273b95bd8bc37fa39f0029e15755790f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 19 Oct 2021 09:27:00 +0200 Subject: [PATCH 06/30] 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 From 275de1260df30f63c9775018bbc83df7c7707428 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 28 Oct 2021 11:21:22 +0200 Subject: [PATCH 07/30] rebuild for https://fedoraproject.org/wiki/Changes/php81 --- php-maxminddb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-maxminddb.spec b/php-maxminddb.spec index e98732d..231fab2 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -25,7 +25,7 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb Version: 1.11.0 -Release: 1%{?dist} +Release: 2%{?dist} License: ASL 2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -262,6 +262,9 @@ exit $ret %changelog +* Thu Oct 28 2021 Remi Collet - 1.11.0-2 +- rebuild for https://fedoraproject.org/wiki/Changes/php81 + * Tue Oct 19 2021 Remi Collet - 1.11.0-1 - update to 1.11.0 From bd122a4e106be69d2d8b68b7d6bf75d4bb9d27c6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 10 Dec 2021 09:22:24 +0100 Subject: [PATCH 08/30] disable library test suite for EL build --- php-maxminddb.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/php-maxminddb.spec b/php-maxminddb.spec index 231fab2..d1fa3bb 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -20,12 +20,16 @@ # pure PHP library %global pk_vendor maxmind-db %global pk_project reader -%global with_tests 0%{!?_without_tests:1} +%if 0%{?fedora} +%bcond_without tests +%else +%bcond_with tests +%endif Summary: MaxMind DB Reader extension Name: php-maxminddb Version: 1.11.0 -Release: 2%{?dist} +Release: 3%{?dist} License: ASL 2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -67,7 +71,7 @@ Summary: MaxMind DB Reader BuildArch: noarch BuildRequires: php-fedora-autoloader-devel -%if %{with_tests} +%if %{with tests} BuildRequires: php-bcmath BuildRequires: php-gmp # from composer.json "require-dev": { @@ -197,8 +201,6 @@ cp -pr src/MaxMind/Db %{buildroot}%{_datadir}/php/MaxMind/Db --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ --modules | grep %{pecl_name} %endif - -%if %{with_tests} ret=0 cd NTS @@ -219,6 +221,7 @@ REPORT_EXIT_STATUS=1 \ %{__ztsphp} -n run-tests.php --show-diff || ret=1 %endif +%if %{with tests} cd .. : Upstream test suite for the library for cmd in php php72 php73 php74 php80 php81; do @@ -239,7 +242,6 @@ exit $ret %files -%{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md %{pecl_xmldir}/%{name}.xml @@ -262,6 +264,9 @@ exit $ret %changelog +* Fri Dec 10 2021 Remi Collet - 1.11.0-3 +- disable library test suite for EL build + * Thu Oct 28 2021 Remi Collet - 1.11.0-2 - rebuild for https://fedoraproject.org/wiki/Changes/php81 From f7ae1d6dbc29615ad6498bc5cbbedacd68bfc523 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 07:52:50 +0000 Subject: [PATCH 09/30] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-maxminddb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-maxminddb.spec b/php-maxminddb.spec index d1fa3bb..277e28e 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -29,7 +29,7 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb Version: 1.11.0 -Release: 3%{?dist} +Release: 4%{?dist} License: ASL 2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -264,6 +264,9 @@ exit $ret %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 1.11.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Dec 10 2021 Remi Collet - 1.11.0-3 - disable library test suite for EL build From a9c1a214e507e6cb45c0a615ff84a604fb3b3f2c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 13:46:19 +0000 Subject: [PATCH 10/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-maxminddb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-maxminddb.spec b/php-maxminddb.spec index 277e28e..d3c7e28 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -29,7 +29,7 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb Version: 1.11.0 -Release: 4%{?dist} +Release: 5%{?dist} License: ASL 2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -264,6 +264,9 @@ exit $ret %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 1.11.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jan 21 2022 Fedora Release Engineering - 1.11.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 11aa7c30e56176d379eedfee54a939c64960292e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 5 Oct 2022 09:45:11 +0200 Subject: [PATCH 11/30] rebuild for https://fedoraproject.org/wiki/Changes/php82 --- php-maxminddb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-maxminddb.spec b/php-maxminddb.spec index d3c7e28..e41e407 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -29,7 +29,7 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb Version: 1.11.0 -Release: 5%{?dist} +Release: 6%{?dist} License: ASL 2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -264,6 +264,9 @@ exit $ret %changelog +* Wed Oct 05 2022 Remi Collet - 1.11.0-6 +- rebuild for https://fedoraproject.org/wiki/Changes/php82 + * Fri Jul 22 2022 Fedora Release Engineering - 1.11.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 4209ecc11c0d5a8009eeabfc4ec0aaf295804665 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 08:48:08 +0000 Subject: [PATCH 12/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-maxminddb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-maxminddb.spec b/php-maxminddb.spec index e41e407..f9dbfad 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -29,7 +29,7 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb Version: 1.11.0 -Release: 6%{?dist} +Release: 7%{?dist} License: ASL 2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -264,6 +264,9 @@ exit $ret %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 1.11.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Oct 05 2022 Remi Collet - 1.11.0-6 - rebuild for https://fedoraproject.org/wiki/Changes/php82 From 654c0a85f6c4e27879b56145c6a068ac9a027d17 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 31 Mar 2023 15:25:12 +0200 Subject: [PATCH 13/30] use SPDX license ID --- php-maxminddb.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/php-maxminddb.spec b/php-maxminddb.spec index f9dbfad..650aa48 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -3,8 +3,8 @@ # # remirepo spec file for php-maxminddb # -# Copyright (c) 2018-2021 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2018-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries @@ -29,8 +29,8 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb Version: 1.11.0 -Release: 7%{?dist} -License: ASL 2.0 +Release: 8%{?dist} +License: Apache-2.0 URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{name}-%{version}-%{gh_short}.tgz @@ -264,6 +264,9 @@ exit $ret %changelog +* Fri Mar 31 2023 Remi Collet - 1.11.0-8 +- use SPDX license ID + * Fri Jan 20 2023 Fedora Release Engineering - 1.11.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 077f7883862f20b3caf265779f113052b83b86c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 04:26:54 +0000 Subject: [PATCH 14/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-maxminddb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-maxminddb.spec b/php-maxminddb.spec index 650aa48..bbc85c0 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -29,7 +29,7 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb Version: 1.11.0 -Release: 8%{?dist} +Release: 9%{?dist} License: Apache-2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -264,6 +264,9 @@ exit $ret %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 1.11.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Mar 31 2023 Remi Collet - 1.11.0-8 - use SPDX license ID From 07ae24e5f2b64b71f60ce52442a8997bf812700d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 2 Oct 2023 08:45:13 +0200 Subject: [PATCH 15/30] add missing dependency on fedora/autoloader build out of sources tree --- php-maxminddb.spec | 45 +++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/php-maxminddb.spec b/php-maxminddb.spec index bbc85c0..ecb4e15 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -20,6 +20,8 @@ # pure PHP library %global pk_vendor maxmind-db %global pk_project reader +%global _configure ../ext/configure + %if 0%{?fedora} %bcond_without tests %else @@ -29,7 +31,7 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb Version: 1.11.0 -Release: 9%{?dist} +Release: 10%{?dist} License: Apache-2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -102,6 +104,8 @@ Suggests: geolite2-city # From phpcompatifo report for 1.3.0 Requires: php-filter Requires: php-spl +# Autoloader +Requires: php-composer(fedora/autoloader) Provides: php-composer(%{pk_vendor}/%{pk_project}) = %{version} @@ -127,10 +131,7 @@ Autoloader: %{_datadir}/php/MaxMind/Db/Reader/autoload.php --output src/MaxMind/Db/Reader/autoload.php \ src/MaxMind/Db -mv ext NTS - -cd NTS - +cd ext # Sanity check, really often broken extver=$(sed -n '/#define PHP_MAXMINDDB_VERSION/{s/.* "//;s/".*$//;p}' php_maxminddb.h) if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then @@ -139,9 +140,9 @@ if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then fi cd .. +mkdir NTS %if %{with_zts} -# duplicate for ZTS build -cp -pr NTS ZTS +mkdir ZTS %endif # Drop in the bit of configuration @@ -152,19 +153,20 @@ EOF %build -cd NTS -%{_bindir}/phpize +cd ext +%{__phpize} + +cd ../NTS %configure \ - --with-php-config=%{_bindir}/php-config \ + --with-php-config=%{__phpconfig} \ --with-libdir=%{_lib} \ --with-maxminddb make %{?_smp_mflags} %if %{with_zts} cd ../ZTS -%{_bindir}/zts-phpize %configure \ - --with-php-config=%{_bindir}/zts-php-config \ + --with-php-config=%{__ztsphpconfig} \ --with-libdir=%{_lib} \ --with-maxminddb make %{?_smp_mflags} @@ -193,32 +195,27 @@ cp -pr src/MaxMind/Db %{buildroot}%{_datadir}/php/MaxMind/Db : Minimal load test for NTS extension %{__php} --no-php-ini \ --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ - --modules | grep %{pecl_name} + --modules | grep '^%{pecl_name}$' %if %{with_zts} : Minimal load test for ZTS extension %{__ztsphp} --no-php-ini \ --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ - --modules | grep %{pecl_name} + --modules | grep '^%{pecl_name}$' %endif ret=0 -cd NTS +cd ext : Upstream test suite for NTS extension TEST_PHP_EXECUTABLE=%{__php} \ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ -NO_INTERACTION=1 \ -REPORT_EXIT_STATUS=1 \ -%{__php} -n run-tests.php --show-diff || ret=1 +%{__php} -n run-tests.php -q --show-diff || ret=1 %if %{with_zts} -cd ../ZTS : Upstream test suite for ZTS extension TEST_PHP_EXECUTABLE=%{__ztsphp} \ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ -NO_INTERACTION=1 \ -REPORT_EXIT_STATUS=1 \ -%{__ztsphp} -n run-tests.php --show-diff || ret=1 +%{__ztsphp} -n run-tests.php -q --show-diff || ret=1 %endif %if %{with tests} @@ -264,6 +261,10 @@ exit $ret %changelog +* Mon Oct 2 2023 Remi Collet - 1.11.0-10 +- add missing dependency on fedora/autoloader +- build out of sources tree + * Fri Jul 21 2023 Fedora Release Engineering - 1.11.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 151c8c3f8dae2453b09e21fefe5f28445de03e39 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 3 Oct 2023 08:32:59 +0200 Subject: [PATCH 16/30] rebuild for https://fedoraproject.org/wiki/Changes/php83 --- php-maxminddb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-maxminddb.spec b/php-maxminddb.spec index ecb4e15..9e9a27b 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -31,7 +31,7 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb Version: 1.11.0 -Release: 10%{?dist} +Release: 11%{?dist} License: Apache-2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -261,6 +261,9 @@ exit $ret %changelog +* Tue Oct 03 2023 Remi Collet - 1.11.0-11 +- rebuild for https://fedoraproject.org/wiki/Changes/php83 + * Mon Oct 2 2023 Remi Collet - 1.11.0-10 - add missing dependency on fedora/autoloader - build out of sources tree From 84f30ac9560cba7698fcf4646c38d59533cf855e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Dec 2023 09:55:38 +0100 Subject: [PATCH 17/30] v1.11.1 --- .gitignore | 1 + php-maxminddb.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index a1e3bb6..9d67ef3 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ clog /php-maxminddb-1.10.0-07f84d9.tgz /php-maxminddb-1.10.1-569bd44.tgz /php-maxminddb-1.11.0-f7cc1a1.tgz +/php-maxminddb-1.11.1-1e66f73.tgz diff --git a/php-maxminddb.spec b/php-maxminddb.spec index 9e9a27b..08c6e74 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -9,7 +9,7 @@ # # Please, preserve the changelog entries # -%global gh_commit f7cc1a1472868f25a02636c99d1054232292bc26 +%global gh_commit 1e66f73ffcf25e17c7a910a1317e9720a95497c7 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner maxmind %global gh_project MaxMind-DB-Reader-php @@ -30,8 +30,8 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb -Version: 1.11.0 -Release: 11%{?dist} +Version: 1.11.1 +Release: 1%{?dist} License: Apache-2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -96,7 +96,7 @@ Recommends: php-bcmath Recommends: php-gmp Recommends: php-maxminddb # from composer.json "conflict": { -# "ext-maxminddb": "<1.10.0,>=2.0.0" +# "ext-maxminddb": "<1.11.1,>=2.0.0" Conflicts: php-maxminddb < %{version} # Weak dependencies on databases Recommends: geolite2-country @@ -221,7 +221,7 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ %if %{with tests} cd .. : Upstream test suite for the library -for cmd in php php72 php73 php74 php80 php81; do +for cmd in php php80 php81 php82 php83; do if which $cmd; then $cmd %{_bindir}/phpunit8 \ --bootstrap %{buildroot}%{_datadir}/php/MaxMind/Db/Reader/autoload.php \ @@ -261,6 +261,9 @@ exit $ret %changelog +* Mon Dec 4 2023 Remi Collet - 1.11.1-1 +- update to 1.11.1 + * Tue Oct 03 2023 Remi Collet - 1.11.0-11 - rebuild for https://fedoraproject.org/wiki/Changes/php83 diff --git a/sources b/sources index 42e5840..b121573 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-maxminddb-1.11.0-f7cc1a1.tgz) = d0d7ce79ed152ba9277997515cade9a8c7a043d1a23a27e6838ad48b3e4f8854327356f3a1d30dff156a203ec65329d3f1d936a26a1e9ee5ae87c4ff400f2997 +SHA512 (php-maxminddb-1.11.1-1e66f73.tgz) = 4d38bfca7b3b215ce01e306be1c3771dec9c83728026915faa98c6e51595181ade29ede6709fd71a22439cad23c808a55c0d459c6c56eb4638d8378bb34a4106 From 64f626ace650c07b7600d687fc52c8dce2865788 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 20:57:18 +0000 Subject: [PATCH 18/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-maxminddb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-maxminddb.spec b/php-maxminddb.spec index 08c6e74..8cfb5a1 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -31,7 +31,7 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb Version: 1.11.1 -Release: 1%{?dist} +Release: 2%{?dist} License: Apache-2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -261,6 +261,9 @@ exit $ret %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 1.11.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Dec 4 2023 Remi Collet - 1.11.1-1 - update to 1.11.1 From b9571dd215645e8e8905babaade54a26d36b46da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 22:44:03 +0000 Subject: [PATCH 19/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-maxminddb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-maxminddb.spec b/php-maxminddb.spec index 8cfb5a1..f646ea9 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -31,7 +31,7 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb Version: 1.11.1 -Release: 2%{?dist} +Release: 3%{?dist} License: Apache-2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -261,6 +261,9 @@ exit $ret %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 1.11.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 1.11.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b2f37c6394228cd08da7b8096e443e6f54d0ddaa Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 12 Apr 2024 15:01:42 +0200 Subject: [PATCH 20/30] drop 32-bit support --- php-maxminddb.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/php-maxminddb.spec b/php-maxminddb.spec index f646ea9..30346a9 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -3,7 +3,7 @@ # # remirepo spec file for php-maxminddb # -# Copyright (c) 2018-2023 Remi Collet +# Copyright (c) 2018-2024 Remi Collet # License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -31,13 +31,15 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb Version: 1.11.1 -Release: 3%{?dist} +Release: 4%{?dist} License: Apache-2.0 URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh +ExcludeArch: %{ix86} + BuildRequires: make BuildRequires: gcc BuildRequires: php-devel >= 7.2 @@ -261,6 +263,10 @@ exit $ret %changelog +* Fri Apr 12 2024 Remi Collet - 1.11.1-4 +- drop 32-bit support + https://fedoraproject.org/wiki/Changes/php_no_32_bit + * Thu Jan 25 2024 Fedora Release Engineering - 1.11.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b51b317ef3856e15fc5811e6b6f1c32aeba8df76 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 06:58:20 +0000 Subject: [PATCH 21/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- php-maxminddb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-maxminddb.spec b/php-maxminddb.spec index 30346a9..a4f6f29 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -31,7 +31,7 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb Version: 1.11.1 -Release: 4%{?dist} +Release: 5%{?dist} License: Apache-2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -263,6 +263,9 @@ exit $ret %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 1.11.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Apr 12 2024 Remi Collet - 1.11.1-4 - drop 32-bit support https://fedoraproject.org/wiki/Changes/php_no_32_bit From 06060b89545276b506217aee985bc53ea965c803 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 14 Oct 2024 12:10:04 +0200 Subject: [PATCH 22/30] rebuild for https://fedoraproject.org/wiki/Changes/php84 --- php-maxminddb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-maxminddb.spec b/php-maxminddb.spec index a4f6f29..ff0ad30 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -31,7 +31,7 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb Version: 1.11.1 -Release: 5%{?dist} +Release: 6%{?dist} License: Apache-2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -263,6 +263,9 @@ exit $ret %changelog +* Mon Oct 14 2024 Remi Collet - 1.11.1-6 +- rebuild for https://fedoraproject.org/wiki/Changes/php84 + * Fri Jul 19 2024 Fedora Release Engineering - 1.11.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 2e8fa899d710d6f42281150baec52ad346cc3738 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 18 Oct 2024 15:53:12 +0200 Subject: [PATCH 23/30] modernize the spec file --- php-maxminddb.spec | 58 +++++++++++----------------------------------- 1 file changed, 13 insertions(+), 45 deletions(-) diff --git a/php-maxminddb.spec b/php-maxminddb.spec index ff0ad30..1904561 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -15,7 +15,6 @@ %global gh_project MaxMind-DB-Reader-php # Extension %global pecl_name maxminddb -%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} %global ini_name 40-%{pecl_name}.ini # pure PHP library %global pk_vendor maxmind-db @@ -31,7 +30,7 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb Version: 1.11.1 -Release: 6%{?dist} +Release: 7%{?dist} License: Apache-2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -142,11 +141,6 @@ if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then fi cd .. -mkdir NTS -%if %{with_zts} -mkdir ZTS -%endif - # Drop in the bit of configuration cat << 'EOF' | tee %{ini_name} ; Enable '%{pecl_name}' extension module @@ -157,38 +151,27 @@ EOF %build cd ext %{__phpize} +sed -e 's/INSTALL_ROOT/DESTDIR/' -i build/Makefile.global -cd ../NTS %configure \ --with-php-config=%{__phpconfig} \ --with-libdir=%{_lib} \ --with-maxminddb -make %{?_smp_mflags} -%if %{with_zts} -cd ../ZTS -%configure \ - --with-php-config=%{__ztsphpconfig} \ - --with-libdir=%{_lib} \ - --with-maxminddb -make %{?_smp_mflags} -%endif +%make_build %install -# Install XML package description +: Install the extension +%make_install -C ext + +: Install XML package description install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml -# Install the NTS stuff -make -C NTS install INSTALL_ROOT=%{buildroot} +: Install the extension install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} -%if %{with_zts} -# Install the ZTS stuff -make -C ZTS install INSTALL_ROOT=%{buildroot} -install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} -%endif - +: Install the library mkdir -p %{buildroot}%{_datadir}/php/MaxMind cp -pr src/MaxMind/Db %{buildroot}%{_datadir}/php/MaxMind/Db @@ -199,12 +182,6 @@ cp -pr src/MaxMind/Db %{buildroot}%{_datadir}/php/MaxMind/Db --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ --modules | grep '^%{pecl_name}$' -%if %{with_zts} -: Minimal load test for ZTS extension -%{__ztsphp} --no-php-ini \ - --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \ - --modules | grep '^%{pecl_name}$' -%endif ret=0 cd ext @@ -213,17 +190,10 @@ TEST_PHP_EXECUTABLE=%{__php} \ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \ %{__php} -n run-tests.php -q --show-diff || ret=1 -%if %{with_zts} -: Upstream test suite for ZTS extension -TEST_PHP_EXECUTABLE=%{__ztsphp} \ -TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \ -%{__ztsphp} -n run-tests.php -q --show-diff || ret=1 -%endif - %if %{with tests} cd .. : Upstream test suite for the library -for cmd in php php80 php81 php82 php83; do +for cmd in php80 php81 php82 php83 php84; do if which $cmd; then $cmd %{_bindir}/phpunit8 \ --bootstrap %{buildroot}%{_datadir}/php/MaxMind/Db/Reader/autoload.php \ @@ -248,11 +218,6 @@ exit $ret %config(noreplace) %{php_inidir}/%{ini_name} %{php_extdir}/%{pecl_name}.so -%if %{with_zts} -%config(noreplace) %{php_ztsinidir}/%{ini_name} -%{php_ztsextdir}/%{pecl_name}.so -%endif - %files -n php-%{pk_vendor}-%{pk_project} %license LICENSE @@ -263,6 +228,9 @@ exit $ret %changelog +* Fri Oct 18 2024 Remi Collet - 1.11.1-7 +- modernize the spec file + * Mon Oct 14 2024 Remi Collet - 1.11.1-6 - rebuild for https://fedoraproject.org/wiki/Changes/php84 From 98b460f37c635ce3516025f85a773ffacfc61e64 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 15 Nov 2024 08:28:29 +0100 Subject: [PATCH 24/30] v1.12.0 --- .gitignore | 1 + php-maxminddb.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9d67ef3..d8a1559 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ clog /php-maxminddb-1.10.1-569bd44.tgz /php-maxminddb-1.11.0-f7cc1a1.tgz /php-maxminddb-1.11.1-1e66f73.tgz +/php-maxminddb-1.12.0-5b2d7a7.tgz diff --git a/php-maxminddb.spec b/php-maxminddb.spec index 1904561..4a26f52 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -9,7 +9,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 1e66f73ffcf25e17c7a910a1317e9720a95497c7 +%global gh_commit 5b2d7a721dedfaef9dc20822c5fe7d26f9f8eb90 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner maxmind %global gh_project MaxMind-DB-Reader-php @@ -29,8 +29,8 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb -Version: 1.11.1 -Release: 7%{?dist} +Version: 1.12.0 +Release: 1%{?dist} License: Apache-2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -228,6 +228,9 @@ exit $ret %changelog +* Fri Nov 15 2024 Remi Collet - 1.12.0-1 +- update to 1.12.0 + * Fri Oct 18 2024 Remi Collet - 1.11.1-7 - modernize the spec file diff --git a/sources b/sources index b121573..689a09e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-maxminddb-1.11.1-1e66f73.tgz) = 4d38bfca7b3b215ce01e306be1c3771dec9c83728026915faa98c6e51595181ade29ede6709fd71a22439cad23c808a55c0d459c6c56eb4638d8378bb34a4106 +SHA512 (php-maxminddb-1.12.0-5b2d7a7.tgz) = 14f178b02055596eeeb1743310cd2479bb7e4f3beb01e7b694ceee8b6f9a315b3949e52d9951d2c33aa7a173b6d14c721f171bfc58292e94ca0c7a81c67a21c6 From 7e36bf7aeac388bbd7d8ad913ee2a203b35bb76c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 09:09:16 +0000 Subject: [PATCH 25/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- php-maxminddb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-maxminddb.spec b/php-maxminddb.spec index 4a26f52..8fbc06a 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -30,7 +30,7 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb Version: 1.12.0 -Release: 1%{?dist} +Release: 2%{?dist} License: Apache-2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -228,6 +228,9 @@ exit $ret %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 1.12.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Nov 15 2024 Remi Collet - 1.12.0-1 - update to 1.12.0 From d0009e4dd91ad2f5b509400661d6e92daccb13bf Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 6 May 2025 08:43:25 +0200 Subject: [PATCH 26/30] update to 1.12.1 re-license spec file to CECILL-2.1 --- .gitignore | 1 + php-maxminddb.spec | 16 ++++++++++------ sources | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index d8a1559..67a480f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ clog /php-maxminddb-1.11.0-f7cc1a1.tgz /php-maxminddb-1.11.1-1e66f73.tgz /php-maxminddb-1.12.0-5b2d7a7.tgz +/php-maxminddb-1.12.1-815939e.tgz diff --git a/php-maxminddb.spec b/php-maxminddb.spec index 8fbc06a..018e5f3 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -3,13 +3,13 @@ # # remirepo spec file for php-maxminddb # -# Copyright (c) 2018-2024 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2018-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # -%global gh_commit 5b2d7a721dedfaef9dc20822c5fe7d26f9f8eb90 +%global gh_commit 815939e006b7e68062b540ec9e86aaa8be2b6ce4 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner maxmind %global gh_project MaxMind-DB-Reader-php @@ -29,8 +29,8 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb -Version: 1.12.0 -Release: 2%{?dist} +Version: 1.12.1 +Release: 1%{?dist} License: Apache-2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -228,6 +228,10 @@ exit $ret %changelog +* Tue May 6 2025 Remi Collet - 1.12.1-1 +- update to 1.12.1 +- re-license spec file to CECILL-2.1 + * Sat Jan 18 2025 Fedora Release Engineering - 1.12.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 689a09e..3bb8362 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-maxminddb-1.12.0-5b2d7a7.tgz) = 14f178b02055596eeeb1743310cd2479bb7e4f3beb01e7b694ceee8b6f9a315b3949e52d9951d2c33aa7a173b6d14c721f171bfc58292e94ca0c7a81c67a21c6 +SHA512 (php-maxminddb-1.12.1-815939e.tgz) = 7202974a44e71908ba257b632272cc875d578bd5639e2183c74c8b673298693acb6520bef0c98e730ee1fc2fe3d4640eb11bd8360d57be4740954b049647af5a From 839b59ea2d03712879af1683cca573bd4517a39f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:14:46 +0000 Subject: [PATCH 27/30] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- php-maxminddb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-maxminddb.spec b/php-maxminddb.spec index 018e5f3..a1fee8a 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -30,7 +30,7 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb Version: 1.12.1 -Release: 1%{?dist} +Release: 2%{?dist} License: Apache-2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -228,6 +228,9 @@ exit $ret %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue May 6 2025 Remi Collet - 1.12.1-1 - update to 1.12.1 - re-license spec file to CECILL-2.1 From fa67c8ab3831d024823b130768407c425dbea344 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 17 Sep 2025 07:16:20 +0200 Subject: [PATCH 28/30] rebuild for https://fedoraproject.org/wiki/Changes/php85 --- php-maxminddb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-maxminddb.spec b/php-maxminddb.spec index a1fee8a..05d8dc5 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -30,7 +30,7 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb Version: 1.12.1 -Release: 2%{?dist} +Release: 3%{?dist} License: Apache-2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -228,6 +228,9 @@ exit $ret %changelog +* Wed Sep 17 2025 Remi Collet - 1.12.1-3 +- rebuild for https://fedoraproject.org/wiki/Changes/php85 + * Fri Jul 25 2025 Fedora Release Engineering - 1.12.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 391aaa7bf4ec99e24d166d53fa64a8aaf48ffe5d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 21 Nov 2025 08:41:06 +0100 Subject: [PATCH 29/30] v1.13.0 --- .gitignore | 1 + php-maxminddb.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 67a480f..89fe537 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ clog /php-maxminddb-1.11.1-1e66f73.tgz /php-maxminddb-1.12.0-5b2d7a7.tgz /php-maxminddb-1.12.1-815939e.tgz +/php-maxminddb-1.13.0-b298986.tgz diff --git a/php-maxminddb.spec b/php-maxminddb.spec index 05d8dc5..a49fcab 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -9,7 +9,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 815939e006b7e68062b540ec9e86aaa8be2b6ce4 +%global gh_commit b298986c4f2c75ff080d9f6f4839bec46bda70f3 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner maxmind %global gh_project MaxMind-DB-Reader-php @@ -29,8 +29,8 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb -Version: 1.12.1 -Release: 3%{?dist} +Version: 1.13.0 +Release: 1%{?dist} License: Apache-2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -228,6 +228,9 @@ exit $ret %changelog +* Fri Nov 21 2025 Remi Collet - 1.13.0-1 +- update to 1.13.0 + * Wed Sep 17 2025 Remi Collet - 1.12.1-3 - rebuild for https://fedoraproject.org/wiki/Changes/php85 diff --git a/sources b/sources index 3bb8362..c7ba67a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-maxminddb-1.12.1-815939e.tgz) = 7202974a44e71908ba257b632272cc875d578bd5639e2183c74c8b673298693acb6520bef0c98e730ee1fc2fe3d4640eb11bd8360d57be4740954b049647af5a +SHA512 (php-maxminddb-1.13.0-b298986.tgz) = c506564948c4a8766cd7b5241af5897c82fc85806eb9d9aa64d6625fc51fefecabd1314396690c806ac2ecd0e489ad54ba27812e04cf04c93b1d1f0d27777ca5 From f99edb7aaab7cf9375c3fdbb39b2bd70ad4fd7d9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 22 Nov 2025 08:22:12 +0100 Subject: [PATCH 30/30] update to 1.13.1 (no changes) add pie virtual provides --- .gitignore | 1 + php-maxminddb.spec | 13 +++++++++++-- sources | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 89fe537..29fac45 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ clog /php-maxminddb-1.12.0-5b2d7a7.tgz /php-maxminddb-1.12.1-815939e.tgz /php-maxminddb-1.13.0-b298986.tgz +/php-maxminddb-1.13.1-2194f58.tgz diff --git a/php-maxminddb.spec b/php-maxminddb.spec index a49fcab..6ada21a 100644 --- a/php-maxminddb.spec +++ b/php-maxminddb.spec @@ -9,11 +9,13 @@ # # Please, preserve the changelog entries # -%global gh_commit b298986c4f2c75ff080d9f6f4839bec46bda70f3 +%global gh_commit 2194f58d0f024ce923e685cdf92af3daf9951908 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner maxmind %global gh_project MaxMind-DB-Reader-php # Extension +%global pie_vend maxmind-db +%global pie_proj reader-ext %global pecl_name maxminddb %global ini_name 40-%{pecl_name}.ini # pure PHP library @@ -29,7 +31,7 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb -Version: 1.13.0 +Version: 1.13.1 Release: 1%{?dist} License: Apache-2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -57,6 +59,9 @@ Provides: php-pecl-%{pecl_name} = %{version}-%{release} Provides: php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} Provides: php-pecl(%{pecl_name}) = %{version} Provides: php-pecl(%{pecl_name})%{?_isa} = %{version} +# PIE +Provides: %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version} +Provides: %{?scl_prefix}php-%{pie_vend}-%{pie_proj} = %{version} %description @@ -228,6 +233,10 @@ exit $ret %changelog +* Sat Nov 22 2025 Remi Collet - 1.13.1-1 +- update to 1.13.1 (no changes) +- add pie virtual provides + * Fri Nov 21 2025 Remi Collet - 1.13.0-1 - update to 1.13.0 diff --git a/sources b/sources index c7ba67a..dc1dae0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-maxminddb-1.13.0-b298986.tgz) = c506564948c4a8766cd7b5241af5897c82fc85806eb9d9aa64d6625fc51fefecabd1314396690c806ac2ecd0e489ad54ba27812e04cf04c93b1d1f0d27777ca5 +SHA512 (php-maxminddb-1.13.1-2194f58.tgz) = 4862dd4afcb899fabd91dfa6a6471aa5bf06f2a4b1c5929d68ad72774c8d83e3ea17f2e2bab557b2d27f7fe2267854c391e19443f52e3667ce04614f3e9cf8d0