From 1a0ae475efdef0b2f7dfb7cabe587af11ebee3d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 23:00:10 +0200 Subject: [PATCH 01/20] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- ydiff.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ydiff.spec b/ydiff.spec index d56e2ae..6243d1c 100644 --- a/ydiff.spec +++ b/ydiff.spec @@ -1,9 +1,10 @@ Name: ydiff Version: 1.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: View colored, incremental diff URL: https://github.com/ymattw/ydiff -License: BSD +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD Source0: https://github.com/ymattw/ydiff/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: python3-devel python3-setuptools BuildArch: noarch @@ -42,6 +43,9 @@ Python library that implements API used by ydiff tool. %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info %changelog +* Wed Sep 04 2024 Miroslav Suchý - 1.3-4 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 1.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From f695e7ed3fc938e1bb8e229442421ca820bda848 Mon Sep 17 00:00:00 2001 From: Alois Mahdal Date: Thu, 14 Nov 2024 14:18:51 +0100 Subject: [PATCH 02/20] Tiny whitespace cleanup --- ydiff.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/ydiff.spec b/ydiff.spec index 6243d1c..c882097 100644 --- a/ydiff.spec +++ b/ydiff.spec @@ -52,7 +52,6 @@ Python library that implements API used by ydiff tool. * Fri Jun 07 2024 Python Maint - 1.3-2 - Rebuilt for Python 3.13 - * Fri Apr 05 2024 Alois Mahdal 1.3-1 - Updated to 1.3 From a67f8865843000c08e965e7bee76ca42c2d76060 Mon Sep 17 00:00:00 2001 From: Alois Mahdal Date: Thu, 14 Nov 2024 13:42:21 +0100 Subject: [PATCH 03/20] Update to ydiff-1.4.1 (BZ#2326169) --- .gitignore | 1 + sources | 2 +- ydiff.spec | 13 ++++++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index bffb9c0..e6b9bf5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /ydiff-1.1.tar.gz /ydiff-1.2.tar.gz /ydiff-1.3.tar.gz +/ydiff-1.4.1.tar.gz diff --git a/sources b/sources index 1e41c4d..e64d666 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ydiff-1.3.tar.gz) = 8e7eb69e2e2a25564227afcccdea52eb812794a657d6a0a1f828da6523fbb2c36c519506d0a4f259949b980b4b53bd47ed82eb950bfa092f3d7cd7d289ac5ac3 +SHA512 (ydiff-1.4.1.tar.gz) = 75cb0ccd4e589bd71c0d9b59dd40a16697751b4312cd18a06247dba87191cb83b69576cf3a25ca05546d5d2adc064a76c1a4d00833feb3ce49a9a851c1ed7dab diff --git a/ydiff.spec b/ydiff.spec index c882097..6a5453a 100644 --- a/ydiff.spec +++ b/ydiff.spec @@ -1,6 +1,6 @@ Name: ydiff -Version: 1.3 -Release: 4%{?dist} +Version: 1.4.1 +Release: 1%{?dist} Summary: View colored, incremental diff URL: https://github.com/ymattw/ydiff # Automatically converted from old format: BSD - review is highly recommended. @@ -12,9 +12,9 @@ BuildArch: noarch Requires: less Requires: python%{python3_pkgversion}-%{name} %description -Term based tool to view colored, incremental diff in a Git/Mercurial/Svn -workspace or from stdin, with side by side (similar to diff -y) and auto -pager support. +Ydiff is a terminal-based tool to view colored, incremental diffs in +a version-controlled workspace or from stdin, in side-by-side (similar to +``diff -y``) or unified mode, and auto-paged. %package -n python3-%{name} Summary: %{summary} @@ -43,6 +43,9 @@ Python library that implements API used by ydiff tool. %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info %changelog +* Thu Nov 14 2024 Alois Mahdal 1.4.1-1 +- Updated to 1.4.1 (RHBZ#2326169) + * Wed Sep 04 2024 Miroslav Suchý - 1.3-4 - convert license to SPDX From b043c881b16a72b28d18b3cccfc3eb4c848c6b59 Mon Sep 17 00:00:00 2001 From: Alois Mahdal Date: Fri, 13 Dec 2024 13:59:55 +0100 Subject: [PATCH 04/20] Update to ydiff-1.4.2 (BZ#2326989) --- .gitignore | 1 + sources | 2 +- ydiff.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e6b9bf5..432aa76 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /ydiff-1.2.tar.gz /ydiff-1.3.tar.gz /ydiff-1.4.1.tar.gz +/ydiff-1.4.2.tar.gz diff --git a/sources b/sources index e64d666..6ac7e4f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ydiff-1.4.1.tar.gz) = 75cb0ccd4e589bd71c0d9b59dd40a16697751b4312cd18a06247dba87191cb83b69576cf3a25ca05546d5d2adc064a76c1a4d00833feb3ce49a9a851c1ed7dab +SHA512 (ydiff-1.4.2.tar.gz) = 8aa0cd510cab0ad73b7f99f566aedbf30929fe9d98a7675a9c271b659bec93a3fced19dc661b0018c99279cf9b1b7fd42c70d5401a348b4b3f614f3be1bec832 diff --git a/ydiff.spec b/ydiff.spec index 6a5453a..a0ea81e 100644 --- a/ydiff.spec +++ b/ydiff.spec @@ -1,5 +1,5 @@ Name: ydiff -Version: 1.4.1 +Version: 1.4.2 Release: 1%{?dist} Summary: View colored, incremental diff URL: https://github.com/ymattw/ydiff @@ -43,6 +43,9 @@ Python library that implements API used by ydiff tool. %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info %changelog +* Fri Dec 13 2024 Alois Mahdal 1.4.2-1 +- Updated to 1.4.2 (RHBZ#2326989) + * Thu Nov 14 2024 Alois Mahdal 1.4.1-1 - Updated to 1.4.1 (RHBZ#2326169) From 5bb4b44c4b61954729ce7de8e8d1da0def8f1cce Mon Sep 17 00:00:00 2001 From: Alois Mahdal Date: Mon, 16 Dec 2024 16:50:13 +0100 Subject: [PATCH 05/20] Fixup BuildRequires formatting for maintainability --- ydiff.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ydiff.spec b/ydiff.spec index a0ea81e..bb8d159 100644 --- a/ydiff.spec +++ b/ydiff.spec @@ -6,7 +6,8 @@ URL: https://github.com/ymattw/ydiff # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD Source0: https://github.com/ymattw/ydiff/archive/%{version}/%{name}-%{version}.tar.gz -BuildRequires: python3-devel python3-setuptools +BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildArch: noarch Requires: less From d211992e454c9c3417f0b230e8b15ad055e2416d Mon Sep 17 00:00:00 2001 From: Alois Mahdal Date: Mon, 16 Dec 2024 13:05:35 +0100 Subject: [PATCH 06/20] Enable upstream regression tests in %check --- ydiff.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ydiff.spec b/ydiff.spec index bb8d159..605ba48 100644 --- a/ydiff.spec +++ b/ydiff.spec @@ -8,6 +8,7 @@ License: LicenseRef-Callaway-BSD Source0: https://github.com/ymattw/ydiff/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: python3-devel BuildRequires: python3-setuptools +BuildRequires: less BuildArch: noarch Requires: less @@ -30,6 +31,11 @@ Python library that implements API used by ydiff tool. %build %py3_build +%check +tests/regression.sh +# upstream pipeline uses `make test` which also has coverage +# and linters but we don't do those here + %install %py3_install From ff92224b32ec43441914489923a211c16dfd673a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:32:35 +0000 Subject: [PATCH 07/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ydiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ydiff.spec b/ydiff.spec index 605ba48..20dbd42 100644 --- a/ydiff.spec +++ b/ydiff.spec @@ -1,6 +1,6 @@ Name: ydiff Version: 1.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: View colored, incremental diff URL: https://github.com/ymattw/ydiff # Automatically converted from old format: BSD - review is highly recommended. @@ -50,6 +50,9 @@ tests/regression.sh %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Dec 13 2024 Alois Mahdal 1.4.2-1 - Updated to 1.4.2 (RHBZ#2326989) From a97f9ed3ba850426a5554c356579d658fc3f039b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 20:51:19 +0200 Subject: [PATCH 08/20] Rebuilt for Python 3.14 --- ydiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ydiff.spec b/ydiff.spec index 20dbd42..f9d165c 100644 --- a/ydiff.spec +++ b/ydiff.spec @@ -1,6 +1,6 @@ Name: ydiff Version: 1.4.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: View colored, incremental diff URL: https://github.com/ymattw/ydiff # Automatically converted from old format: BSD - review is highly recommended. @@ -50,6 +50,9 @@ tests/regression.sh %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info %changelog +* Mon Jun 02 2025 Python Maint - 1.4.2-3 +- Rebuilt for Python 3.14 + * Sun Jan 19 2025 Fedora Release Engineering - 1.4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 374bf766921a79e8a074802d3bc15240d207f735 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:11:39 +0000 Subject: [PATCH 09/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ydiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ydiff.spec b/ydiff.spec index f9d165c..772eec7 100644 --- a/ydiff.spec +++ b/ydiff.spec @@ -1,6 +1,6 @@ Name: ydiff Version: 1.4.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: View colored, incremental diff URL: https://github.com/ymattw/ydiff # Automatically converted from old format: BSD - review is highly recommended. @@ -50,6 +50,9 @@ tests/regression.sh %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.4.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jun 02 2025 Python Maint - 1.4.2-3 - Rebuilt for Python 3.14 From 3cfaaac267b9dae49f367a8c8c311414b1dcea02 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:23:34 +0200 Subject: [PATCH 10/20] Rebuilt for Python 3.14.0rc2 bytecode --- ydiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ydiff.spec b/ydiff.spec index 772eec7..21afd2c 100644 --- a/ydiff.spec +++ b/ydiff.spec @@ -1,6 +1,6 @@ Name: ydiff Version: 1.4.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: View colored, incremental diff URL: https://github.com/ymattw/ydiff # Automatically converted from old format: BSD - review is highly recommended. @@ -50,6 +50,9 @@ tests/regression.sh %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info %changelog +* Fri Aug 15 2025 Python Maint - 1.4.2-5 +- Rebuilt for Python 3.14.0rc2 bytecode + * Fri Jul 25 2025 Fedora Release Engineering - 1.4.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From c26d1000ade0ff7d7e798f970085851db80c51ad Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 15:04:08 +0200 Subject: [PATCH 11/20] Rebuilt for Python 3.14.0rc3 bytecode --- ydiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ydiff.spec b/ydiff.spec index 21afd2c..35cb6d1 100644 --- a/ydiff.spec +++ b/ydiff.spec @@ -1,6 +1,6 @@ Name: ydiff Version: 1.4.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: View colored, incremental diff URL: https://github.com/ymattw/ydiff # Automatically converted from old format: BSD - review is highly recommended. @@ -50,6 +50,9 @@ tests/regression.sh %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info %changelog +* Fri Sep 19 2025 Python Maint - 1.4.2-6 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 1.4.2-5 - Rebuilt for Python 3.14.0rc2 bytecode From 5d281bb693da9b0d21625391e6d2a8a2a53cc801 Mon Sep 17 00:00:00 2001 From: Alois Mahdal Date: Mon, 15 Dec 2025 12:46:01 +0100 Subject: [PATCH 12/20] Update to ydiff-1.5 (BZ#2419728) --- .gitignore | 1 + sources | 2 +- ydiff.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 432aa76..02f725a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /ydiff-1.3.tar.gz /ydiff-1.4.1.tar.gz /ydiff-1.4.2.tar.gz +/ydiff-1.5.tar.gz diff --git a/sources b/sources index 6ac7e4f..232b5ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ydiff-1.4.2.tar.gz) = 8aa0cd510cab0ad73b7f99f566aedbf30929fe9d98a7675a9c271b659bec93a3fced19dc661b0018c99279cf9b1b7fd42c70d5401a348b4b3f614f3be1bec832 +SHA512 (ydiff-1.5.tar.gz) = 9b2b00fde08f3467dfa063d0ae184760ead4055ddd6815cbc5543aceca1a2e8ad0c1506fc7af45961cec2eb8c3f8ae60b4753c90882c22657492a40560346b3a diff --git a/ydiff.spec b/ydiff.spec index 35cb6d1..5e469fb 100644 --- a/ydiff.spec +++ b/ydiff.spec @@ -1,6 +1,6 @@ Name: ydiff -Version: 1.4.2 -Release: 6%{?dist} +Version: 1.5 +Release: 1%{?dist} Summary: View colored, incremental diff URL: https://github.com/ymattw/ydiff # Automatically converted from old format: BSD - review is highly recommended. @@ -50,6 +50,9 @@ tests/regression.sh %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info %changelog +* Mon Dec 15 2026 Alois Mahdal 1.5-1 +- Updated to 1.5 (RHBZ#2419728) + * Fri Sep 19 2025 Python Maint - 1.4.2-6 - Rebuilt for Python 3.14.0rc3 bytecode From 73de8ab27a3e4b497804b8e54e49a4f64207ead1 Mon Sep 17 00:00:00 2001 From: Alois Mahdal Date: Mon, 15 Dec 2025 16:12:24 +0100 Subject: [PATCH 13/20] Fix typo in changelog date --- ydiff.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ydiff.spec b/ydiff.spec index 5e469fb..f7f30de 100644 --- a/ydiff.spec +++ b/ydiff.spec @@ -50,7 +50,7 @@ tests/regression.sh %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info %changelog -* Mon Dec 15 2026 Alois Mahdal 1.5-1 +* Mon Dec 15 2025 Alois Mahdal 1.5-1 - Updated to 1.5 (RHBZ#2419728) * Fri Sep 19 2025 Python Maint - 1.4.2-6 From 8339e4155a6b940519bc04172287341f78b28229 Mon Sep 17 00:00:00 2001 From: Alois Mahdal Date: Mon, 15 Dec 2025 16:24:48 +0100 Subject: [PATCH 14/20] Bump release to propagate %changelog typo fix --- ydiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ydiff.spec b/ydiff.spec index f7f30de..226cc45 100644 --- a/ydiff.spec +++ b/ydiff.spec @@ -1,6 +1,6 @@ Name: ydiff Version: 1.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: View colored, incremental diff URL: https://github.com/ymattw/ydiff # Automatically converted from old format: BSD - review is highly recommended. @@ -50,6 +50,9 @@ tests/regression.sh %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info %changelog +* Mon Dec 15 2025 Alois Mahdal 1.5-2 +- Rebuilt to propagate typo fix in changelog + * Mon Dec 15 2025 Alois Mahdal 1.5-1 - Updated to 1.5 (RHBZ#2419728) From 179684b76e3944d398d8f5725c23095c9888a23c Mon Sep 17 00:00:00 2001 From: Alois Mahdal Date: Mon, 15 Dec 2025 16:43:10 +0100 Subject: [PATCH 15/20] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++ ydiff.spec | 104 ++--------------------------------------------------- 2 files changed, 103 insertions(+), 102 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..8aa9bcc --- /dev/null +++ b/changelog @@ -0,0 +1,101 @@ +* Mon Dec 15 2025 Alois Mahdal 1.5-2 +- Rebuilt to propagate typo fix in changelog + +* Mon Dec 15 2025 Alois Mahdal 1.5-1 +- Updated to 1.5 (RHBZ#2419728) + +* Fri Sep 19 2025 Python Maint - 1.4.2-6 +- Rebuilt for Python 3.14.0rc3 bytecode + +* Fri Aug 15 2025 Python Maint - 1.4.2-5 +- Rebuilt for Python 3.14.0rc2 bytecode + +* Fri Jul 25 2025 Fedora Release Engineering - 1.4.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Mon Jun 02 2025 Python Maint - 1.4.2-3 +- Rebuilt for Python 3.14 + +* Sun Jan 19 2025 Fedora Release Engineering - 1.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Dec 13 2024 Alois Mahdal 1.4.2-1 +- Updated to 1.4.2 (RHBZ#2326989) + +* Thu Nov 14 2024 Alois Mahdal 1.4.1-1 +- Updated to 1.4.1 (RHBZ#2326169) + +* Wed Sep 04 2024 Miroslav Suchý - 1.3-4 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jun 07 2024 Python Maint - 1.3-2 +- Rebuilt for Python 3.13 + +* Fri Apr 05 2024 Alois Mahdal 1.3-1 +- Updated to 1.3 + +* Sat Jan 27 2024 Fedora Release Engineering - 1.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 1.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 1.2-9 +- Rebuilt for Python 3.12 + +* Sat Jan 21 2023 Fedora Release Engineering - 1.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 1.2-6 +- Rebuilt for Python 3.11 + +* Sat Jan 22 2022 Fedora Release Engineering - 1.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 1.2-3 +- Rebuilt for Python 3.10 + +* Thu Jan 28 2021 Fedora Release Engineering - 1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Oct 29 2020 Alois Mahdal - 1.2-1 +- Updated upstream to 1.2 + +* Wed Jul 29 2020 Fedora Release Engineering - 1.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 1.1-9 +- Rebuilt for Python 3.9 + +* Fri Jan 31 2020 Fedora Release Engineering - 1.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Oct 03 2019 Miro Hrončok - 1.1-7 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Mon Aug 19 2019 Miro Hrončok - 1.1-6 +- Rebuilt for Python 3.8 + +* Sat Jul 27 2019 Fedora Release Engineering - 1.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jul 02 2018 Miro Hrončok - 1.1-2 +- Rebuilt for Python 3.7 + +* Thu Jun 28 2018 Alois Mahdal 1.1-1 +- Initial packaging. diff --git a/ydiff.spec b/ydiff.spec index 226cc45..8c5d15b 100644 --- a/ydiff.spec +++ b/ydiff.spec @@ -1,6 +1,6 @@ Name: ydiff Version: 1.5 -Release: 2%{?dist} +Release: %autorelease Summary: View colored, incremental diff URL: https://github.com/ymattw/ydiff # Automatically converted from old format: BSD - review is highly recommended. @@ -50,104 +50,4 @@ tests/regression.sh %{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info %changelog -* Mon Dec 15 2025 Alois Mahdal 1.5-2 -- Rebuilt to propagate typo fix in changelog - -* Mon Dec 15 2025 Alois Mahdal 1.5-1 -- Updated to 1.5 (RHBZ#2419728) - -* Fri Sep 19 2025 Python Maint - 1.4.2-6 -- Rebuilt for Python 3.14.0rc3 bytecode - -* Fri Aug 15 2025 Python Maint - 1.4.2-5 -- Rebuilt for Python 3.14.0rc2 bytecode - -* Fri Jul 25 2025 Fedora Release Engineering - 1.4.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Mon Jun 02 2025 Python Maint - 1.4.2-3 -- Rebuilt for Python 3.14 - -* Sun Jan 19 2025 Fedora Release Engineering - 1.4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Dec 13 2024 Alois Mahdal 1.4.2-1 -- Updated to 1.4.2 (RHBZ#2326989) - -* Thu Nov 14 2024 Alois Mahdal 1.4.1-1 -- Updated to 1.4.1 (RHBZ#2326169) - -* Wed Sep 04 2024 Miroslav Suchý - 1.3-4 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Jun 07 2024 Python Maint - 1.3-2 -- Rebuilt for Python 3.13 - -* Fri Apr 05 2024 Alois Mahdal 1.3-1 -- Updated to 1.3 - -* Sat Jan 27 2024 Fedora Release Engineering - 1.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jun 13 2023 Python Maint - 1.2-9 -- Rebuilt for Python 3.12 - -* Sat Jan 21 2023 Fedora Release Engineering - 1.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 13 2022 Python Maint - 1.2-6 -- Rebuilt for Python 3.11 - -* Sat Jan 22 2022 Fedora Release Engineering - 1.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 1.2-3 -- Rebuilt for Python 3.10 - -* Thu Jan 28 2021 Fedora Release Engineering - 1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Oct 29 2020 Alois Mahdal - 1.2-1 -- Updated upstream to 1.2 - -* Wed Jul 29 2020 Fedora Release Engineering - 1.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue May 26 2020 Miro Hrončok - 1.1-9 -- Rebuilt for Python 3.9 - -* Fri Jan 31 2020 Fedora Release Engineering - 1.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Oct 03 2019 Miro Hrončok - 1.1-7 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Mon Aug 19 2019 Miro Hrončok - 1.1-6 -- Rebuilt for Python 3.8 - -* Sat Jul 27 2019 Fedora Release Engineering - 1.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Jul 02 2018 Miro Hrončok - 1.1-2 -- Rebuilt for Python 3.7 - -* Thu Jun 28 2018 Alois Mahdal 1.1-1 -- Initial packaging. +%autochangelog From 65680bb95965619f3b122ca3c4a0b53facbf00f3 Mon Sep 17 00:00:00 2001 From: Alois Mahdal Date: Tue, 16 Dec 2025 01:57:49 +0100 Subject: [PATCH 16/20] Update license to proper SPDX id after review See https://gitlab.com/fedora/legal/fedora-license-data/-/issues/710 --- ydiff.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ydiff.spec b/ydiff.spec index 8c5d15b..e3e11df 100644 --- a/ydiff.spec +++ b/ydiff.spec @@ -3,8 +3,7 @@ Version: 1.5 Release: %autorelease Summary: View colored, incremental diff URL: https://github.com/ymattw/ydiff -# Automatically converted from old format: BSD - review is highly recommended. -License: LicenseRef-Callaway-BSD +License: BSD-3-Clause Source0: https://github.com/ymattw/ydiff/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: python3-devel BuildRequires: python3-setuptools From 881ee5317793ab85626f63fe04ac7c433efbe6f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 21:01:33 +0000 Subject: [PATCH 17/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 52ba3dfbb813fda88c9f86f607adfb43cce20ca5 Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Sat, 30 May 2026 19:40:58 -0300 Subject: [PATCH 18/20] spec modernization fixes rhbz#2378510 --- ydiff.spec | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/ydiff.spec b/ydiff.spec index e3e11df..424121f 100644 --- a/ydiff.spec +++ b/ydiff.spec @@ -5,8 +5,8 @@ Summary: View colored, incremental diff URL: https://github.com/ymattw/ydiff License: BSD-3-Clause Source0: https://github.com/ymattw/ydiff/archive/%{version}/%{name}-%{version}.tar.gz +BuildRequires: pyproject-rpm-macros BuildRequires: python3-devel -BuildRequires: python3-setuptools BuildRequires: less BuildArch: noarch @@ -19,34 +19,35 @@ a version-controlled workspace or from stdin, in side-by-side (similar to %package -n python3-%{name} Summary: %{summary} -%{?python_provide:%python_provide python3-%{name}} %description -n python3-%{name} Python library that implements API used by ydiff tool. %prep %autosetup -n %{name}-%{version} /usr/bin/sed -i '/#!\/usr\/bin\/env python/d' ydiff.py +%generate_buildrequires +%pyproject_buildrequires %build -%py3_build +%pyproject_wheel %check tests/regression.sh +%pyproject_check_import + # upstream pipeline uses `make test` which also has coverage # and linters but we don't do those here %install -%py3_install +%pyproject_install +%pyproject_save_files %{name} %files %doc README.rst %license LICENSE %{_bindir}/ydiff -%files -n python3-%{name} -%{python3_sitelib}/__pycache__/* -%{python3_sitelib}/%{name}.py -%{python3_sitelib}/%{name}-%{version}-py%{python3_version}.egg-info +%files -n python3-%{name} -f %{pyproject_files} %changelog %autochangelog From 60d61e1f6f0246c7b27b7889eddf8b1085628c21 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 3 Jun 2026 17:49:24 +0200 Subject: [PATCH 19/20] Rebuilt for Python 3.15 From 70d9b26d78042f33371b88ec587cb4d884ec916e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:33:59 +0000 Subject: [PATCH 20/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild