diff --git a/.gitignore b/.gitignore index a3d0383..598382b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,3 @@ /php-doctrine-deprecations-1.1.0-8cffffb.tgz /php-doctrine-deprecations-1.1.1-612a3ee.tgz /php-doctrine-deprecations-1.1.2-4f2d4f2.tgz -/php-doctrine-deprecations-1.1.3-dfbaa3c.tgz -/php-doctrine-deprecations-1.1.4-31610db.tgz -/php-doctrine-deprecations-1.1.5-459c2f5.tgz diff --git a/php-doctrine-deprecations.spec b/php-doctrine-deprecations.spec index 3fb00e3..884435d 100644 --- a/php-doctrine-deprecations.spec +++ b/php-doctrine-deprecations.spec @@ -1,15 +1,15 @@ # remirepo/fedora spec file for php-doctrine-deprecations # -# SPDX-FileCopyrightText: Copyright 2021-2025 Remi Collet -# SPDX-License-Identifier: CECILL-2.1 -# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt +# Copyright (c) 2021-2023 Remi Collet +# License: CC-BY-SA-4.0 +# http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # %bcond_without tests -%global gh_commit 459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38 +%global gh_commit 4f2d4f2836e7ec4e7a8625e75c6aa916004db931 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner doctrine %global gh_project deprecations @@ -21,8 +21,8 @@ %global ns_project Deprecations Name: php-%{pk_vendor}-%{pk_project} -Version: 1.1.5 -Release: 2%{?dist} +Version: 1.1.2 +Release: 1%{?dist} Summary: A small layer on top of triggeFr_error or PSR-3 logging License: MIT @@ -36,14 +36,15 @@ BuildRequires: php-fedora-autoloader-devel %if %{with tests} # From composer.json # "require-dev": { -# "doctrine/coding-standard": "^9 || ^12 || ^13", -# "phpstan/phpstan": "1.4.10 || 2.1.11", -# "phpstan/phpstan-phpunit": "^1.0 || ^2", -# "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6 || ^10.5 || ^11.5 || ^12", -# "psr/log": "^1 || ^2 || ^3" +# "doctrine/coding-standard": "^9", +# "phpstan/phpstan": "1.4.10 || 1.10.15", +# "phpstan/phpstan-phpunit": "^1.0", +# "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", +# "psalm/plugin-phpunit": "0.18.4", +# "psr/log": "^1 || ^2 || ^3", +# "vimeo/psalm": "4.30.0 || 5.12.0" BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 4) -%global phpunit %{_bindir}/phpunit12 -BuildRequires: phpunit12 +BuildRequires: phpunit9 >= 9.5 %endif # From composer.json @@ -87,11 +88,11 @@ Autoloader: %{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php %build : Generate a simple autoloader %{_bindir}/phpab \ - --output src/autoload.php \ + --output lib/%{ns_vendor}/%{ns_project}/autoload.php \ --template fedora \ - src + lib/%{ns_vendor} -cat << 'EOF' | tee -a src/autoload.php +cat << 'EOF' | tee -a lib/%{ns_vendor}/%{ns_project}/autoload.php \Fedora\Autoloader\Dependencies::required([ [ @@ -104,8 +105,8 @@ EOF %install -mkdir -p %{buildroot}%{_datadir}/php/%{ns_vendor} -cp -pr src %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project} +mkdir -p %{buildroot}%{_datadir}/php/%{ns_vendor} +cp -pr lib/%{ns_vendor}/%{ns_project} %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project} %check @@ -125,13 +126,12 @@ cat << 'EOF' | tee -a vendor/autoload.php EOF ret=0 -for cmd in "php %{phpunit}" "php81 %{_bindir}/phpunit10" "php82 %{_bindir}/phpunit11" "php83 %{_bindir}/phpunit12" "php84 %{_bindir}/phpunit12"; do +for cmd in php php80 php81 php82; do if which $cmd; then - set $cmd - $1 -d auto_prepend_file=vendor/autoload.php \ - $2 \ + $cmd -d auto_prepend_file=vendor/autoload.php \ + %{_bindir}/phpunit9 \ --filter '^((?!(testDeprecationTrackByEnv)).)*$' \ - || ret=1 + --verbose || ret=1 fi done @@ -149,39 +149,9 @@ exit $ret %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 1.1.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Apr 8 2025 Remi Collet - 1.1.5-1 -- update to 1.1.5 (no change) -- switch to phpunit12 - -* Sat Jan 18 2025 Fedora Release Engineering - 1.1.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Dec 9 2024 Remi Collet - 1.1.4-1 -- update to 1.1.4 -- re-license spec file to CECILL-2.1 - -* Fri Jul 19 2024 Fedora Release Engineering - 1.1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jan 31 2024 Remi Collet - 1.1.3-1 -- update to 1.1.3 (no change) -- Fix FTBFS #2261475 - -* Thu Jan 25 2024 Fedora Release Engineering - 1.1.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1.1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - * Thu Sep 28 2023 Remi Collet - 1.1.2-1 - update to 1.1.2 -* Fri Jul 21 2023 Fedora Release Engineering - 1.1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - * Mon Jun 5 2023 Remi Collet - 1.1.1-1 - update to 1.1.1 diff --git a/sources b/sources index ee98c82..289d351 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-doctrine-deprecations-1.1.5-459c2f5.tgz) = 22cbc2e1322e7cf08d56ba0bda29032af9c241e94efd9da05bbddd68ca96d12c04c1a1beee101d6e833f81656b09ca57937fa75a00b24985a15a4dbbce914080 +SHA512 (php-doctrine-deprecations-1.1.2-4f2d4f2.tgz) = 297752cf09c246e6209a095e16b0755eb05e0dde418a1322c8fc70926f0685f9b6b5aca882fca7ca2bd6f7cd141475bf1cdd7910778c479bdcc08e6dc566d364