diff --git a/.gitignore b/.gitignore index efec102..46d3283 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,16 @@ /php-swaggest-json-diff-3.7.2-fb13f6f.tgz /php-swaggest-json-diff-3.7.4-fccbbd6.tgz /php-swaggest-json-diff-3.7.5-e452a9c.tgz +/php-swaggest-json-diff-3.8.0-3210781.tgz +/php-swaggest-json-diff-3.8.1-d218435.tgz +/php-swaggest-json-diff-3.8.2-d223be0.tgz +/php-swaggest-json-diff-3.8.3-bb3e3b4.tgz +/php-swaggest-json-diff-3.9.0-ff3a792.tgz +/php-swaggest-json-diff-3.10.0-807bf7d.tgz +/php-swaggest-json-diff-3.10.1-b9da3c5.tgz +/php-swaggest-json-diff-3.10.3-02df617.tgz +/php-swaggest-json-diff-3.10.4-f4e5117.tgz +/php-swaggest-json-diff-3.10.5-17bfc66.tgz +/php-swaggest-json-diff-3.11.0-c55d38a.tgz +/php-swaggest-json-diff-3.12.0-d17d237.tgz +/php-swaggest-json-diff-3.12.1-7ebc4ea.tgz diff --git a/php-swaggest-json-diff.spec b/php-swaggest-json-diff.spec index 1cef471..1a9f32f 100644 --- a/php-swaggest-json-diff.spec +++ b/php-swaggest-json-diff.spec @@ -1,15 +1,16 @@ # remirepo/fedora spec file for php-swaggest-json-diff # -# Copyright (c) 2019 Remi Collet -# License: CC-BY-SA -# http://creativecommons.org/licenses/by-sa/4.0/ +# SPDX-FileCopyrightText: Copyright 2019-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 with_tests 0%{!?_without_tests:1} +%bcond_without tests + # Github -%global gh_commit e452a9c6444905a486280c7d56503a6468303f69 +%global gh_commit 7ebc4eab95bcc73916433964c266588d09b35052 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner swaggest %global gh_project json-diff @@ -22,8 +23,8 @@ %global major %nil Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 3.7.5 -Release: 1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} +Version: 3.12.1 +Release: 2%{?gh_date?%{gh_date}git%{gh_short}}%{?dist} Summary: JSON diff/rearrange/patch/pointer library for PHP License: MIT @@ -32,24 +33,24 @@ Source0: %{name}-%{version}-%{?gh_short}.tgz Source1: makesrc.sh BuildArch: noarch -%if %{with_tests} +%if %{with tests} +BuildRequires: php(language) >= 7.1 BuildRequires: php-json # For tests, from composer.json "require-dev": { -# "phpunit/phpunit": "^4.8.23" -BuildRequires: php-composer(phpunit/phpunit) >= 4.8.23 -%global phpunit %{_bindir}/phpunit -BuildRequires: php-filter -BuildRequires: php-pcre +# "phpunit/phpunit": "4.8.37" +BuildRequires: phpunit9 +%global phpunit %{_bindir}/phpunit9 # For autoloader BuildRequires: php-fedora-autoloader-devel %endif # From composer.json, "require": { -# "ext-json": "*" +# "ext-json": "*", +# "php": ">=7.1" +Requires: php(language) >= 7.1 Requires: php-json -# From phpcompatinfo report for 3.7.0 -Requires: php-filter -Requires: php-pcre +# From phpcompatinfo report for 3.12.1 +# only filter, json and pcre # For generated autoloader Requires: php-composer(fedora/autoloader) @@ -79,18 +80,25 @@ cp -pr src %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major} %check -%if %{with_tests} +%if %{with tests} mkdir vendor cat << 'EOF' | tee vendor/autoload.php expectException($e); + $this->expectExceptionMessage($m); + } +} EOF ret=0 -for cmd in php php71 php72 php73 php74 php80; do +for cmd in php php81 php82 php83 php84; do if which $cmd; then - $cmd %{phpunit} --no-coverage --verbose || ret=1 + $cmd %{phpunit} --no-coverage || ret=1 fi done exit $ret @@ -109,6 +117,85 @@ exit $ret %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Mon Mar 10 2025 Remi Collet - 3.12.1-1 +- update to 3.12.1 + +* Tue Mar 4 2025 Remi Collet - 3.12.0-1 +- update to 3.12.0 +- re-license spec file to CECILL-2.1 + +* Sat Jan 18 2025 Fedora Release Engineering - 3.11.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Jul 19 2024 Fedora Release Engineering - 3.11.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jul 3 2024 Remi Collet - 3.11.0-1 +- update to 3.11.0 + +* Thu Jan 25 2024 Fedora Release Engineering - 3.10.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 3.10.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Nov 17 2023 Remi Collet - 3.10.5-1 +- update to 3.10.5 + +* Fri Oct 6 2023 Remi Collet - 3.10.4-4 +- switch to phpunit9 + +* Fri Jul 21 2023 Fedora Release Engineering - 3.10.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jan 20 2023 Fedora Release Engineering - 3.10.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Nov 10 2022 Remi Collet - 3.10.4-1 +- update to 3.10.4 + +* Tue Nov 8 2022 Remi Collet - 3.10.3-1 +- update to 3.10.3 + +* Tue Oct 25 2022 Remi Collet - 3.10.1-1 +- update to 3.10.1 + +* Fri Oct 21 2022 Remi Collet - 3.10.0-1 +- update to 3.10.0 + +* Mon Sep 12 2022 Remi Collet - 3.9.0-1 +- update to 3.9.0 + +* Fri Jul 22 2022 Fedora Release Engineering - 3.8.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jan 21 2022 Fedora Release Engineering - 3.8.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Sep 27 2021 Remi Collet - 3.8.3-1 +- update to 3.8.3 + +* Wed Sep 22 2021 Remi Collet - 3.8.2-1 +- update to 3.8.2 + +* Fri Jul 23 2021 Fedora Release Engineering - 3.8.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 3.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Sep 28 2020 Remi Collet - 3.8.1-1 +- update to 3.8.1 + +* Fri Sep 25 2020 Remi Collet - 3.8.0-1 +- update to 3.8.0 + +* Tue Jul 28 2020 Fedora Release Engineering - 3.7.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed May 27 2020 Remi Collet - 3.7.5-1 - update to 3.7.5 diff --git a/sources b/sources index a93d017..23f3aec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-swaggest-json-diff-3.7.5-e452a9c.tgz) = 97daecbb123a6fc0898ef5f68e4c7c88c11177bb34c38a5be608c5cf9ae743ea8d66ec60a2c842594adc41547ada8e56dd30a2f12a265e798fa64f0f791725e3 +SHA512 (php-swaggest-json-diff-3.12.1-7ebc4ea.tgz) = ae848bb3683898dddee0212cbf74bafdaf4558913ba8be97ccff5773e5de98e4102bedeb4bfc479b9c6b94ba9d4df99ffa2f9ff7fd13fb7fd773fc30887a2c94