diff --git a/.gitignore b/.gitignore index 95819e1..230b09a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,3 @@ /php-sebastian-diff4-4.0.0-c0c26c9.tar.gz /php-sebastian-diff4-4.0.1-3e523c5.tgz /php-sebastian-diff4-4.0.2-1e90b4c.tgz -/php-sebastian-diff4-4.0.3-ffc949a.tgz -/php-sebastian-diff4-4.0.4-3461e3f.tgz -/php-symfony-process-5.4.22.tar.gz -/php-sebastian-diff4-4.0.5-74be170.tgz -/php-sebastian-diff4-4.0.6-ba01945.tgz diff --git a/php-sebastian-diff4.spec b/php-sebastian-diff4.spec index a80d0bf..368bb86 100644 --- a/php-sebastian-diff4.spec +++ b/php-sebastian-diff4.spec @@ -1,15 +1,13 @@ # remirepo/fedora spec file for php-sebastian-diff4 # -# Copyright (c) 2013-2024 Remi Collet -# License: CC-BY-SA-4.0 +# Copyright (c) 2013-2020 Remi Collet +# License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # - -%bcond_without tests - -%global gh_commit ba01945089c3a293b01ba9badc29ad55b106b0bc +%global bootstrap 0 +%global gh_commit 1e90b4cf905a7d06c420b1d2e9d11a4dc8a13113 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project diff @@ -22,19 +20,21 @@ %global major 4 %global php_home %{_datadir}/php +%if %{bootstrap} +%bcond_with tests +%else +%bcond_without tests +%endif Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 4.0.6 -Release: 4%{?dist} -Summary: Diff implementation, version %{major} +Version: 4.0.2 +Release: 1%{?dist} +Summary: Diff implementation -License: BSD-3-Clause +License: BSD URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh -# php-symfony4 going to disapear, php-symfony5 not available, only used for tests -%global symfony_version 5.4.22 -Source2: https://github.com/symfony/process/archive/v%{symfony_version}/php-symfony-process-%{symfony_version}.tar.gz BuildArch: noarch BuildRequires: php-fedora-autoloader-devel @@ -43,13 +43,14 @@ BuildRequires: php(language) >= 7.3 BuildRequires: php-pcre BuildRequires: php-spl # from composer.json, "require-dev": { -# "phpunit/phpunit": "^9.3", +# "phpunit/phpunit": "^9.0", # "symfony/process": "^4.2 || ^5" -BuildRequires: phpunit9 >= 9.3 +BuildRequires: phpunit9 +BuildRequires: php-symfony4-process %endif # from composer.json -# "php": ">=7.3" +# "php": "^7.3 || ^8.0" Requires: php(language) >= 7.3 # from phpcompatinfo report for version 4.0.0 Requires: php-pcre @@ -63,13 +64,11 @@ Provides: php-composer(%{pk_vendor}/%{pk_project}) = %{version} %description Diff implementation. -This package provides the version %{major} of the library. - Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php %prep -%setup -q -n %{gh_project}-%{gh_commit} -a 2 +%setup -q -n %{gh_project}-%{gh_commit} %build @@ -85,12 +84,20 @@ cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major} %check %if %{with tests} mkdir vendor -%{_bindir}/phpab --output vendor/autoload.php tests process-%{symfony_version} +%{_bindir}/phpab --output vendor/autoload.php tests +cat << 'EOF' | tee -a vendor/autoload.php +\Fedora\Autoloader\Dependencies::required([ + [ + '%{php_home}/Symfony5/Component/Process/autoload.php', + '%{php_home}/Symfony4/Component/Process/autoload.php', + ] +]); +EOF : Run upstream test suite ret=0 -for cmd in php php81 php82 php83; do +for cmd in php php73 php74 php80; do if which $cmd; then $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ %{_bindir}/phpunit9 --verbose || ret=1 @@ -111,58 +118,6 @@ exit $ret %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 4.0.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 18 2025 Fedora Release Engineering - 4.0.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 19 2024 Fedora Release Engineering - 4.0.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Mar 5 2024 Remi Collet - 4.0.6-1 -- update to 4.0.6 - -* Thu Jan 25 2024 Fedora Release Engineering - 4.0.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 4.0.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jul 21 2023 Fedora Release Engineering - 4.0.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue May 9 2023 Remi Collet - 4.0.5-1 -- update to 4.0.5 - -* Fri Apr 21 2023 Remi Collet - 4.0.4-7 -- use SPDX license ID -- use bundled symfony/process for test - -* Fri Jan 20 2023 Fedora Release Engineering - 4.0.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 4.0.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 21 2022 Fedora Release Engineering - 4.0.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 4.0.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 4.0.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Oct 26 2020 Remi Collet - 4.0.4-1 -- update to 4.0.4 - -* Mon Sep 28 2020 Remi Collet - 4.0.3-1 -- update to 4.0.3 (no change) - -* Tue Jul 28 2020 Fedora Release Engineering - 4.0.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - * Tue Jun 30 2020 Remi Collet - 4.0.2-1 - update to 4.0.2 diff --git a/sources b/sources index bf715c1..d00483b 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (php-sebastian-diff4-4.0.6-ba01945.tgz) = f4d0366970ccfcfa8adb96886dd590353475bd67c3b5a89dd20caff4345f7f999ca1b2835445210ebf4dac9c991774ffafee26bc183cfc8ba9f8760b3061f62c -SHA512 (php-symfony-process-5.4.22.tar.gz) = 723e2f144acd2845734b2b5308b55768b4644eafb01668c03c16e10ddf8857430d8b8863d79d4a1ae98461ad08ee4b05561aa12e5984265c58869b97e8232039 +SHA512 (php-sebastian-diff4-4.0.2-1e90b4c.tgz) = 933f2a1a058860294f7b0d18921722871c401bc98591b87a6dd41c95ee99fa520d5025b67833ebe793bfc9219665a9877bbd0b388de90fa33ed0aec7702b21d8