From 765ef0b6c341b3c877f810f929bb25be6d63a529 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 07:12:08 +0000 Subject: [PATCH 01/17] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-netresearch-jsonmapper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-netresearch-jsonmapper.spec b/php-netresearch-jsonmapper.spec index e682d38..695c6ee 100644 --- a/php-netresearch-jsonmapper.spec +++ b/php-netresearch-jsonmapper.spec @@ -19,7 +19,7 @@ Name: php-%{pk_vendor}-%{pk_project} Version: 3.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Map nested JSON structures onto PHP classes License: OSL 3.0 @@ -128,6 +128,9 @@ exit $ret %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 3.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Nov 3 2020 Remi Collet - 3.1.1-1 - update to 3.1.1 From ee1f0861cf01960646e788a9650c87b8ed11cd33 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 28 Jun 2021 07:41:37 +0200 Subject: [PATCH 02/17] update to 4.0.0 raise dependency on PHP 7.1 switch to phpunit9 --- .gitignore | 1 + php-netresearch-jsonmapper.spec | 29 +++++++++++++++++------------ sources | 2 +- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index c199650..cf193cc 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /php-netresearch-jsonmapper-3.0.0-d3f0e81.tgz /php-netresearch-jsonmapper-3.1.0-923d59d.tgz /php-netresearch-jsonmapper-3.1.1-ba09f0e.tgz +/php-netresearch-jsonmapper-4.0.0-8bbc021.tgz diff --git a/php-netresearch-jsonmapper.spec b/php-netresearch-jsonmapper.spec index 695c6ee..596a7a8 100644 --- a/php-netresearch-jsonmapper.spec +++ b/php-netresearch-jsonmapper.spec @@ -1,12 +1,12 @@ # remirepo/fedora spec file for php-netresearch-jsonmapper # -# Copyright (c) 2017-2020 Remi Collet +# Copyright (c) 2017-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit ba09f0e456d4f00cef84e012da5715625594407c +%global gh_commit 8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner cweiske %global gh_project jsonmapper @@ -18,8 +18,8 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{pk_vendor}-%{pk_project} -Version: 3.1.1 -Release: 2%{?dist} +Version: 4.0.0 +Release: 1%{?dist} Summary: Map nested JSON structures onto PHP classes License: OSL 3.0 @@ -31,27 +31,27 @@ Source1: makesrc.sh BuildArch: noarch %if %{with_tests} # For tests -BuildRequires: php(language) >= 5.6 +BuildRequires: php(language) >= 7.1 BuildRequires: php-spl BuildRequires: php-json BuildRequires: php-pcre BuildRequires: php-reflection # From composer.json, "require-dev": { -# "phpunit/phpunit": "~4.8.35 || ~5.7 || ~6.4 || ~7.0", +# "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0", # "squizlabs/php_codesniffer": "~3.5" -%global phpunit %{_bindir}/phpunit7 -BuildRequires: phpunit7 +%global phpunit %{_bindir}/phpunit9 +BuildRequires: phpunit9 # Required by autoloader BuildRequires: php-fedora-autoloader-devel %endif # From composer.json, "require": { -# "php": ">=5.6", +# "php": ">=7.1", # "ext-spl": "*", # "ext-json": "*", # "ext-pcre": "*", # "ext-reflection": "*" -Requires: php(language) >= 5.6 +Requires: php(language) >= 7.1 Requires: php-spl Requires: php-json Requires: php-pcre @@ -103,10 +103,10 @@ mkdir vendor : Run upstream test suite ret=0 -for cmd in "php %{phpunit}" php72 php73 php74 php80; do +for cmd in "php %{phpunit}" php73 php74 php80 php81; do if which $cmd; then set $cmd - $1 ${2:-%{_bindir}/phpunit7} \ + $1 ${2:-%{_bindir}/phpunit9} \ --bootstrap %{buildroot}%{php_home}/%{pk_vendor}/%{pk_project}/autoload.php \ --no-coverage \ --verbose . || ret=1 @@ -128,6 +128,11 @@ exit $ret %changelog +* Mon Jun 28 2021 Remi Collet - 4.0.0-1 +- update to 4.0.0 +- raise dependency on PHP 7.1 +- switch to phpunit9 + * Wed Jan 27 2021 Fedora Release Engineering - 3.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index ff68b26..394b61d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-netresearch-jsonmapper-3.1.1-ba09f0e.tgz) = eeff60f8fc2e1e7f705d97b12fb1ba80e3490a91557d046a655a4ebe415b98fb07890de18aebb6c76321903d0285541a1aa482da1e3238ea2dfe84e5eafa67a8 +SHA512 (php-netresearch-jsonmapper-4.0.0-8bbc021.tgz) = 6c566ad8a86bab45a6633a6e39e92cde2e1c8f3c107b1fca36a4061c3dc05bd9c5bfcf42309590f05f508fd3c0dcb0968585c14083735d26af1fa2293d5076d5 From 2c1729ee307cbb353ab0d983c7e5c0aedab82a12 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 02:32:19 +0000 Subject: [PATCH 03/17] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-netresearch-jsonmapper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-netresearch-jsonmapper.spec b/php-netresearch-jsonmapper.spec index 596a7a8..77c3928 100644 --- a/php-netresearch-jsonmapper.spec +++ b/php-netresearch-jsonmapper.spec @@ -19,7 +19,7 @@ Name: php-%{pk_vendor}-%{pk_project} Version: 4.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Map nested JSON structures onto PHP classes License: OSL 3.0 @@ -128,6 +128,9 @@ exit $ret %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 4.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jun 28 2021 Remi Collet - 4.0.0-1 - update to 4.0.0 - raise dependency on PHP 7.1 From 7dafbe6d41ea51f288a4736b7059434acead4dc4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 07:54:55 +0000 Subject: [PATCH 04/17] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-netresearch-jsonmapper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-netresearch-jsonmapper.spec b/php-netresearch-jsonmapper.spec index 77c3928..68d6c3b 100644 --- a/php-netresearch-jsonmapper.spec +++ b/php-netresearch-jsonmapper.spec @@ -19,7 +19,7 @@ Name: php-%{pk_vendor}-%{pk_project} Version: 4.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Map nested JSON structures onto PHP classes License: OSL 3.0 @@ -128,6 +128,9 @@ exit $ret %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 4.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 4.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From f5176003c628a854b10328f41f049f869b1b3bbf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 13:48:44 +0000 Subject: [PATCH 05/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-netresearch-jsonmapper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-netresearch-jsonmapper.spec b/php-netresearch-jsonmapper.spec index 68d6c3b..81a5393 100644 --- a/php-netresearch-jsonmapper.spec +++ b/php-netresearch-jsonmapper.spec @@ -19,7 +19,7 @@ Name: php-%{pk_vendor}-%{pk_project} Version: 4.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Map nested JSON structures onto PHP classes License: OSL 3.0 @@ -128,6 +128,9 @@ exit $ret %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 4.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jan 21 2022 Fedora Release Engineering - 4.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 24075fa7f16c33e3db81d2c1c6d59844569592e4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 9 Dec 2022 09:03:23 +0100 Subject: [PATCH 06/17] v4.1.0 --- .gitignore | 10 ++-------- php-netresearch-jsonmapper.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index cf193cc..5532f82 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,4 @@ -/php-netresearch-jsonmapper-1.4.0-3868fe1.tgz -/php-netresearch-jsonmapper-1.5.0-da74a07.tgz -/php-netresearch-jsonmapper-1.5.1-047dafe.tgz -/php-netresearch-jsonmapper-1.6.0-0d4d1b4.tgz -/php-netresearch-jsonmapper-2.0.0-e245890.tgz -/php-netresearch-jsonmapper-2.1.0-e0f1e33.tgz -/php-netresearch-jsonmapper-3.0.0-d3f0e81.tgz -/php-netresearch-jsonmapper-3.1.0-923d59d.tgz +clog /php-netresearch-jsonmapper-3.1.1-ba09f0e.tgz /php-netresearch-jsonmapper-4.0.0-8bbc021.tgz +/php-netresearch-jsonmapper-4.1.0-cfa81ea.tgz diff --git a/php-netresearch-jsonmapper.spec b/php-netresearch-jsonmapper.spec index 81a5393..1dac589 100644 --- a/php-netresearch-jsonmapper.spec +++ b/php-netresearch-jsonmapper.spec @@ -1,12 +1,12 @@ # remirepo/fedora spec file for php-netresearch-jsonmapper # -# Copyright (c) 2017-2021 Remi Collet +# Copyright (c) 2017-2022 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit 8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d +%global gh_commit cfa81ea1d35294d64adb9c68aa4cb9e92400e53f %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner cweiske %global gh_project jsonmapper @@ -18,8 +18,8 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{pk_vendor}-%{pk_project} -Version: 4.0.0 -Release: 4%{?dist} +Version: 4.1.0 +Release: 1%{?dist} Summary: Map nested JSON structures onto PHP classes License: OSL 3.0 @@ -103,7 +103,7 @@ mkdir vendor : Run upstream test suite ret=0 -for cmd in "php %{phpunit}" php73 php74 php80 php81; do +for cmd in "php %{phpunit}" php80 php81 php82; do if which $cmd; then set $cmd $1 ${2:-%{_bindir}/phpunit9} \ @@ -128,6 +128,9 @@ exit $ret %changelog +* Fri Dec 9 2022 Remi Collet - 4.1.0-1 +- update to 4.1.0 + * Fri Jul 22 2022 Fedora Release Engineering - 4.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 394b61d..316dda1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-netresearch-jsonmapper-4.0.0-8bbc021.tgz) = 6c566ad8a86bab45a6633a6e39e92cde2e1c8f3c107b1fca36a4061c3dc05bd9c5bfcf42309590f05f508fd3c0dcb0968585c14083735d26af1fa2293d5076d5 +SHA512 (php-netresearch-jsonmapper-4.1.0-cfa81ea.tgz) = 087dd62a5f72343f48d6f3e3e4f9d77f080a134e97a6f1378321177c1a12425c4f94e1d6175d3496531b38c616edcd397e9fd5cf84b6e5ba9012cc8d751a1d74 From a09a50a6c931d6c3b079a991bc864e512d15c294 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 08:50:15 +0000 Subject: [PATCH 07/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-netresearch-jsonmapper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-netresearch-jsonmapper.spec b/php-netresearch-jsonmapper.spec index 1dac589..9cdfb53 100644 --- a/php-netresearch-jsonmapper.spec +++ b/php-netresearch-jsonmapper.spec @@ -19,7 +19,7 @@ Name: php-%{pk_vendor}-%{pk_project} Version: 4.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Map nested JSON structures onto PHP classes License: OSL 3.0 @@ -128,6 +128,9 @@ exit $ret %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 4.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Dec 9 2022 Remi Collet - 4.1.0-1 - update to 4.1.0 From 094e64c66d566bed024703cdfd463d67dea97f81 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 11 Apr 2023 09:15:17 +0200 Subject: [PATCH 08/17] v4.2.0 --- .gitignore | 1 + php-netresearch-jsonmapper.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 5532f82..3fbcd05 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ clog /php-netresearch-jsonmapper-3.1.1-ba09f0e.tgz /php-netresearch-jsonmapper-4.0.0-8bbc021.tgz /php-netresearch-jsonmapper-4.1.0-cfa81ea.tgz +/php-netresearch-jsonmapper-4.2.0-f60565f.tgz diff --git a/php-netresearch-jsonmapper.spec b/php-netresearch-jsonmapper.spec index 9cdfb53..7766c58 100644 --- a/php-netresearch-jsonmapper.spec +++ b/php-netresearch-jsonmapper.spec @@ -1,12 +1,12 @@ # remirepo/fedora spec file for php-netresearch-jsonmapper # -# Copyright (c) 2017-2022 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2017-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit cfa81ea1d35294d64adb9c68aa4cb9e92400e53f +%global gh_commit f60565f8c0566a31acf06884cdaa591867ecc956 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner cweiske %global gh_project jsonmapper @@ -18,11 +18,11 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{pk_vendor}-%{pk_project} -Version: 4.1.0 -Release: 2%{?dist} +Version: 4.2.0 +Release: 1%{?dist} Summary: Map nested JSON structures onto PHP classes -License: OSL 3.0 +License: OSL-3.0 URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{name}-%{version}-%{gh_short}.tgz # Git snapshot with tests @@ -128,6 +128,9 @@ exit $ret %changelog +* Tue Apr 11 2023 Remi Collet - 4.2.0-1 +- update to 4.2.0 + * Fri Jan 20 2023 Fedora Release Engineering - 4.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 316dda1..fb851a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-netresearch-jsonmapper-4.1.0-cfa81ea.tgz) = 087dd62a5f72343f48d6f3e3e4f9d77f080a134e97a6f1378321177c1a12425c4f94e1d6175d3496531b38c616edcd397e9fd5cf84b6e5ba9012cc8d751a1d74 +SHA512 (php-netresearch-jsonmapper-4.2.0-f60565f.tgz) = cf06f1fe3d95ae9b95d8852900ced9d359d520fc565f0c2c52425f008ef4e4d0646959cdfd3540fc806420b292ab6cd46fccef560772d774630ea241d1b6d27a From 6b3dbc00c4529de6fb6c7a13a5aed10f151f6117 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 04:29:00 +0000 Subject: [PATCH 09/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-netresearch-jsonmapper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-netresearch-jsonmapper.spec b/php-netresearch-jsonmapper.spec index 7766c58..5bb010a 100644 --- a/php-netresearch-jsonmapper.spec +++ b/php-netresearch-jsonmapper.spec @@ -19,7 +19,7 @@ Name: php-%{pk_vendor}-%{pk_project} Version: 4.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Map nested JSON structures onto PHP classes License: OSL-3.0 @@ -128,6 +128,9 @@ exit $ret %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 4.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Apr 11 2023 Remi Collet - 4.2.0-1 - update to 4.2.0 From b4d4a6ac7d512c5f8b34268e780846ae1b155b02 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 20:59:25 +0000 Subject: [PATCH 10/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-netresearch-jsonmapper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-netresearch-jsonmapper.spec b/php-netresearch-jsonmapper.spec index 5bb010a..75e2723 100644 --- a/php-netresearch-jsonmapper.spec +++ b/php-netresearch-jsonmapper.spec @@ -19,7 +19,7 @@ Name: php-%{pk_vendor}-%{pk_project} Version: 4.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Map nested JSON structures onto PHP classes License: OSL-3.0 @@ -128,6 +128,9 @@ exit $ret %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 4.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jul 21 2023 Fedora Release Engineering - 4.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 3d4201e2c1d08dc963311e90e20776dbe9e8c48f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 22:46:12 +0000 Subject: [PATCH 11/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-netresearch-jsonmapper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-netresearch-jsonmapper.spec b/php-netresearch-jsonmapper.spec index 75e2723..2c048a4 100644 --- a/php-netresearch-jsonmapper.spec +++ b/php-netresearch-jsonmapper.spec @@ -19,7 +19,7 @@ Name: php-%{pk_vendor}-%{pk_project} Version: 4.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Map nested JSON structures onto PHP classes License: OSL-3.0 @@ -128,6 +128,9 @@ exit $ret %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 4.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 4.2.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 05ec8abd4a24beefa8661918ba494a8abc40e033 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 29 Jan 2024 10:08:44 +0100 Subject: [PATCH 12/17] v4.4.0 --- .gitignore | 1 + php-netresearch-jsonmapper.spec | 28 ++++++++++++++++------------ sources | 2 +- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 3fbcd05..b2eedfc 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ clog /php-netresearch-jsonmapper-4.0.0-8bbc021.tgz /php-netresearch-jsonmapper-4.1.0-cfa81ea.tgz /php-netresearch-jsonmapper-4.2.0-f60565f.tgz +/php-netresearch-jsonmapper-4.4.0-18133a2.tgz diff --git a/php-netresearch-jsonmapper.spec b/php-netresearch-jsonmapper.spec index 2c048a4..4774ac0 100644 --- a/php-netresearch-jsonmapper.spec +++ b/php-netresearch-jsonmapper.spec @@ -1,12 +1,12 @@ # remirepo/fedora spec file for php-netresearch-jsonmapper # -# Copyright (c) 2017-2023 Remi Collet +# Copyright (c) 2017-2024 Remi Collet # License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # -%global gh_commit f60565f8c0566a31acf06884cdaa591867ecc956 +%global gh_commit 18133a2d8c24e10e58e02b700308ed3a4a60c97f %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner cweiske %global gh_project jsonmapper @@ -18,8 +18,8 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{pk_vendor}-%{pk_project} -Version: 4.2.0 -Release: 4%{?dist} +Version: 4.4.0 +Release: 1%{?dist} Summary: Map nested JSON structures onto PHP classes License: OSL-3.0 @@ -32,15 +32,16 @@ BuildArch: noarch %if %{with_tests} # For tests BuildRequires: php(language) >= 7.1 -BuildRequires: php-spl +BuildRequires: php-date BuildRequires: php-json BuildRequires: php-pcre BuildRequires: php-reflection +BuildRequires: php-spl # From composer.json, "require-dev": { -# "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0", +# "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0 || ~10.0", # "squizlabs/php_codesniffer": "~3.5" -%global phpunit %{_bindir}/phpunit9 -BuildRequires: phpunit9 +%global phpunit %{_bindir}/phpunit10 +BuildRequires: phpunit10 # Required by autoloader BuildRequires: php-fedora-autoloader-devel %endif @@ -56,7 +57,7 @@ Requires: php-spl Requires: php-json Requires: php-pcre Requires: php-reflection -# From phpcompatinfo report for version 1.6.0 +# From phpcompatinfo report for version 4.4.0 # none # Required by autoloader Requires: php-composer(fedora/autoloader) @@ -103,13 +104,13 @@ mkdir vendor : Run upstream test suite ret=0 -for cmd in "php %{phpunit}" php80 php81 php82; do +for cmd in "php %{phpunit}" php81 php82 php83; do if which $cmd; then set $cmd - $1 ${2:-%{_bindir}/phpunit9} \ + $1 ${2:-%{_bindir}/phpunit10} \ --bootstrap %{buildroot}%{php_home}/%{pk_vendor}/%{pk_project}/autoload.php \ --no-coverage \ - --verbose . || ret=1 + . || ret=1 fi done exit $ret @@ -128,6 +129,9 @@ exit $ret %changelog +* Mon Jan 29 2024 Remi Collet - 4.4.0-1 +- update to 4.4.0 + * Thu Jan 25 2024 Fedora Release Engineering - 4.2.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index fb851a1..613988a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-netresearch-jsonmapper-4.2.0-f60565f.tgz) = cf06f1fe3d95ae9b95d8852900ced9d359d520fc565f0c2c52425f008ef4e4d0646959cdfd3540fc806420b292ab6cd46fccef560772d774630ea241d1b6d27a +SHA512 (php-netresearch-jsonmapper-4.4.0-18133a2.tgz) = 1f0af1cbb73fc25b773c80a5c5aba6c648a87ae8e8bd2a7dcba36695c9363fca4df9783978cd0bb2481416cbe36c72b95c1f1eae326c89d69ed6471cb2626eb3 From 80d343cab0f03a01d86deac8ebd7a9853776c170 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 31 Jan 2024 09:27:21 +0100 Subject: [PATCH 13/17] v4.4.1 --- .gitignore | 1 + php-netresearch-jsonmapper.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b2eedfc..7dbfc4a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ clog /php-netresearch-jsonmapper-4.1.0-cfa81ea.tgz /php-netresearch-jsonmapper-4.2.0-f60565f.tgz /php-netresearch-jsonmapper-4.4.0-18133a2.tgz +/php-netresearch-jsonmapper-4.4.1-132c75c.tgz diff --git a/php-netresearch-jsonmapper.spec b/php-netresearch-jsonmapper.spec index 4774ac0..54216ed 100644 --- a/php-netresearch-jsonmapper.spec +++ b/php-netresearch-jsonmapper.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 18133a2d8c24e10e58e02b700308ed3a4a60c97f +%global gh_commit 132c75c7dd83e45353ebb9c6c9f591952995bbf0 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner cweiske %global gh_project jsonmapper @@ -18,7 +18,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{pk_vendor}-%{pk_project} -Version: 4.4.0 +Version: 4.4.1 Release: 1%{?dist} Summary: Map nested JSON structures onto PHP classes @@ -129,6 +129,9 @@ exit $ret %changelog +* Wed Jan 31 2024 Remi Collet - 4.4.1-1 +- update to 4.4.1 + * Mon Jan 29 2024 Remi Collet - 4.4.0-1 - update to 4.4.0 diff --git a/sources b/sources index 613988a..3b44f81 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-netresearch-jsonmapper-4.4.0-18133a2.tgz) = 1f0af1cbb73fc25b773c80a5c5aba6c648a87ae8e8bd2a7dcba36695c9363fca4df9783978cd0bb2481416cbe36c72b95c1f1eae326c89d69ed6471cb2626eb3 +SHA512 (php-netresearch-jsonmapper-4.4.1-132c75c.tgz) = 1b2ed985ad4160b28cb963ffa99b7e5a90a438f5baa5dfb3de9807177ff331438d89d0ac4e9007523e17c0c53729b10056394b195b664c9e677618fbd4351596 From e4fa9df8b59151e6ce998f0f9259e964cf66f158 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 07:00:18 +0000 Subject: [PATCH 14/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- php-netresearch-jsonmapper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-netresearch-jsonmapper.spec b/php-netresearch-jsonmapper.spec index 54216ed..fc3375e 100644 --- a/php-netresearch-jsonmapper.spec +++ b/php-netresearch-jsonmapper.spec @@ -19,7 +19,7 @@ Name: php-%{pk_vendor}-%{pk_project} Version: 4.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Map nested JSON structures onto PHP classes License: OSL-3.0 @@ -129,6 +129,9 @@ exit $ret %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 4.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 31 2024 Remi Collet - 4.4.1-1 - update to 4.4.1 From 5dce3c990ea3df134f2525b8ae23117bfb8af991 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 9 Sep 2024 10:58:22 +0200 Subject: [PATCH 15/17] update to 5.0.0 move to /usr/share/php/netresearch/jsonmapper5 --- .gitignore | 1 + php-netresearch-jsonmapper.spec | 34 +++++++++++++++++++++------------ sources | 2 +- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 7dbfc4a..9daf87a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ clog /php-netresearch-jsonmapper-4.2.0-f60565f.tgz /php-netresearch-jsonmapper-4.4.0-18133a2.tgz /php-netresearch-jsonmapper-4.4.1-132c75c.tgz +/php-netresearch-jsonmapper-5.0.0-8c64d8d.tgz diff --git a/php-netresearch-jsonmapper.spec b/php-netresearch-jsonmapper.spec index fc3375e..b85a8d7 100644 --- a/php-netresearch-jsonmapper.spec +++ b/php-netresearch-jsonmapper.spec @@ -6,7 +6,10 @@ # # Please, preserve the changelog entries # -%global gh_commit 132c75c7dd83e45353ebb9c6c9f591952995bbf0 + +%bcond_without tests + +%global gh_commit 8c64d8d444a5d764c641ebe97e0e3bc72b25bf6c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner cweiske %global gh_project jsonmapper @@ -15,12 +18,13 @@ %global pk_project jsonmapper %global php_home %{_datadir}/php -%global with_tests 0%{!?_without_tests:1} + +%global major 5 Name: php-%{pk_vendor}-%{pk_project} -Version: 4.4.1 -Release: 2%{?dist} -Summary: Map nested JSON structures onto PHP classes +Version: 5.0.0 +Release: 1%{?dist} +Summary: Map nested JSON structures onto PHP classes, version %{major} License: OSL-3.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -29,7 +33,7 @@ Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh BuildArch: noarch -%if %{with_tests} +%if %{with tests} # For tests BuildRequires: php(language) >= 7.1 BuildRequires: php-date @@ -95,20 +99,23 @@ phpab --template fedora --output src/autoload.php src %install : Library mkdir -p %{buildroot}%{php_home}/%{pk_vendor} -cp -pr src %{buildroot}%{php_home}/%{pk_vendor}/%{pk_project} +cp -pr src %{buildroot}%{php_home}/%{pk_vendor}/%{pk_project}%{major} %check -%if %{with_tests} +%if %{with tests} mkdir vendor +phpab --template fedora --output vendor/autoload.php tests +cat << 'EOF' | tee -a vendor/autoload.php +require_once "%{buildroot}%{php_home}/%{pk_vendor}/%{pk_project}%{major}/autoload.php"; +EOF : Run upstream test suite ret=0 -for cmd in "php %{phpunit}" php81 php82 php83; do +for cmd in "php %{phpunit}" php81 php82 php83 php84; do if which $cmd; then set $cmd $1 ${2:-%{_bindir}/phpunit10} \ - --bootstrap %{buildroot}%{php_home}/%{pk_vendor}/%{pk_project}/autoload.php \ --no-coverage \ . || ret=1 fi @@ -120,15 +127,18 @@ exit $ret %files -%{!?_licensedir:%global license %%doc} %license LICENSE %doc composer.json %doc ChangeLog README.rst %dir %{php_home}/%{pk_vendor} - %{php_home}/%{pk_vendor}/%{pk_project} + %{php_home}/%{pk_vendor}/%{pk_project}%{major} %changelog +* Mon Sep 9 2024 Remi Collet - 5.0.0-1 +- update to 5.0.0 +- move to /usr/share/php/netresearch/jsonmapper5 + * Fri Jul 19 2024 Fedora Release Engineering - 4.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 3b44f81..d6592c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-netresearch-jsonmapper-4.4.1-132c75c.tgz) = 1b2ed985ad4160b28cb963ffa99b7e5a90a438f5baa5dfb3de9807177ff331438d89d0ac4e9007523e17c0c53729b10056394b195b664c9e677618fbd4351596 +SHA512 (php-netresearch-jsonmapper-5.0.0-8c64d8d.tgz) = 22b4730420fd7a318d5cc9ee19c792966ff18eab117bc3d6cedb967d3c5e647b7436ee33d004b0e37ef439020d1074fffb7976819550ba52fc8c55ad20a07646 From 4fc8439a8a4d0b9f512b917a9ddab267b32e6b1b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 09:11:32 +0000 Subject: [PATCH 16/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- php-netresearch-jsonmapper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-netresearch-jsonmapper.spec b/php-netresearch-jsonmapper.spec index b85a8d7..426d50a 100644 --- a/php-netresearch-jsonmapper.spec +++ b/php-netresearch-jsonmapper.spec @@ -23,7 +23,7 @@ Name: php-%{pk_vendor}-%{pk_project} Version: 5.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Map nested JSON structures onto PHP classes, version %{major} License: OSL-3.0 @@ -135,6 +135,9 @@ exit $ret %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 5.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Sep 9 2024 Remi Collet - 5.0.0-1 - update to 5.0.0 - move to /usr/share/php/netresearch/jsonmapper5 From 4c575fafefd23ce49a2ca0e91ea01b87355d74a6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:15:50 +0000 Subject: [PATCH 17/17] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- php-netresearch-jsonmapper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-netresearch-jsonmapper.spec b/php-netresearch-jsonmapper.spec index 426d50a..e9f7d63 100644 --- a/php-netresearch-jsonmapper.spec +++ b/php-netresearch-jsonmapper.spec @@ -23,7 +23,7 @@ Name: php-%{pk_vendor}-%{pk_project} Version: 5.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Map nested JSON structures onto PHP classes, version %{major} License: OSL-3.0 @@ -135,6 +135,9 @@ exit $ret %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 5.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jan 18 2025 Fedora Release Engineering - 5.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild