From d41f01da40e743efa6455c943e194e4edaa148cb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 21 Apr 2023 09:57:01 +0200 Subject: [PATCH 1/9] use SPDX license ID use bundled symfony/process for test --- .gitignore | 1 + php-sebastian-diff4.spec | 32 ++++++++++++++++---------------- sources | 3 ++- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 76ddb35..1612021 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /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 diff --git a/php-sebastian-diff4.spec b/php-sebastian-diff4.spec index 847c27e..fb62005 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 @@ -25,13 +25,16 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 4.0.4 -Release: 6%{?dist} +Release: 7%{?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,10 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 0d685c5..1a882d9 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (php-sebastian-diff4-4.0.4-3461e3f.tgz) = 97b671978b27c9b2e0a9d0d45cba5ac343cd47e3cb84738170243f59d6eb72dfe240b3e148f4496fc40b3eb817e6ce8493dfb08a651b9da6af5aded9ece6ef1a +SHA512 (php-sebastian-diff4-4.0.4-3461e3f.tgz) = 2925a34c5cd86954975ed73b79c99ec4fdb229399a8a7809eab8d13b38a34b71824fec2cd009e02972a92592a74c4f1cf5a1ac1a8d1926b8c55c4ff2a46682b6 +SHA512 (php-symfony-process-5.4.22.tar.gz) = 723e2f144acd2845734b2b5308b55768b4644eafb01668c03c16e10ddf8857430d8b8863d79d4a1ae98461ad08ee4b05561aa12e5984265c58869b97e8232039 From 3c80e99d933bf0e830167542542ceb94bd2f00b1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 9 May 2023 11:57:21 +0200 Subject: [PATCH 2/9] v4.0.5 --- .gitignore | 1 + php-sebastian-diff4.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1612021..5dc064f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /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 fb62005..9ec729a 100644 --- a/php-sebastian-diff4.spec +++ b/php-sebastian-diff4.spec @@ -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,8 +24,8 @@ %global php_home %{_datadir}/php Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 4.0.4 -Release: 7%{?dist} +Version: 4.0.5 +Release: 1%{?dist} Summary: Diff implementation, version %{major} License: BSD-3-Clause @@ -111,6 +111,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 1a882d9..6c96e05 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (php-sebastian-diff4-4.0.4-3461e3f.tgz) = 2925a34c5cd86954975ed73b79c99ec4fdb229399a8a7809eab8d13b38a34b71824fec2cd009e02972a92592a74c4f1cf5a1ac1a8d1926b8c55c4ff2a46682b6 +SHA512 (php-sebastian-diff4-4.0.5-74be170.tgz) = 6cf0dddf9ed46604554d44f776140407d678f78fc0308f28c5927e963084cf6b51f24a4c89fd8c8ecf01924f4ed30de592f70135f8d05dd71994bb94f266d892 SHA512 (php-symfony-process-5.4.22.tar.gz) = 723e2f144acd2845734b2b5308b55768b4644eafb01668c03c16e10ddf8857430d8b8863d79d4a1ae98461ad08ee4b05561aa12e5984265c58869b97e8232039 From 6e9ac14814c5d52d516af5ea60fa44e8864f656c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 05:11:54 +0000 Subject: [PATCH 3/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- php-sebastian-diff4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sebastian-diff4.spec b/php-sebastian-diff4.spec index 9ec729a..e21aa16 100644 --- a/php-sebastian-diff4.spec +++ b/php-sebastian-diff4.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 4.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Diff implementation, version %{major} License: BSD-3-Clause @@ -111,6 +111,9 @@ exit $ret %changelog +* 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 From 99ba2214cbfd8d9a4ace730f94341b86f0da4c22 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 21:26:22 +0000 Subject: [PATCH 4/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-sebastian-diff4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sebastian-diff4.spec b/php-sebastian-diff4.spec index e21aa16..a9c9bb5 100644 --- a/php-sebastian-diff4.spec +++ b/php-sebastian-diff4.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 4.0.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Diff implementation, version %{major} License: BSD-3-Clause @@ -111,6 +111,9 @@ exit $ret %changelog +* 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 From 8f299639f64d75bf1fc0f0b02bdd2369e6ba2a43 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 23:14:10 +0000 Subject: [PATCH 5/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- php-sebastian-diff4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sebastian-diff4.spec b/php-sebastian-diff4.spec index a9c9bb5..d26dca0 100644 --- a/php-sebastian-diff4.spec +++ b/php-sebastian-diff4.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 4.0.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Diff implementation, version %{major} License: BSD-3-Clause @@ -111,6 +111,9 @@ exit $ret %changelog +* 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 From a7f9016ae3b8d34fffc5d301f3163e446748ece9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 5 Mar 2024 14:02:34 +0100 Subject: [PATCH 6/9] v4.0.6 --- .gitignore | 1 + php-sebastian-diff4.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5dc064f..95819e1 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /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 d26dca0..2549a72 100644 --- a/php-sebastian-diff4.spec +++ b/php-sebastian-diff4.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-sebastian-diff4 # -# 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/ # @@ -9,7 +9,7 @@ %bcond_without tests -%global gh_commit 74be17022044ebaaecfdf0c5cd504fc9cd5a7131 +%global gh_commit ba01945089c3a293b01ba9badc29ad55b106b0bc %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner sebastianbergmann %global gh_project diff @@ -24,8 +24,8 @@ %global php_home %{_datadir}/php Name: php-%{pk_vendor}-%{pk_project}%{major} -Version: 4.0.5 -Release: 4%{?dist} +Version: 4.0.6 +Release: 1%{?dist} Summary: Diff implementation, version %{major} License: BSD-3-Clause @@ -90,7 +90,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}/phpunit9 --verbose || ret=1 @@ -111,6 +111,9 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 6c96e05..bf715c1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (php-sebastian-diff4-4.0.5-74be170.tgz) = 6cf0dddf9ed46604554d44f776140407d678f78fc0308f28c5927e963084cf6b51f24a4c89fd8c8ecf01924f4ed30de592f70135f8d05dd71994bb94f266d892 +SHA512 (php-sebastian-diff4-4.0.6-ba01945.tgz) = f4d0366970ccfcfa8adb96886dd590353475bd67c3b5a89dd20caff4345f7f999ca1b2835445210ebf4dac9c991774ffafee26bc183cfc8ba9f8760b3061f62c SHA512 (php-symfony-process-5.4.22.tar.gz) = 723e2f144acd2845734b2b5308b55768b4644eafb01668c03c16e10ddf8857430d8b8863d79d4a1ae98461ad08ee4b05561aa12e5984265c58869b97e8232039 From b2b05950f9e3458ae83e8faedb417e2d2cbb032a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 07:28:18 +0000 Subject: [PATCH 7/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- php-sebastian-diff4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sebastian-diff4.spec b/php-sebastian-diff4.spec index 2549a72..f54d5ef 100644 --- a/php-sebastian-diff4.spec +++ b/php-sebastian-diff4.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 4.0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Diff implementation, version %{major} License: BSD-3-Clause @@ -111,6 +111,9 @@ exit $ret %changelog +* 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 From 89977af11900fd6387f1965d407e006a34942da8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 09:44:31 +0000 Subject: [PATCH 8/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- php-sebastian-diff4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sebastian-diff4.spec b/php-sebastian-diff4.spec index f54d5ef..4e53fd2 100644 --- a/php-sebastian-diff4.spec +++ b/php-sebastian-diff4.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 4.0.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Diff implementation, version %{major} License: BSD-3-Clause @@ -111,6 +111,9 @@ exit $ret %changelog +* 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 From fb13a6b974c4f4eb80668b821d72318f7d3f76a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:33:16 +0000 Subject: [PATCH 9/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- php-sebastian-diff4.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-sebastian-diff4.spec b/php-sebastian-diff4.spec index 4e53fd2..a80d0bf 100644 --- a/php-sebastian-diff4.spec +++ b/php-sebastian-diff4.spec @@ -25,7 +25,7 @@ Name: php-%{pk_vendor}-%{pk_project}%{major} Version: 4.0.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Diff implementation, version %{major} License: BSD-3-Clause @@ -111,6 +111,9 @@ 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