From af3925795298a806fa02101767bfefa161f003fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 05:27:36 +0000 Subject: [PATCH 01/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-zumba-json-serializer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-zumba-json-serializer.spec b/php-zumba-json-serializer.spec index 7d6bbdf..31ab8a7 100644 --- a/php-zumba-json-serializer.spec +++ b/php-zumba-json-serializer.spec @@ -19,7 +19,7 @@ Name: php-%{gh_owner}-%{gh_project}%{major} Version: 3.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Serialize PHP variables License: MIT @@ -118,6 +118,9 @@ exit $ret %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 3.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jan 20 2023 Fedora Release Engineering - 3.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 6c05acf1cae7566b20124ec20e4f3d7586f3afba Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 26 Sep 2023 08:00:39 +0200 Subject: [PATCH 02/11] update to 3.2.0 sources from git snapshot switch to phpunit10 --- .gitignore | 1 + php-zumba-json-serializer.spec | 31 +++++++++++++++++++------------ sources | 2 +- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 5727f2e..ac35c43 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /php-zumba-json-serializer-3.0.1-d91d5a2.tar.gz /php-zumba-json-serializer-3.0.2-421dcdd.tar.gz +/php-zumba-json-serializer-3.2.0-9378616.tgz diff --git a/php-zumba-json-serializer.spec b/php-zumba-json-serializer.spec index 31ab8a7..cb21dbc 100644 --- a/php-zumba-json-serializer.spec +++ b/php-zumba-json-serializer.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-zumba-json-serializer # -# Copyright (c) 2021-2022 Remi Collet +# Copyright (c) 2021-2023 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -9,7 +9,7 @@ %bcond_without tests -%global gh_commit 421dcdd53d4b333303d984e9ebec557d3e37783b +%global gh_commit 93786164efd20b6e01d42b03d4f7c2e52c9cebd8 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zumba %global gh_project json-serializer @@ -18,13 +18,14 @@ %global major %nil Name: php-%{gh_owner}-%{gh_project}%{major} -Version: 3.0.2 -Release: 3%{?dist} +Version: 3.2.0 +Release: 1%{?dist} Summary: Serialize PHP variables License: MIT URL: https://github.com/%{gh_owner}/%{gh_project} -Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{?gh_short}.tar.gz +Source0: %{name}-%{version}-%{?gh_short}.tgz +Source1: makesrc.sh BuildArch: noarch %if %{with tests} @@ -36,9 +37,9 @@ BuildRequires: php-pcre BuildRequires: php-reflection BuildRequires: php-spl # For tests, from composer.json "require-dev": { -# "phpunit/phpunit": ">=6.0 <10.0" -BuildRequires: phpunit9 -%global phpunit %{_bindir}/phpunit9 +# "phpunit/phpunit": ">=6.0 <11.0" +BuildRequires: phpunit10 +%global phpunit %{_bindir}/phpunit10 %endif # For autoloader BuildRequires: php-fedora-autoloader-devel @@ -94,13 +95,14 @@ require '%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload EOF ret=0 -for cmdarg in "php %{phpunit}" php80 php81 php82; do +# ignore testS relying on SuperClosure (deprecated and removed from repo) +for cmdarg in "php %{phpunit}" "php80 %{_bindir}/phpunit9" php81 php82 php83; do if which $cmdarg; then set $cmdarg - $1 ${2:-%{_bindir}/phpunit9} \ + $1 ${2:-%{_bindir}/phpunit10} \ --bootstrap vendor/autoload.php \ - --no-coverage \ - --verbose || ret=1 + --filter '^((?!(testAddSerializer|testGetPreferredSerializer|testSerialize|testUnserialize)).)*$' \ + --no-coverage || ret=1 fi done exit $ret @@ -118,6 +120,11 @@ exit $ret %changelog +* Tue Sep 26 2023 Remi Collet - 3.2.0-1 +- update to 3.2.0 +- sources from git snapshot +- switch to phpunit10 + * Fri Jul 21 2023 Fedora Release Engineering - 3.0.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 03d0509..c33645c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-zumba-json-serializer-3.0.2-421dcdd.tar.gz) = a22a70f104ce6a37b639950364e27d09efc31ab7c1ad6505b6fb993ead7ae22ea75dfd2542178a39f6543b38bc41d3c5f6eba7967d12a6e24c755bb8ed02cf9b +SHA512 (php-zumba-json-serializer-3.2.0-9378616.tgz) = 3d5aa9615ebbdb7771d87bfb8b1d3869858d75b1b680645774beba20af78141c1008cb48b72a236810ce37364661f89c4a48b963b3f696b201a60a4a06d7b14f From de2ae62c0e864ca937b3a8a6d66530a83d0671ba Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 26 Sep 2023 08:12:44 +0200 Subject: [PATCH 03/11] missing source --- makesrc.sh | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100755 makesrc.sh diff --git a/makesrc.sh b/makesrc.sh new file mode 100755 index 0000000..9f0c708 --- /dev/null +++ b/makesrc.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +NAME=$(basename $PWD) +OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) +PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) +VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec) +COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) +SHORT=${COMMIT:0:7} + +if [ -f $NAME-$VERSION-$SHORT.tgz ]; then + echo "skip $NAME-$VERSION-$SHORT.tgz already here" +else + echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION, Commit=$COMMIT\n" + + echo "Cloning..." + git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT + + echo "Getting commit..." + pushd $PROJECT-$COMMIT + git checkout $COMMIT || exit 1 + cp composer.json ../composer.json + popd + + echo "Archiving..." + tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs $PROJECT-$COMMIT + + echo "Cleaning..." + rm -rf $PROJECT-$COMMIT +fi + +echo "Done." + From f2677171d74c05368055c8e3bc20408da95e7a4b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 19 Oct 2023 10:16:29 +0200 Subject: [PATCH 04/11] v3.2.1 --- .gitignore | 1 + php-zumba-json-serializer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ac35c43..3d17bcd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /php-zumba-json-serializer-3.0.1-d91d5a2.tar.gz /php-zumba-json-serializer-3.0.2-421dcdd.tar.gz /php-zumba-json-serializer-3.2.0-9378616.tgz +/php-zumba-json-serializer-3.2.1-c869bcb.tgz diff --git a/php-zumba-json-serializer.spec b/php-zumba-json-serializer.spec index cb21dbc..75f4077 100644 --- a/php-zumba-json-serializer.spec +++ b/php-zumba-json-serializer.spec @@ -1,7 +1,7 @@ # remirepo/fedora spec file for php-zumba-json-serializer # # Copyright (c) 2021-2023 Remi Collet -# License: CC-BY-SA +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries @@ -9,7 +9,7 @@ %bcond_without tests -%global gh_commit 93786164efd20b6e01d42b03d4f7c2e52c9cebd8 +%global gh_commit c869bcb7f934f785d69c978f7d0479b54bbe0cfa %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zumba %global gh_project json-serializer @@ -18,7 +18,7 @@ %global major %nil Name: php-%{gh_owner}-%{gh_project}%{major} -Version: 3.2.0 +Version: 3.2.1 Release: 1%{?dist} Summary: Serialize PHP variables @@ -120,6 +120,9 @@ exit $ret %changelog +* Thu Oct 19 2023 Remi Collet - 3.2.1-1 +- update to 3.2.1 + * Tue Sep 26 2023 Remi Collet - 3.2.0-1 - update to 3.2.0 - sources from git snapshot diff --git a/sources b/sources index c33645c..cd20a71 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-zumba-json-serializer-3.2.0-9378616.tgz) = 3d5aa9615ebbdb7771d87bfb8b1d3869858d75b1b680645774beba20af78141c1008cb48b72a236810ce37364661f89c4a48b963b3f696b201a60a4a06d7b14f +SHA512 (php-zumba-json-serializer-3.2.1-c869bcb.tgz) = 1c7a4bb21203b65fd51f7024b0458efe95930fc32e44722ef4d85eda20e664e8f1c641057429eadad1d94cbccd91185b93efa07414b16b401ebe4c79f76cdb85 From 87caf8fc037db12403783a8f2f1e50f877df497b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 21:38:49 +0000 Subject: [PATCH 05/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-zumba-json-serializer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-zumba-json-serializer.spec b/php-zumba-json-serializer.spec index 75f4077..4a8422f 100644 --- a/php-zumba-json-serializer.spec +++ b/php-zumba-json-serializer.spec @@ -19,7 +19,7 @@ Name: php-%{gh_owner}-%{gh_project}%{major} Version: 3.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Serialize PHP variables License: MIT @@ -120,6 +120,9 @@ exit $ret %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 3.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Oct 19 2023 Remi Collet - 3.2.1-1 - update to 3.2.1 From 71f4ee1d2f1f96ea2a7318087f580c1ee11772d8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 23:26:23 +0000 Subject: [PATCH 06/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-zumba-json-serializer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-zumba-json-serializer.spec b/php-zumba-json-serializer.spec index 4a8422f..867f1bd 100644 --- a/php-zumba-json-serializer.spec +++ b/php-zumba-json-serializer.spec @@ -19,7 +19,7 @@ Name: php-%{gh_owner}-%{gh_project}%{major} Version: 3.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Serialize PHP variables License: MIT @@ -120,6 +120,9 @@ exit $ret %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 3.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 3.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 306c4116d128a835abeed8faefb59890dd86d60c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 07:42:22 +0000 Subject: [PATCH 07/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- php-zumba-json-serializer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-zumba-json-serializer.spec b/php-zumba-json-serializer.spec index 867f1bd..7a5127d 100644 --- a/php-zumba-json-serializer.spec +++ b/php-zumba-json-serializer.spec @@ -19,7 +19,7 @@ Name: php-%{gh_owner}-%{gh_project}%{major} Version: 3.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Serialize PHP variables License: MIT @@ -120,6 +120,9 @@ exit $ret %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 3.2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 3.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a0d72d81a7e6108938a7bed6c3df46f5cf8433d4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 10:00:42 +0000 Subject: [PATCH 08/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- php-zumba-json-serializer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-zumba-json-serializer.spec b/php-zumba-json-serializer.spec index 7a5127d..f06382d 100644 --- a/php-zumba-json-serializer.spec +++ b/php-zumba-json-serializer.spec @@ -19,7 +19,7 @@ Name: php-%{gh_owner}-%{gh_project}%{major} Version: 3.2.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Serialize PHP variables License: MIT @@ -120,6 +120,9 @@ exit $ret %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 3.2.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 19 2024 Fedora Release Engineering - 3.2.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b16777bac8e8860ba1f228af5c2679c127196ce0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:42:09 +0000 Subject: [PATCH 09/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- php-zumba-json-serializer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-zumba-json-serializer.spec b/php-zumba-json-serializer.spec index f06382d..1c275ee 100644 --- a/php-zumba-json-serializer.spec +++ b/php-zumba-json-serializer.spec @@ -19,7 +19,7 @@ Name: php-%{gh_owner}-%{gh_project}%{major} Version: 3.2.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Serialize PHP variables License: MIT @@ -120,6 +120,9 @@ exit $ret %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.2.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Jan 18 2025 Fedora Release Engineering - 3.2.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 4d031c9a654ed24bc3f45ce77b515486884471d5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 12 Dec 2025 10:54:12 +0100 Subject: [PATCH 10/11] update to 3.2.2 re-license spec file to CECILL-2.1 raise dependency on php 7.2 switch to phpunit11 --- php-zumba-json-serializer.spec | 45 +++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/php-zumba-json-serializer.spec b/php-zumba-json-serializer.spec index 1c275ee..e9d02c6 100644 --- a/php-zumba-json-serializer.spec +++ b/php-zumba-json-serializer.spec @@ -1,15 +1,15 @@ # remirepo/fedora spec file for php-zumba-json-serializer # -# Copyright (c) 2021-2023 Remi Collet -# License: CC-BY-SA-4.0 -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2021-2025 Remi Collet +# SPDX-License-Identifier: CECILL-2.1 +# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt # # Please, preserve the changelog entries # %bcond_without tests -%global gh_commit c869bcb7f934f785d69c978f7d0479b54bbe0cfa +%global gh_commit 1b1b2302d46692f317021ee4b9cc06b1311b7333 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zumba %global gh_project json-serializer @@ -18,8 +18,8 @@ %global major %nil Name: php-%{gh_owner}-%{gh_project}%{major} -Version: 3.2.1 -Release: 6%{?dist} +Version: 3.2.2 +Release: 1%{?dist} Summary: Serialize PHP variables License: MIT @@ -29,31 +29,30 @@ Source1: makesrc.sh BuildArch: noarch %if %{with tests} -BuildRequires: php(language) >= 7.0 -BuildRequires: php-date +# as we use phpunit10 by default +BuildRequires: php(language) >= 8.1 BuildRequires: php-json BuildRequires: php-mbstring -BuildRequires: php-pcre -BuildRequires: php-reflection -BuildRequires: php-spl # For tests, from composer.json "require-dev": { -# "phpunit/phpunit": ">=6.0 <11.0" +# "phpunit/phpunit": ">=8.0 <12.0" +%if 0%{?fedora} >= 40 || 0%{?rhel} >= 10 +BuildRequires: phpunit11 +%global phpunit %{_bindir}/phpunit11 +%else BuildRequires: phpunit10 %global phpunit %{_bindir}/phpunit10 %endif +%endif # For autoloader BuildRequires: php-fedora-autoloader-devel # From composer.json, "require": { -# "php": "^7.0 || ^8.0", +# "php": "^7.2 || ^8.0", # "ext-mbstring": "*" -Requires: php(language) >= 7.0 +Requires: php(language) >= 7.2 Requires: php-mbstring # From phpcompatinfo report for 3.0.1 Requires: php-json -Requires: php-pcre -Requires: php-reflection -Requires: php-spl # For generated autoloader Requires: php-composer(fedora/autoloader) @@ -95,11 +94,11 @@ require '%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload EOF ret=0 -# ignore testS relying on SuperClosure (deprecated and removed from repo) -for cmdarg in "php %{phpunit}" "php80 %{_bindir}/phpunit9" php81 php82 php83; do +# ignore tests relying on SuperClosure (deprecated and removed from repo) +for cmdarg in "php %{phpunit}" "php81 %{_bindir}/phpunit10" php82 php83 php84; do if which $cmdarg; then set $cmdarg - $1 ${2:-%{_bindir}/phpunit10} \ + $1 ${2:-%{_bindir}/phpunit11} \ --bootstrap vendor/autoload.php \ --filter '^((?!(testAddSerializer|testGetPreferredSerializer|testSerialize|testUnserialize)).)*$' \ --no-coverage || ret=1 @@ -120,6 +119,12 @@ exit $ret %changelog +* Wed Dec 11 2024 Remi Collet - 3.2.2-1 +- update to 3.2.2 +- re-license spec file to CECILL-2.1 +- raise dependency on php 7.2 +- switch to phpunit11 + * Fri Jul 25 2025 Fedora Release Engineering - 3.2.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 3d6588531149156c7c52453179e69d6f38678458 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 12 Dec 2025 11:06:28 +0100 Subject: [PATCH 11/11] sources + date in changelog --- .gitignore | 1 + php-zumba-json-serializer.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3d17bcd..3b1069b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /php-zumba-json-serializer-3.0.2-421dcdd.tar.gz /php-zumba-json-serializer-3.2.0-9378616.tgz /php-zumba-json-serializer-3.2.1-c869bcb.tgz +/php-zumba-json-serializer-3.2.2-1b1b230.tgz diff --git a/php-zumba-json-serializer.spec b/php-zumba-json-serializer.spec index e9d02c6..06b47a0 100644 --- a/php-zumba-json-serializer.spec +++ b/php-zumba-json-serializer.spec @@ -119,7 +119,7 @@ exit $ret %changelog -* Wed Dec 11 2024 Remi Collet - 3.2.2-1 +* Fri Dec 12 2025 Remi Collet - 3.2.2-1 - update to 3.2.2 - re-license spec file to CECILL-2.1 - raise dependency on php 7.2 diff --git a/sources b/sources index cd20a71..beca562 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-zumba-json-serializer-3.2.1-c869bcb.tgz) = 1c7a4bb21203b65fd51f7024b0458efe95930fc32e44722ef4d85eda20e664e8f1c641057429eadad1d94cbccd91185b93efa07414b16b401ebe4c79f76cdb85 +SHA512 (php-zumba-json-serializer-3.2.2-1b1b230.tgz) = 7ae1d8acab55b6232259a2b14445742f1b6cea33ba1d22589bed873573431f3793c5c96595aecfcc0345c50bd59676823696bcfe6347425b81a40de526632319