diff --git a/.gitignore b/.gitignore index 3fbcd05..7dbfc4a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ 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 +/php-netresearch-jsonmapper-4.4.1-132c75c.tgz diff --git a/php-netresearch-jsonmapper.spec b/php-netresearch-jsonmapper.spec index 5bb010a..50c3e52 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 132c75c7dd83e45353ebb9c6c9f591952995bbf0 %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: 2%{?dist} +Version: 4.4.1 +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,12 @@ 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 + * Fri Jul 21 2023 Fedora Release Engineering - 4.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index fb851a1..3b44f81 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-netresearch-jsonmapper-4.2.0-f60565f.tgz) = cf06f1fe3d95ae9b95d8852900ced9d359d520fc565f0c2c52425f008ef4e4d0646959cdfd3540fc806420b292ab6cd46fccef560772d774630ea241d1b6d27a +SHA512 (php-netresearch-jsonmapper-4.4.1-132c75c.tgz) = 1b2ed985ad4160b28cb963ffa99b7e5a90a438f5baa5dfb3de9807177ff331438d89d0ac4e9007523e17c0c53729b10056394b195b664c9e677618fbd4351596