diff --git a/.gitignore b/.gitignore index 5727f2e..3b1069b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ /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 +/php-zumba-json-serializer-3.2.2-1b1b230.tgz 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." + diff --git a/php-zumba-json-serializer.spec b/php-zumba-json-serializer.spec index 7d6bbdf..06b47a0 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-2022 Remi Collet -# License: CC-BY-SA -# 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 421dcdd53d4b333303d984e9ebec557d3e37783b +%global gh_commit 1b1b2302d46692f317021ee4b9cc06b1311b7333 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zumba %global gh_project json-serializer @@ -18,41 +18,41 @@ %global major %nil Name: php-%{gh_owner}-%{gh_project}%{major} -Version: 3.0.2 -Release: 2%{?dist} +Version: 3.2.2 +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} -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 <10.0" -BuildRequires: phpunit9 -%global phpunit %{_bindir}/phpunit9 +# "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) @@ -94,13 +94,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}" "php81 %{_bindir}/phpunit10" php82 php83 php84; do if which $cmdarg; then set $cmdarg - $1 ${2:-%{_bindir}/phpunit9} \ + $1 ${2:-%{_bindir}/phpunit11} \ --bootstrap vendor/autoload.php \ - --no-coverage \ - --verbose || ret=1 + --filter '^((?!(testAddSerializer|testGetPreferredSerializer|testSerialize|testUnserialize)).)*$' \ + --no-coverage || ret=1 fi done exit $ret @@ -118,6 +119,38 @@ exit $ret %changelog +* 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 +- switch to phpunit11 + +* 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 + +* 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 + +* 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 + +* 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 + * Fri Jan 20 2023 Fedora Release Engineering - 3.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 03d0509..beca562 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.2-1b1b230.tgz) = 7ae1d8acab55b6232259a2b14445742f1b6cea33ba1d22589bed873573431f3793c5c96595aecfcc0345c50bd59676823696bcfe6347425b81a40de526632319