From 49d7a82670152d8503fc2daba9207119453a4f61 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 15 Nov 2024 08:28:29 +0100 Subject: [PATCH 1/2] v1.12.0 (cherry picked from commit 98b460f37c635ce3516025f85a773ffacfc61e64) --- .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 a4f6f29..1df1ffc 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 @@ -30,8 +30,8 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb -Version: 1.11.1 -Release: 5%{?dist} +Version: 1.12.0 +Release: 1%{?dist} License: Apache-2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -263,6 +263,9 @@ exit $ret %changelog +* Fri Nov 15 2024 Remi Collet - 1.12.0-1 +- update to 1.12.0 + * Fri Jul 19 2024 Fedora Release Engineering - 1.11.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 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 ba6ad2381dd23632dc7e9d659a5b1cd33e23ea87 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 6 May 2025 08:43:25 +0200 Subject: [PATCH 2/2] update to 1.12.1 re-license spec file to CECILL-2.1 (cherry picked from commit d0009e4dd91ad2f5b509400661d6e92daccb13bf) --- .gitignore | 1 + php-maxminddb.spec | 14 +++++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 6 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 1df1ffc..018ccd5 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 @@ -30,7 +30,7 @@ Summary: MaxMind DB Reader extension Name: php-maxminddb -Version: 1.12.0 +Version: 1.12.1 Release: 1%{?dist} License: Apache-2.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -263,6 +263,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 + * Fri Nov 15 2024 Remi Collet - 1.12.0-1 - update to 1.12.0 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