diff --git a/.gitignore b/.gitignore index 1d8e89c..9daf87a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,8 @@ -/php-netresearch-jsonmapper-1.4.0-3868fe1.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 +/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 f90701d..e9f7d63 100644 --- a/php-netresearch-jsonmapper.spec +++ b/php-netresearch-jsonmapper.spec @@ -1,12 +1,15 @@ # remirepo/fedora spec file for php-netresearch-jsonmapper # -# Copyright (c) 2017-2018 Remi Collet -# License: CC-BY-SA +# 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 3868fe1128ce1169228acdb623359dca74db5ef3 + +%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,45 +18,51 @@ %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: 1.4.0 -Release: 1%{?dist} -Summary: Map nested JSON structures onto PHP classes +Version: 5.0.0 +Release: 3%{?dist} +Summary: Map nested JSON structures onto PHP classes, version %{major} -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 Source1: makesrc.sh BuildArch: noarch -%if %{with_tests} +%if %{with tests} # For tests -BuildRequires: php(language) >= 5.6 +BuildRequires: php(language) >= 7.1 +BuildRequires: php-date +BuildRequires: php-json BuildRequires: php-pcre +BuildRequires: php-reflection BuildRequires: php-spl # From composer.json, "require-dev": { -# "phpunit/phpunit": "~4.8.35 || ~5.7 || ~6.4", -# "squizlabs/php_codesniffer": "~1.5" -%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 -%global phpunit %{_bindir}/phpunit6 -BuildRequires: phpunit6 >= 6.4 -%else -%global phpunit %{_bindir}/phpunit -BuildRequires: php-phpunit-PHPUnit >= 4.8.35 -%endif +# "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0 || ~10.0", +# "squizlabs/php_codesniffer": "~3.5" +%global phpunit %{_bindir}/phpunit10 +BuildRequires: phpunit10 # Required by autoloader BuildRequires: php-fedora-autoloader-devel %endif # From composer.json, "require": { -# "php": ">=5.6" -Requires: php(language) >= 5.6 -# From phpcompatinfo report for version 1.3.0 -Requires: php-pcre +# "php": ">=7.1", +# "ext-spl": "*", +# "ext-json": "*", +# "ext-pcre": "*", +# "ext-reflection": "*" +Requires: php(language) >= 7.1 Requires: php-spl +Requires: php-json +Requires: php-pcre +Requires: php-reflection +# From phpcompatinfo report for version 4.4.0 +# none # Required by autoloader Requires: php-composer(fedora/autoloader) @@ -90,22 +99,25 @@ 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}" php70 php71 php72 php73; do +for cmd in "php %{phpunit}" php81 php82 php83 php84; do if which $cmd; then set $cmd - $1 ${2:-%{_bindir}/phpunit6} \ - --bootstrap %{buildroot}%{php_home}/%{pk_vendor}/%{pk_project}/autoload.php \ + $1 ${2:-%{_bindir}/phpunit10} \ --no-coverage \ - --verbose . || ret=1 + . || ret=1 fi done exit $ret @@ -115,15 +127,106 @@ 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 +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 +- switch to phpunit9 + +* 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 + +* Mon Aug 17 2020 Remi Collet - 3.1.0-1 +- update to 3.1.0 + +* Tue Aug 11 2020 Remi Collet - 3.0.0-1 +- update to 3.0.0 + +* Tue Jul 28 2020 Fedora Release Engineering - 2.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Apr 17 2020 Remi Collet - 2.1.0-1 +- update to 2.1.0 + +* Sat Mar 14 2020 Remi Collet - 2.0.0-1 +- update to 2.0.0 +- switch to phpunit7 + +* Thu Jan 30 2020 Fedora Release Engineering - 1.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Aug 19 2019 Remi Collet - 1.6.0-1 +- update to 1.6.0 +- drop patch merged upstream + +* Fri Jul 26 2019 Fedora Release Engineering - 1.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Jul 9 2019 Remi Collet - 1.5.1-1 +- update to 1.5.1 + +* Mon Jul 8 2019 Remi Collet - 1.5.0-1 +- update to 1.5.0 + +* Sat Feb 02 2019 Fedora Release Engineering - 1.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Jan 22 2018 Remi Collet - 1.4.0-1 - Update to 1.4.0 - use phpunit6 on F26+ diff --git a/sources b/sources index 4675eb1..d6592c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-netresearch-jsonmapper-1.4.0-3868fe1.tgz) = ac35b409c902206f05a3817d70fafc93e88d180f255beaed493bfc434552f1148257be521a8510caf90ed6d370bbc5eed928a4be934caa4f0d4e0c184f89fe6e +SHA512 (php-netresearch-jsonmapper-5.0.0-8c64d8d.tgz) = 22b4730420fd7a318d5cc9ee19c792966ff18eab117bc3d6cedb967d3c5e647b7436ee33d004b0e37ef439020d1074fffb7976819550ba52fc8c55ad20a07646