From 358a0e9dfb5a58da7f446d1170d16ced9ae7403e Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 11 Jun 2018 07:20:18 +0200
Subject: [PATCH 01/25] update to 3.0.1 (no change)

---
 .gitignore               |  1 +
 php-sebastian-diff3.spec | 10 +++++++---
 sources                  |  2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 92429e8..3cc9190 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /php-sebastian-diff3-3.0.0-e091609.tar.gz
+/php-sebastian-diff3-3.0.1-366541b.tar.gz
diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec
index b235135..0b962ab 100644
--- a/php-sebastian-diff3.spec
+++ b/php-sebastian-diff3.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    e09160918c66281713f1c324c1f4c4c3037ba1e8
+%global gh_commit    366541b989927187c4ca70490a35615d3fef2dce
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   diff
@@ -27,7 +27,7 @@
 %endif
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        3.0.0
+Version:        3.0.1
 Release:        1%{?dist}
 Summary:        Diff implementation
 
@@ -88,9 +88,10 @@ cat << 'EOF' | tee -a vendor/autoload.php
 \Fedora\Autoloader\Autoload::addPsr4('Symfony\\Component\\Process', '%{php_home}/Symfony4/Component/Process');
 EOF
 
+
 : Run upstream test suite
 ret=0
-for cmd in php php71 php72; do
+for cmd in php php71 php72 php73; do
   if which $cmd; then
     $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \
       %{_bindir}/phpunit7  --verbose || ret=1
@@ -111,6 +112,9 @@ exit $ret
 
 
 %changelog
+* Mon Jun 11 2018 Remi Collet <remi@remirepo.net> - 3.0.1-1
+- update to 3.0.1 (no change)
+
 * Wed Feb  7 2018 Remi Collet <remi@remirepo.net> - 3.0.0-1
 - normal build
 
diff --git a/sources b/sources
index 14ca392..e8bdb09 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-sebastian-diff3-3.0.0-e091609.tar.gz) = 040be054761551b7f89f0ec708592c3c8331eb833bba89a5284f72e6010a3b95ab878b4da0b38812d2831c9f734144040a11f5cc24102d389f7e7babe4cbdd8c
+SHA512 (php-sebastian-diff3-3.0.1-366541b.tar.gz) = 5b20df091e50d0e6b51e6f462800bd4d3acd240e5bb6affcdb4c884feee86462ec51152f5a294f75067634657093b8c50eb6da56169dd08f994fc2517b0039d3

From 6139d886d52d3d45a8616577701f3e67718b6df0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 13 Jul 2018 22:08:07 +0000
Subject: [PATCH 02/25] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-sebastian-diff3.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec
index 0b962ab..c83eb47 100644
--- a/php-sebastian-diff3.spec
+++ b/php-sebastian-diff3.spec
@@ -28,7 +28,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        3.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Diff implementation
 
 License:        BSD
@@ -112,6 +112,9 @@ exit $ret
 
 
 %changelog
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Mon Jun 11 2018 Remi Collet <remi@remirepo.net> - 3.0.1-1
 - update to 3.0.1 (no change)
 

From 2c88158113901965a143a9dca5e33b683373cd0b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 2 Feb 2019 03:42:00 +0000
Subject: [PATCH 03/25] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-sebastian-diff3.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec
index c83eb47..1fe1c98 100644
--- a/php-sebastian-diff3.spec
+++ b/php-sebastian-diff3.spec
@@ -28,7 +28,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        3.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Diff implementation
 
 License:        BSD
@@ -112,6 +112,9 @@ exit $ret
 
 
 %changelog
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

From d5f0934cf332a9cd7caedeaa766260071dedb137 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 4 Feb 2019 11:15:06 +0100
Subject: [PATCH 04/25] v3.0.2

---
 .gitignore               |  1 +
 php-sebastian-diff3.spec | 15 +++++++++------
 sources                  |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3cc9190..a1d4c45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /php-sebastian-diff3-3.0.0-e091609.tar.gz
 /php-sebastian-diff3-3.0.1-366541b.tar.gz
+/php-sebastian-diff3-3.0.2-720fcc7.tar.gz
diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec
index 1fe1c98..154d398 100644
--- a/php-sebastian-diff3.spec
+++ b/php-sebastian-diff3.spec
@@ -1,13 +1,13 @@
 # remirepo/fedora spec file for php-sebastian-diff3
 #
-# Copyright (c) 2013-2018 Remi Collet
+# Copyright (c) 2013-2019 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    366541b989927187c4ca70490a35615d3fef2dce
+%global gh_commit    720fcc7e9b5cf384ea68d9d930d480907a0c1a29
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   diff
@@ -27,8 +27,8 @@
 %endif
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        3.0.1
-Release:        3%{?dist}
+Version:        3.0.2
+Release:        1%{?dist}
 Summary:        Diff implementation
 
 License:        BSD
@@ -42,9 +42,9 @@ BuildRequires:  php(language) >= 7.1
 BuildRequires:  php-pcre
 BuildRequires:  php-spl
 # from composer.json, "require-dev": {
-#        "phpunit/phpunit": "^7.0",
+#        "phpunit/phpunit": "^7.5 || ^8.0",
 #        "symfony/process": "^2 || ^3.3 || ^4"
-BuildRequires:  phpunit7
+BuildRequires:  phpunit7 >= 7.5
 BuildRequires:  php-symfony4-process
 %endif
 
@@ -112,6 +112,9 @@ exit $ret
 
 
 %changelog
+* Mon Feb  4 2019 Remi Collet <remi@remirepo.net> - 3.0.2-1
+- update to 3.0.2
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index e8bdb09..3f495ab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-sebastian-diff3-3.0.1-366541b.tar.gz) = 5b20df091e50d0e6b51e6f462800bd4d3acd240e5bb6affcdb4c884feee86462ec51152f5a294f75067634657093b8c50eb6da56169dd08f994fc2517b0039d3
+SHA512 (php-sebastian-diff3-3.0.2-720fcc7.tar.gz) = 23a72319b76203a94d9edd14f8d960c9c489773ba9ec2bd7c8fb067332454ff9f83cba620e66da136d963d5599012cf42829c5d5913dd2bad44ed41c69ff9cba

From e0779d565dd47a68db8bd3d60856afb79f04f5d0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 4 Feb 2019 11:15:06 +0100
Subject: [PATCH 05/25] v3.0.2

(cherry picked from commit d5f0934cf332a9cd7caedeaa766260071dedb137)
(cherry picked from commit 7b551c7f57510658d2d26ff2b0790fe5ec041982)
---
 .gitignore               |  2 ++
 php-sebastian-diff3.spec | 13 ++++++++-----
 sources                  |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 92429e8..a1d4c45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 /php-sebastian-diff3-3.0.0-e091609.tar.gz
+/php-sebastian-diff3-3.0.1-366541b.tar.gz
+/php-sebastian-diff3-3.0.2-720fcc7.tar.gz
diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec
index b235135..eee26df 100644
--- a/php-sebastian-diff3.spec
+++ b/php-sebastian-diff3.spec
@@ -1,13 +1,13 @@
 # remirepo/fedora spec file for php-sebastian-diff3
 #
-# Copyright (c) 2013-2018 Remi Collet
+# Copyright (c) 2013-2019 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    e09160918c66281713f1c324c1f4c4c3037ba1e8
+%global gh_commit    720fcc7e9b5cf384ea68d9d930d480907a0c1a29
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   diff
@@ -27,7 +27,7 @@
 %endif
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        3.0.0
+Version:        3.0.2
 Release:        1%{?dist}
 Summary:        Diff implementation
 
@@ -42,9 +42,9 @@ BuildRequires:  php(language) >= 7.1
 BuildRequires:  php-pcre
 BuildRequires:  php-spl
 # from composer.json, "require-dev": {
-#        "phpunit/phpunit": "^7.0",
+#        "phpunit/phpunit": "^7.5 || ^8.0",
 #        "symfony/process": "^2 || ^3.3 || ^4"
-BuildRequires:  phpunit7
+BuildRequires:  phpunit7 >= 7.5
 BuildRequires:  php-symfony4-process
 %endif
 
@@ -111,6 +111,9 @@ exit $ret
 
 
 %changelog
+* Mon Feb  4 2019 Remi Collet <remi@remirepo.net> - 3.0.2-1
+- update to 3.0.2
+
 * Wed Feb  7 2018 Remi Collet <remi@remirepo.net> - 3.0.0-1
 - normal build
 
diff --git a/sources b/sources
index 14ca392..3f495ab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-sebastian-diff3-3.0.0-e091609.tar.gz) = 040be054761551b7f89f0ec708592c3c8331eb833bba89a5284f72e6010a3b95ab878b4da0b38812d2831c9f734144040a11f5cc24102d389f7e7babe4cbdd8c
+SHA512 (php-sebastian-diff3-3.0.2-720fcc7.tar.gz) = 23a72319b76203a94d9edd14f8d960c9c489773ba9ec2bd7c8fb067332454ff9f83cba620e66da136d963d5599012cf42829c5d5913dd2bad44ed41c69ff9cba

From 5568e7efb99106a5cd498870fcbc8bca71ffbb83 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 26 Jul 2019 10:10:05 +0000
Subject: [PATCH 06/25] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-sebastian-diff3.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec
index 154d398..1ba7f2c 100644
--- a/php-sebastian-diff3.spec
+++ b/php-sebastian-diff3.spec
@@ -28,7 +28,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        3.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Diff implementation
 
 License:        BSD
@@ -112,6 +112,9 @@ exit $ret
 
 
 %changelog
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Mon Feb  4 2019 Remi Collet <remi@remirepo.net> - 3.0.2-1
 - update to 3.0.2
 

From ea54c8159529d9b865a421d460fd4e02827b2d3e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 30 Jan 2020 08:43:28 +0000
Subject: [PATCH 07/25] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-sebastian-diff3.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec
index 1ba7f2c..5621d17 100644
--- a/php-sebastian-diff3.spec
+++ b/php-sebastian-diff3.spec
@@ -28,7 +28,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        3.0.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Diff implementation
 
 License:        BSD
@@ -112,6 +112,9 @@ exit $ret
 
 
 %changelog
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From f3c3568e1e71a244d163a59b9fbd7bff4dcfd0da Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 28 Jul 2020 22:12:26 +0000
Subject: [PATCH 08/25] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-sebastian-diff3.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec
index 5621d17..37c25c9 100644
--- a/php-sebastian-diff3.spec
+++ b/php-sebastian-diff3.spec
@@ -28,7 +28,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        3.0.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Diff implementation
 
 License:        BSD
@@ -112,6 +112,9 @@ exit $ret
 
 
 %changelog
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From efbcdddc53495c7eceed09be191ed8c60e429873 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 30 Nov 2020 09:40:42 +0100
Subject: [PATCH 09/25] update to 3.0.3 (no change) switch to phpunit8

---
 .gitignore               |  1 +
 php-sebastian-diff3.spec | 18 +++++++++++-------
 sources                  |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index a1d4c45..e7012ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /php-sebastian-diff3-3.0.0-e091609.tar.gz
 /php-sebastian-diff3-3.0.1-366541b.tar.gz
 /php-sebastian-diff3-3.0.2-720fcc7.tar.gz
+/php-sebastian-diff3-3.0.3-14f72dd.tar.gz
diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec
index 37c25c9..079f909 100644
--- a/php-sebastian-diff3.spec
+++ b/php-sebastian-diff3.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    720fcc7e9b5cf384ea68d9d930d480907a0c1a29
+%global gh_commit    14f72dd46eaf2f2293cbe79c93cc0bc43161a211
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   diff
@@ -27,8 +27,8 @@
 %endif
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        3.0.2
-Release:        4%{?dist}
+Version:        3.0.3
+Release:        1%{?dist}
 Summary:        Diff implementation
 
 License:        BSD
@@ -44,12 +44,12 @@ BuildRequires:  php-spl
 # from composer.json, "require-dev": {
 #        "phpunit/phpunit": "^7.5 || ^8.0",
 #        "symfony/process": "^2 || ^3.3 || ^4"
-BuildRequires:  phpunit7 >= 7.5
+BuildRequires:  phpunit8
 BuildRequires:  php-symfony4-process
 %endif
 
 # from composer.json
-#        "php": "^7.1"
+#        "php": ">=7.1"
 Requires:       php(language) >= 7.1
 # from phpcompatinfo report for version 3.0.0
 Requires:       php-pcre
@@ -91,10 +91,10 @@ EOF
 
 : Run upstream test suite
 ret=0
-for cmd in php php71 php72 php73; do
+for cmd in php php72 php73 php80; do
   if which $cmd; then
     $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \
-      %{_bindir}/phpunit7  --verbose || ret=1
+      %{_bindir}/phpunit8  --verbose || ret=1
   fi
 done
 exit $ret
@@ -112,6 +112,10 @@ exit $ret
 
 
 %changelog
+* Mon Nov 30 2020 Remi Collet <remi@remirepo.net> - 3.0.3-1
+- update to 3.0.3 (no change)
+- switch to phpunit8
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index 3f495ab..117fb0d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-sebastian-diff3-3.0.2-720fcc7.tar.gz) = 23a72319b76203a94d9edd14f8d960c9c489773ba9ec2bd7c8fb067332454ff9f83cba620e66da136d963d5599012cf42829c5d5913dd2bad44ed41c69ff9cba
+SHA512 (php-sebastian-diff3-3.0.3-14f72dd.tar.gz) = 8b4822cd9f1d203914dc0d62e328e18a7b993b2f22b20944d12bc61d8aa0eea1f0b881a0c55ed07e65d460ea65391c192693fe00873ad17e7b201399e7558d3f

From 7eac71ca77a886065c209eb4bfcb04f0dce0f456 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 27 Jan 2021 07:48:47 +0000
Subject: [PATCH 10/25] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-sebastian-diff3.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec
index 079f909..3e6a84f 100644
--- a/php-sebastian-diff3.spec
+++ b/php-sebastian-diff3.spec
@@ -28,7 +28,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        3.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Diff implementation
 
 License:        BSD
@@ -112,6 +112,9 @@ exit $ret
 
 
 %changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Mon Nov 30 2020 Remi Collet <remi@remirepo.net> - 3.0.3-1
 - update to 3.0.3 (no change)
 - switch to phpunit8

From 1b1e1effe04268625246f5470665bc375d60c555 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 23 Jul 2021 03:14:34 +0000
Subject: [PATCH 11/25] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-sebastian-diff3.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec
index 3e6a84f..aae743f 100644
--- a/php-sebastian-diff3.spec
+++ b/php-sebastian-diff3.spec
@@ -28,7 +28,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        3.0.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Diff implementation
 
 License:        BSD
@@ -112,6 +112,9 @@ exit $ret
 
 
 %changelog
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From ed2a52004d0a3165d48d5f8440f498d7dbb5ec3c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 2 Aug 2021 09:16:45 +0200
Subject: [PATCH 12/25] fix symfony autoloader usage

---
 php-sebastian-diff3.spec | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec
index aae743f..42943d5 100644
--- a/php-sebastian-diff3.spec
+++ b/php-sebastian-diff3.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-sebastian-diff3
 #
-# Copyright (c) 2013-2019 Remi Collet
+# Copyright (c) 2013-2021 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -28,7 +28,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        3.0.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Diff implementation
 
 License:        BSD
@@ -85,13 +85,15 @@ cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}
 mkdir vendor
 %{_bindir}/phpab --output vendor/autoload.php tests
 cat << 'EOF' | tee -a vendor/autoload.php
-\Fedora\Autoloader\Autoload::addPsr4('Symfony\\Component\\Process', '%{php_home}/Symfony4/Component/Process');
+\Fedora\Autoloader\Dependencies::required([
+    '%{php_home}/Symfony4/Component/Process/autoload.php',
+]);
 EOF
 
 
 : Run upstream test suite
 ret=0
-for cmd in php php72 php73 php80; 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}/phpunit8  --verbose || ret=1
@@ -112,6 +114,9 @@ exit $ret
 
 
 %changelog
+* Mon Aug  2 2021 Remi Collet <remi@remirepo.net> - 3.0.3-4
+- fix symfony autoloader usage
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From a952aa1ec4e3712f7c9d0c3dd271c5a03d824495 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 21 Jan 2022 08:34:06 +0000
Subject: [PATCH 13/25] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-sebastian-diff3.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec
index 42943d5..87acf98 100644
--- a/php-sebastian-diff3.spec
+++ b/php-sebastian-diff3.spec
@@ -28,7 +28,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        3.0.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Diff implementation
 
 License:        BSD
@@ -114,6 +114,9 @@ exit $ret
 
 
 %changelog
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Mon Aug  2 2021 Remi Collet <remi@remirepo.net> - 3.0.3-4
 - fix symfony autoloader usage
 

From adb498f3e5b410969ff1887c15ea700a426ee276 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 22 Jul 2022 14:27:45 +0000
Subject: [PATCH 14/25] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-sebastian-diff3.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec
index 87acf98..1d4f10a 100644
--- a/php-sebastian-diff3.spec
+++ b/php-sebastian-diff3.spec
@@ -28,7 +28,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        3.0.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Diff implementation
 
 License:        BSD
@@ -114,6 +114,9 @@ exit $ret
 
 
 %changelog
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From 25988c04f5f7fc45e734e98816215b69d891bb70 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 3 Aug 2022 16:26:23 +0200
Subject: [PATCH 15/25] fix test suite with recent symfony, FTBFS #2113592

---
 .gitignore                      |  4 +--
 php-sebastian-diff3-tests.patch | 63 +++++++++++++++++++++++++++++++++
 php-sebastian-diff3.spec        | 11 ++++--
 3 files changed, 73 insertions(+), 5 deletions(-)
 create mode 100644 php-sebastian-diff3-tests.patch

diff --git a/.gitignore b/.gitignore
index e7012ff..3027b6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
-/php-sebastian-diff3-3.0.0-e091609.tar.gz
-/php-sebastian-diff3-3.0.1-366541b.tar.gz
-/php-sebastian-diff3-3.0.2-720fcc7.tar.gz
+clog
 /php-sebastian-diff3-3.0.3-14f72dd.tar.gz
diff --git a/php-sebastian-diff3-tests.patch b/php-sebastian-diff3-tests.patch
new file mode 100644
index 0000000..b35cab3
--- /dev/null
+++ b/php-sebastian-diff3-tests.patch
@@ -0,0 +1,63 @@
+diff -up tests/Output/Integration/StrictUnifiedDiffOutputBuilderIntegrationTest.php.old tests/Output/Integration/StrictUnifiedDiffOutputBuilderIntegrationTest.php
+--- tests/Output/Integration/StrictUnifiedDiffOutputBuilderIntegrationTest.php.old	2022-08-03 16:19:34.658062557 +0200
++++ tests/Output/Integration/StrictUnifiedDiffOutputBuilderIntegrationTest.php	2022-08-03 16:20:00.063084090 +0200
+@@ -197,7 +197,7 @@ final class StrictUnifiedDiffOutputBuild
+         $this->assertNotFalse(\file_put_contents($this->fileFrom, $from));
+         $this->assertNotFalse(\file_put_contents($this->fileTo, $to));
+ 
+-        $p = new Process(\sprintf('diff -u %s %s', \escapeshellarg($this->fileFrom), \escapeshellarg($this->fileTo)));
++        $p = Process::fromShellCommandline(\sprintf('diff -u %s %s', \escapeshellarg($this->fileFrom), \escapeshellarg($this->fileTo)));
+         $p->run();
+         $this->assertSame(1, $p->getExitCode()); // note: Process assumes exit code 0 for `isSuccessful`, however `diff` uses the exit code `1` for success with diff
+ 
+@@ -226,7 +226,7 @@ final class StrictUnifiedDiffOutputBuild
+         $this->assertNotFalse(\file_put_contents($this->fileFrom, $from));
+         $this->assertNotFalse(\file_put_contents($this->filePatch, $diff));
+ 
+-        $p = new Process(\sprintf(
++        $p = Process::fromShellCommandline(\sprintf(
+             'git --git-dir %s apply --check -v --unsafe-paths --ignore-whitespace %s',
+             \escapeshellarg($this->dir),
+             \escapeshellarg($this->filePatch)
+@@ -253,7 +253,7 @@ final class StrictUnifiedDiffOutputBuild
+             \escapeshellarg($this->filePatch)
+         );
+ 
+-        $p = new Process($command);
++        $p = Process::fromShellCommandline($command);
+         $p->run();
+ 
+         $this->assertProcessSuccessful($p);
+diff -up tests/Output/Integration/UnifiedDiffOutputBuilderIntegrationTest.php.old tests/Output/Integration/UnifiedDiffOutputBuilderIntegrationTest.php
+--- tests/Output/Integration/UnifiedDiffOutputBuilderIntegrationTest.php.old	2022-08-03 16:19:44.460070865 +0200
++++ tests/Output/Integration/UnifiedDiffOutputBuilderIntegrationTest.php	2022-08-03 16:20:06.754089761 +0200
+@@ -97,7 +97,7 @@ final class UnifiedDiffOutputBuilderInte
+             \escapeshellarg($this->filePatch)
+         );
+ 
+-        $p = new Process($command);
++        $p = Process::fromShellCommandline($command);
+         $p->run();
+ 
+         $this->assertProcessSuccessful($p);
+@@ -125,7 +125,7 @@ final class UnifiedDiffOutputBuilderInte
+             \escapeshellarg($this->filePatch)
+         );
+ 
+-        $p = new Process($command);
++        $p = Process::fromShellCommandline($command);
+         $p->run();
+ 
+         $this->assertProcessSuccessful($p);
+diff -up tests/Utils/UnifiedDiffAssertTraitIntegrationTest.php.old tests/Utils/UnifiedDiffAssertTraitIntegrationTest.php
+--- tests/Utils/UnifiedDiffAssertTraitIntegrationTest.php.old	2022-08-03 16:19:24.424053883 +0200
++++ tests/Utils/UnifiedDiffAssertTraitIntegrationTest.php	2022-08-03 16:19:47.539073475 +0200
+@@ -51,7 +51,7 @@ final class UnifiedDiffAssertTraitIntegr
+             \escapeshellarg($this->filePatch)
+         );
+ 
+-        $p = new Process($command);
++        $p = Process::fromShellCommandline($command);
+         $p->run();
+ 
+         $exitCode = $p->getExitCode();
diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec
index 1d4f10a..64781a2 100644
--- a/php-sebastian-diff3.spec
+++ b/php-sebastian-diff3.spec
@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-sebastian-diff3
 #
-# Copyright (c) 2013-2021 Remi Collet
+# Copyright (c) 2013-2022 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -35,6 +35,9 @@ License:        BSD
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
 
+# Fix for recent Symfony
+Patch0:         %{name}-tests.patch
+
 BuildArch:      noarch
 BuildRequires:  php-fedora-autoloader-devel
 %if %{with_tests}
@@ -68,6 +71,7 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit}
+%patch0 -p0
 
 
 %build
@@ -93,7 +97,7 @@ EOF
 
 : Run upstream test suite
 ret=0
-for cmd in php php73 php74 php80; do
+for cmd in php php74 php80 php81 php82; do
   if which $cmd; then
     $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \
       %{_bindir}/phpunit8  --verbose || ret=1
@@ -114,6 +118,9 @@ exit $ret
 
 
 %changelog
+* Wed Aug  3 2022 Remi Collet <remi@remirepo.net> - 3.0.3-6
+- fix test suite with recent symfony, FTBFS #2113592
+
 * Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From 738f1b77541363fba7c5e8dd73fcbf530bce086d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 20 Jan 2023 09:22:28 +0000
Subject: [PATCH 16/25] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-sebastian-diff3.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec
index 64781a2..5855745 100644
--- a/php-sebastian-diff3.spec
+++ b/php-sebastian-diff3.spec
@@ -28,7 +28,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        3.0.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Diff implementation
 
 License:        BSD
@@ -118,6 +118,9 @@ exit $ret
 
 
 %changelog
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Wed Aug  3 2022 Remi Collet <remi@remirepo.net> - 3.0.3-6
 - fix test suite with recent symfony, FTBFS #2113592
 

From 7395ebd3f6e6cb2e9d94a5440d3dec7981ddccf9 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 21 Apr 2023 09:55:45 +0200
Subject: [PATCH 17/25] use SPDX license ID

use bundled symfony/process for test
---
 .gitignore               |  1 +
 php-sebastian-diff3.spec | 31 +++++++++++++++++--------------
 sources                  |  1 +
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3027b6e..6356db7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 clog
 /php-sebastian-diff3-3.0.3-14f72dd.tar.gz
+/php-symfony-process-4.4.44.tar.gz
diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec
index 5855745..1e61baf 100644
--- a/php-sebastian-diff3.spec
+++ b/php-sebastian-diff3.spec
@@ -1,7 +1,7 @@
 # remirepo/fedora spec file for php-sebastian-diff3
 #
-# Copyright (c) 2013-2022 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
@@ -28,12 +28,15 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        3.0.3
-Release:        7%{?dist}
-Summary:        Diff implementation
+Release:        8%{?dist}
+Summary:        Diff implementation, version %{major}
 
-License:        BSD
+License:        BSD-3-Clause
 URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
+# php-symfony4 going to disapear, only used for tests
+%global symfony_version 4.4.44
+Source2:        https://github.com/symfony/process/archive/v%{symfony_version}/php-symfony-process-%{symfony_version}.tar.gz
 
 # Fix for recent Symfony
 Patch0:         %{name}-tests.patch
@@ -48,7 +51,6 @@ BuildRequires:  php-spl
 #        "phpunit/phpunit": "^7.5 || ^8.0",
 #        "symfony/process": "^2 || ^3.3 || ^4"
 BuildRequires:  phpunit8
-BuildRequires:  php-symfony4-process
 %endif
 
 # from composer.json
@@ -66,11 +68,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
 %patch0 -p0
 
 
@@ -87,17 +91,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}/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 php74 php80 php81 php82; 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}/phpunit8  --verbose || ret=1
@@ -118,6 +117,10 @@ exit $ret
 
 
 %changelog
+* Fri Apr 21 2023 Remi Collet <remi@remirepo.net> - 3.0.3-8
+- use SPDX license ID
+- use bundled symfony/process for test
+
 * Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
diff --git a/sources b/sources
index 117fb0d..f1e5bfb 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (php-sebastian-diff3-3.0.3-14f72dd.tar.gz) = 8b4822cd9f1d203914dc0d62e328e18a7b993b2f22b20944d12bc61d8aa0eea1f0b881a0c55ed07e65d460ea65391c192693fe00873ad17e7b201399e7558d3f
+SHA512 (php-symfony-process-4.4.44.tar.gz) = f50deca4d93f4252ecd32ff31b4c221ecab49172b369b37d862eca274aeb31fa4396b42224f84492e2cb82107acb8ffa90b39d006d5f9040d793fbe08486af46

From 3f1e19053a621ef4e68a812af44bb5fe53d9aede Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 9 May 2023 11:37:26 +0200
Subject: [PATCH 18/25] 3.0.4

---
 .gitignore               |  1 +
 php-sebastian-diff3.spec | 11 +++++++----
 sources                  |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6356db7..b3181ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 clog
 /php-sebastian-diff3-3.0.3-14f72dd.tar.gz
 /php-symfony-process-4.4.44.tar.gz
+/php-sebastian-diff3-3.0.4-6296a0c.tar.gz
diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec
index 1e61baf..0d01f29 100644
--- a/php-sebastian-diff3.spec
+++ b/php-sebastian-diff3.spec
@@ -7,7 +7,7 @@
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    14f72dd46eaf2f2293cbe79c93cc0bc43161a211
+%global gh_commit    6296a0c086dd0117c1b78b059374d7fcbe7545ae
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   diff
@@ -27,8 +27,8 @@
 %endif
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        3.0.3
-Release:        8%{?dist}
+Version:        3.0.4
+Release:        1%{?dist}
 Summary:        Diff implementation, version %{major}
 
 License:        BSD-3-Clause
@@ -75,7 +75,7 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php
 
 %prep
 %setup -q -n %{gh_project}-%{gh_commit} -a 2
-%patch0 -p0
+%patch -P0 -p0
 
 
 %build
@@ -117,6 +117,9 @@ exit $ret
 
 
 %changelog
+* Tue May  9 2023 Remi Collet <remi@remirepo.net> - 3.0.4-1
+- update to 3.0.4
+
 * Fri Apr 21 2023 Remi Collet <remi@remirepo.net> - 3.0.3-8
 - use SPDX license ID
 - use bundled symfony/process for test
diff --git a/sources b/sources
index f1e5bfb..5ea5891 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (php-sebastian-diff3-3.0.3-14f72dd.tar.gz) = 8b4822cd9f1d203914dc0d62e328e18a7b993b2f22b20944d12bc61d8aa0eea1f0b881a0c55ed07e65d460ea65391c192693fe00873ad17e7b201399e7558d3f
+SHA512 (php-sebastian-diff3-3.0.4-6296a0c.tar.gz) = 487852d49ad55356edfc562ab0aec5d57ab143bde50897e2f23592f25d44330c45c353baf2cc111c1095f4165bcb3dcc437fc36e7a248d2ac849ca36714910ac
 SHA512 (php-symfony-process-4.4.44.tar.gz) = f50deca4d93f4252ecd32ff31b4c221ecab49172b369b37d862eca274aeb31fa4396b42224f84492e2cb82107acb8ffa90b39d006d5f9040d793fbe08486af46

From 50614e0b9ee2e73d78ec576f406fa6911e2737d2 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 21 Jul 2023 05:11:42 +0000
Subject: [PATCH 19/25] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 php-sebastian-diff3.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec
index 0d01f29..b1709d1 100644
--- a/php-sebastian-diff3.spec
+++ b/php-sebastian-diff3.spec
@@ -28,7 +28,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        3.0.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Diff implementation, version %{major}
 
 License:        BSD-3-Clause
@@ -117,6 +117,9 @@ exit $ret
 
 
 %changelog
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Tue May  9 2023 Remi Collet <remi@remirepo.net> - 3.0.4-1
 - update to 3.0.4
 

From 0d1b70661c2362ae5d09942fe9b87251f5e60f55 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 21 Jan 2024 21:26:13 +0000
Subject: [PATCH 20/25] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 php-sebastian-diff3.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec
index b1709d1..985407d 100644
--- a/php-sebastian-diff3.spec
+++ b/php-sebastian-diff3.spec
@@ -28,7 +28,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        3.0.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Diff implementation, version %{major}
 
 License:        BSD-3-Clause
@@ -117,6 +117,9 @@ exit $ret
 
 
 %changelog
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From 2f944aea967dda71714d9262e33eb5a9b4f6a5d9 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 25 Jan 2024 23:14:01 +0000
Subject: [PATCH 21/25] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 php-sebastian-diff3.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec
index 985407d..458fbc1 100644
--- a/php-sebastian-diff3.spec
+++ b/php-sebastian-diff3.spec
@@ -28,7 +28,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        3.0.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Diff implementation, version %{major}
 
 License:        BSD-3-Clause
@@ -117,6 +117,9 @@ exit $ret
 
 
 %changelog
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From e31699abb1e18dea68e9f3fd790b0baa03ab4bac Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 5 Mar 2024 14:01:14 +0100
Subject: [PATCH 22/25] update to 3.0.6

sources from git snapshot
---
 .gitignore               |  1 +
 makesrc.sh               | 28 ++++++++++++++++++++++++++++
 php-sebastian-diff3.spec | 17 +++++++++++------
 sources                  |  2 +-
 4 files changed, 41 insertions(+), 7 deletions(-)
 create mode 100755 makesrc.sh

diff --git a/.gitignore b/.gitignore
index b3181ea..0aaf08c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ clog
 /php-sebastian-diff3-3.0.3-14f72dd.tar.gz
 /php-symfony-process-4.4.44.tar.gz
 /php-sebastian-diff3-3.0.4-6296a0c.tar.gz
+/php-sebastian-diff3-3.0.6-98ff311.tgz
diff --git a/makesrc.sh b/makesrc.sh
new file mode 100755
index 0000000..3d8028d
--- /dev/null
+++ b/makesrc.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+NAME=$(basename $PWD)
+OWNER=$(sed   -n '/^%global gh_owner/{s/.* //;p}'  $NAME.spec)
+PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec)
+VERSION=$(sed -n '/^Version:/{s/.* //;p}'           $NAME.spec)
+COMMIT=$(sed  -n '/^%global gh_commit/{s/.* //;p}'  $NAME.spec)
+SHORT=${COMMIT:0:7}
+
+echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n"
+
+echo "Cloning..."
+rm -rf $PROJECT-$COMMIT
+git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
+
+echo "Getting commit..."
+pushd $PROJECT-$COMMIT
+git checkout $COMMIT
+cp composer.json ../composer.json
+popd
+
+echo "Archiving..."
+tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT
+
+echo "Cleaning..."
+rm -rf $PROJECT-$COMMIT
+
+echo "Done."
diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec
index 458fbc1..9d099cf 100644
--- a/php-sebastian-diff3.spec
+++ b/php-sebastian-diff3.spec
@@ -1,13 +1,13 @@
 # remirepo/fedora spec file for php-sebastian-diff3
 #
-# Copyright (c) 2013-2023 Remi Collet
+# Copyright (c) 2013-2024 Remi Collet
 # License: CC-BY-SA-4.0
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    6296a0c086dd0117c1b78b059374d7fcbe7545ae
+%global gh_commit    98ff311ca519c3aa73ccd3de053bdb377171d7b6
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   diff
@@ -27,13 +27,14 @@
 %endif
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        3.0.4
-Release:        4%{?dist}
+Version:        3.0.6
+Release:        1%{?dist}
 Summary:        Diff implementation, version %{major}
 
 License:        BSD-3-Clause
 URL:            https://github.com/%{gh_owner}/%{gh_project}
-Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
+Source0:        %{name}-%{version}-%{gh_short}.tgz
+Source1:        makesrc.sh
 # php-symfony4 going to disapear, only used for tests
 %global symfony_version 4.4.44
 Source2:        https://github.com/symfony/process/archive/v%{symfony_version}/php-symfony-process-%{symfony_version}.tar.gz
@@ -96,7 +97,7 @@ mkdir vendor
 
 : Run upstream test suite
 ret=0
-for cmd in php php80 php81 php82; do
+for cmd in php php81 php82 php83; do
   if which $cmd; then
     $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \
       %{_bindir}/phpunit8  --verbose || ret=1
@@ -117,6 +118,10 @@ exit $ret
 
 
 %changelog
+* Tue Mar  5 2024 Remi Collet <remi@remirepo.net> - 3.0.6-1
+- update to 3.0.6
+- sources from git snapshot
+
 * Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/sources b/sources
index 5ea5891..0b19f48 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (php-sebastian-diff3-3.0.4-6296a0c.tar.gz) = 487852d49ad55356edfc562ab0aec5d57ab143bde50897e2f23592f25d44330c45c353baf2cc111c1095f4165bcb3dcc437fc36e7a248d2ac849ca36714910ac
+SHA512 (php-sebastian-diff3-3.0.6-98ff311.tgz) = bb5ab43ff80ac3b43bd1bb3bdab1977c74cf670ee3c5eca32b51b40bf519a1c4405467468ca58d73de681210693880e60d5e571333f975be8781536efbc24c29
 SHA512 (php-symfony-process-4.4.44.tar.gz) = f50deca4d93f4252ecd32ff31b4c221ecab49172b369b37d862eca274aeb31fa4396b42224f84492e2cb82107acb8ffa90b39d006d5f9040d793fbe08486af46

From 4c8752a3216fa74e3606929c3134a91a4d57672d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jul 2024 07:28:08 +0000
Subject: [PATCH 23/25] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 php-sebastian-diff3.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec
index 9d099cf..a14b1ac 100644
--- a/php-sebastian-diff3.spec
+++ b/php-sebastian-diff3.spec
@@ -28,7 +28,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        3.0.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Diff implementation, version %{major}
 
 License:        BSD-3-Clause
@@ -118,6 +118,9 @@ exit $ret
 
 
 %changelog
+* Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Tue Mar  5 2024 Remi Collet <remi@remirepo.net> - 3.0.6-1
 - update to 3.0.6
 - sources from git snapshot

From ed7e12685c4b1c6df54fd983551fda57669cd431 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 18 Jan 2025 09:44:20 +0000
Subject: [PATCH 24/25] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 php-sebastian-diff3.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec
index a14b1ac..ca2c81c 100644
--- a/php-sebastian-diff3.spec
+++ b/php-sebastian-diff3.spec
@@ -28,7 +28,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        3.0.6
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Diff implementation, version %{major}
 
 License:        BSD-3-Clause
@@ -118,6 +118,9 @@ exit $ret
 
 
 %changelog
+* Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Fri Jul 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From b95f009e90fa659971da49cb3c2f25902def9b68 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 25 Jul 2025 05:33:10 +0000
Subject: [PATCH 25/25] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 php-sebastian-diff3.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/php-sebastian-diff3.spec b/php-sebastian-diff3.spec
index ca2c81c..af24786 100644
--- a/php-sebastian-diff3.spec
+++ b/php-sebastian-diff3.spec
@@ -28,7 +28,7 @@
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
 Version:        3.0.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Diff implementation, version %{major}
 
 License:        BSD-3-Clause
@@ -118,6 +118,9 @@ exit $ret
 
 
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Sat Jan 18 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild