From 6f1cd3cbfd40666c783ddf99992b2aa66ddf0073 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 21 Apr 2023 09:57:01 +0200
Subject: [PATCH] v4.0.5 use SPDX license ID use bundled symfony/process for
 test

---
 .gitignore               |  2 ++
 php-sebastian-diff4.spec | 37 +++++++++++++++++++------------------
 sources                  |  3 ++-
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 76ddb35..5dc064f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
 /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
diff --git a/php-sebastian-diff4.spec b/php-sebastian-diff4.spec
index 847c27e..7aa02d7 100644
--- a/php-sebastian-diff4.spec
+++ b/php-sebastian-diff4.spec
@@ -1,7 +1,7 @@
 # remirepo/fedora spec file for php-sebastian-diff4
 #
-# Copyright (c) 2013-2020 Remi Collet
-# License: CC-BY-SA
+# Copyright (c) 2013-2023 Remi Collet
+# License: CC-BY-SA-4.0
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
@@ -9,7 +9,7 @@
 
 %bcond_without       tests
 
-%global gh_commit    3461e3fccc7cfdfc2720be910d3bd73c69be590d
+%global gh_commit    74be17022044ebaaecfdf0c5cd504fc9cd5a7131
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   diff
@@ -24,14 +24,17 @@
 %global php_home     %{_datadir}/php
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        4.0.4
-Release:        6%{?dist}
+Version:        4.0.5
+Release:        1%{?dist}
 Summary:        Diff implementation, version %{major}
 
-License:        BSD
+License:        BSD-3-Clause
 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,7 +46,6 @@ BuildRequires:  php-spl
 #        "phpunit/phpunit": "^9.3",
 #        "symfony/process": "^4.2 || ^5"
 BuildRequires:  phpunit9 >= 9.3
-BuildRequires:  php-symfony4-process
 %endif
 
 # from composer.json
@@ -61,11 +63,13 @@ 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}
+%setup -q -n %{gh_project}-%{gh_commit} -a 2
 
 
 %build
@@ -81,20 +85,12 @@ cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}
 %check
 %if %{with tests}
 mkdir vendor
-%{_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
+%{_bindir}/phpab --output vendor/autoload.php tests process-%{symfony_version}
 
 
 : Run upstream test suite
 ret=0
-for cmd in php php73 php74 php80; do
+for cmd in php php80 php81 php82; 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
@@ -115,6 +111,11 @@ exit $ret
 
 
 %changelog
+* Tue May  9 2023 Remi Collet <remi@remirepo.net> - 4.0.5-1
+- update to 4.0.5
+- 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
 
diff --git a/sources b/sources
index 0d685c5..6c96e05 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (php-sebastian-diff4-4.0.4-3461e3f.tgz) = 97b671978b27c9b2e0a9d0d45cba5ac343cd47e3cb84738170243f59d6eb72dfe240b3e148f4496fc40b3eb817e6ce8493dfb08a651b9da6af5aded9ece6ef1a
+SHA512 (php-sebastian-diff4-4.0.5-74be170.tgz) = 6cf0dddf9ed46604554d44f776140407d678f78fc0308f28c5927e963084cf6b51f24a4c89fd8c8ecf01924f4ed30de592f70135f8d05dd71994bb94f266d892
+SHA512 (php-symfony-process-5.4.22.tar.gz) = 723e2f144acd2845734b2b5308b55768b4644eafb01668c03c16e10ddf8857430d8b8863d79d4a1ae98461ad08ee4b05561aa12e5984265c58869b97e8232039