v4.0.4

(cherry picked from commit 11fd848a04)

.gitignore

@@ -3,6 +3,3 @@
 /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

php-sebastian-diff4.spec

@@ -1,7 +1,7 @@
 # remirepo/fedora spec file for php-sebastian-diff4
 #
-# Copyright (c) 2013-2024 Remi Collet
+# Copyright (c) 2013-2020 Remi Collet
-# License: CC-BY-SA-4.0
+# License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
@@ -9,7 +9,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    ba01945089c3a293b01ba9badc29ad55b106b0bc
+%global gh_commit    3461e3fccc7cfdfc2720be910d3bd73c69be590d
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   diff
@@ -24,17 +24,14 @@
 %global php_home     %{_datadir}/php
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        4.0.6
+Version:        4.0.4
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        Diff implementation, version %{major}
 
-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
@@ -46,6 +43,7 @@ BuildRequires:  php-spl
 #        "phpunit/phpunit": "^9.3",
 #        "symfony/process": "^4.2 || ^5"
 BuildRequires:  phpunit9 >= 9.3
+BuildRequires:  php-symfony4-process
 %endif
 
 # from composer.json
@@ -63,13 +61,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 +81,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 +115,9 @@ exit $ret
 
 
 %changelog
-* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.6-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.6-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Tue Mar  5 2024 Remi Collet <remi@remirepo.net> - 4.0.6-1
-- update to 4.0.6
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.5-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue May  9 2023 Remi Collet <remi@remirepo.net> - 4.0.5-1
-- update to 4.0.5
-
-* Fri Apr 21 2023 Remi Collet <remi@remirepo.net> - 4.0.4-7
-- use SPDX license ID
-- use bundled symfony/process for test
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.4-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.4-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
 * Mon Oct 26 2020 Remi Collet <remi@remirepo.net> - 4.0.4-1
 - update to 4.0.4
 
-* Mon Sep 28 2020 Remi Collet <remi@remirepo.net> - 4.0.3-1
-- update to 4.0.3 (no change)
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
 * Tue Jun 30 2020 Remi Collet <remi@remirepo.net> - 4.0.2-1
 - update to 4.0.2
 

sources

@@ -1,2 +1 @@
-SHA512 (php-sebastian-diff4-4.0.6-ba01945.tgz) = f4d0366970ccfcfa8adb96886dd590353475bd67c3b5a89dd20caff4345f7f999ca1b2835445210ebf4dac9c991774ffafee26bc183cfc8ba9f8760b3061f62c
+SHA512 (php-sebastian-diff4-4.0.4-3461e3f.tgz) = 97b671978b27c9b2e0a9d0d45cba5ac343cd47e3cb84738170243f59d6eb72dfe240b3e148f4496fc40b3eb817e6ce8493dfb08a651b9da6af5aded9ece6ef1a
-SHA512 (php-symfony-process-5.4.22.tar.gz) = 723e2f144acd2845734b2b5308b55768b4644eafb01668c03c16e10ddf8857430d8b8863d79d4a1ae98461ad08ee4b05561aa12e5984265c58869b97e8232039