diff --git a/.gitignore b/.gitignore index 9daf87a..7dbfc4a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,3 @@ clog /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 e9f7d63..50c3e52 100644 --- a/php-netresearch-jsonmapper.spec +++ b/php-netresearch-jsonmapper.spec @@ -6,10 +6,7 @@ # # Please, preserve the changelog entries # - -%bcond_without tests - -%global gh_commit 8c64d8d444a5d764c641ebe97e0e3bc72b25bf6c +%global gh_commit 132c75c7dd83e45353ebb9c6c9f591952995bbf0 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner cweiske %global gh_project jsonmapper @@ -18,13 +15,12 @@ %global pk_project jsonmapper %global php_home %{_datadir}/php - -%global major 5 +%global with_tests 0%{!?_without_tests:1} Name: php-%{pk_vendor}-%{pk_project} -Version: 5.0.0 -Release: 3%{?dist} -Summary: Map nested JSON structures onto PHP classes, version %{major} +Version: 4.4.1 +Release: 1%{?dist} +Summary: Map nested JSON structures onto PHP classes License: OSL-3.0 URL: https://github.com/%{gh_owner}/%{gh_project} @@ -33,7 +29,7 @@ Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh BuildArch: noarch -%if %{with tests} +%if %{with_tests} # For tests BuildRequires: php(language) >= 7.1 BuildRequires: php-date @@ -99,23 +95,20 @@ 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}%{major} +cp -pr src %{buildroot}%{php_home}/%{pk_vendor}/%{pk_project} %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}" php81 php82 php83 php84; do +for cmd in "php %{phpunit}" php81 php82 php83; do if which $cmd; then set $cmd $1 ${2:-%{_bindir}/phpunit10} \ + --bootstrap %{buildroot}%{php_home}/%{pk_vendor}/%{pk_project}/autoload.php \ --no-coverage \ . || ret=1 fi @@ -127,39 +120,21 @@ 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}%{major} + %{php_home}/%{pk_vendor}/%{pk_project} %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 diff --git a/sources b/sources index d6592c6..3b44f81 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-netresearch-jsonmapper-5.0.0-8c64d8d.tgz) = 22b4730420fd7a318d5cc9ee19c792966ff18eab117bc3d6cedb967d3c5e647b7436ee33d004b0e37ef439020d1074fffb7976819550ba52fc8c55ad20a07646 +SHA512 (php-netresearch-jsonmapper-4.4.1-132c75c.tgz) = 1b2ed985ad4160b28cb963ffa99b7e5a90a438f5baa5dfb3de9807177ff331438d89d0ac4e9007523e17c0c53729b10056394b195b664c9e677618fbd4351596