From 7e577e782c6e84543999d736b2dc19145ad914b9 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Mon, 24 Apr 2023 18:22:43 +0100 Subject: [PATCH 01/20] SPDX migration. --- whipper.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/whipper.spec b/whipper.spec index f39a217..f4ae253 100644 --- a/whipper.spec +++ b/whipper.spec @@ -5,10 +5,10 @@ Name: %{srcname} Version: 0.10.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: %{sum} URL: https://github.com/whipper-team/whipper -License: GPLv3+ +License: GPL-3.0-or-later Source0: https://github.com/whipper-team/%{srcname}/archive/v%{version}.tar.gz @@ -69,6 +69,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/com.github.wh %doc README.md TODO CHANGELOG.md HACKING COVERAGE %changelog +* Mon Apr 24 2023 Peter Oliver - 0.10.0-9 +- SPDX migration. + * Sat Jan 21 2023 Fedora Release Engineering - 0.10.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 3d66985e3c781b50e696d0e33356d7e96d12c0d4 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 22:02:53 +0200 Subject: [PATCH 02/20] Rebuilt for Python 3.12 --- whipper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whipper.spec b/whipper.spec index f4ae253..94b1a58 100644 --- a/whipper.spec +++ b/whipper.spec @@ -5,7 +5,7 @@ Name: %{srcname} Version: 0.10.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: %{sum} URL: https://github.com/whipper-team/whipper License: GPL-3.0-or-later @@ -69,6 +69,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/com.github.wh %doc README.md TODO CHANGELOG.md HACKING COVERAGE %changelog +* Tue Jun 13 2023 Python Maint - 0.10.0-10 +- Rebuilt for Python 3.12 + * Mon Apr 24 2023 Peter Oliver - 0.10.0-9 - SPDX migration. From ea472b3192f0b88596db0e1a176bf080e5c0eba7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:11:09 +0000 Subject: [PATCH 03/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- whipper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whipper.spec b/whipper.spec index 94b1a58..8405ac9 100644 --- a/whipper.spec +++ b/whipper.spec @@ -5,7 +5,7 @@ Name: %{srcname} Version: 0.10.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: %{sum} URL: https://github.com/whipper-team/whipper License: GPL-3.0-or-later @@ -69,6 +69,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/com.github.wh %doc README.md TODO CHANGELOG.md HACKING COVERAGE %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.10.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jun 13 2023 Python Maint - 0.10.0-10 - Rebuilt for Python 3.12 From 257ecf5480d95f1afe58bb7cd7e11d938420f3f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:44:32 +0000 Subject: [PATCH 04/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- whipper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whipper.spec b/whipper.spec index 8405ac9..5f831a6 100644 --- a/whipper.spec +++ b/whipper.spec @@ -5,7 +5,7 @@ Name: %{srcname} Version: 0.10.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: %{sum} URL: https://github.com/whipper-team/whipper License: GPL-3.0-or-later @@ -69,6 +69,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/com.github.wh %doc README.md TODO CHANGELOG.md HACKING COVERAGE %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.10.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0.10.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 9c781286da9fa18ff1eb25f5907840e9b5bb1993 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 10:04:30 +0200 Subject: [PATCH 05/20] Rebuilt for Python 3.13 --- whipper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whipper.spec b/whipper.spec index 5f831a6..5894113 100644 --- a/whipper.spec +++ b/whipper.spec @@ -5,7 +5,7 @@ Name: %{srcname} Version: 0.10.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: %{sum} URL: https://github.com/whipper-team/whipper License: GPL-3.0-or-later @@ -69,6 +69,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/com.github.wh %doc README.md TODO CHANGELOG.md HACKING COVERAGE %changelog +* Fri Jun 07 2024 Python Maint - 0.10.0-13 +- Rebuilt for Python 3.13 + * Sat Jan 27 2024 Fedora Release Engineering - 0.10.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From cbdc196fc53b610558c017a8a9bf20db194ba988 Mon Sep 17 00:00:00 2001 From: Matthew Martin Date: Mon, 1 Jul 2024 01:33:19 +0200 Subject: [PATCH 06/20] Cherry pick commit from upstream that updates now deprecated usage of dump in ruamel.yaml --- 543.patch | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++ whipper.spec | 10 ++++- 2 files changed, 117 insertions(+), 2 deletions(-) create mode 100644 543.patch diff --git a/543.patch b/543.patch new file mode 100644 index 0000000..206547e --- /dev/null +++ b/543.patch @@ -0,0 +1,109 @@ +From e0942417a1c267781a8b676789730457dcb2e6fa Mon Sep 17 00:00:00 2001 +From: Martin Weinelt +Date: Sun, 20 Jun 2021 15:18:37 +0200 +Subject: [PATCH] Use custom YAML subclass to be compatible with + ruamel_yaml>=0.17 + +Signed-off-by: Martin Weinelt +--- + whipper/common/yaml.py | 18 ++++++++++++++++++ + whipper/result/logger.py | 11 ++++++----- + whipper/test/test_result_logger.py | 14 ++++++-------- + 3 files changed, 30 insertions(+), 13 deletions(-) + create mode 100644 whipper/common/yaml.py + +diff --git a/whipper/common/yaml.py b/whipper/common/yaml.py +new file mode 100644 +index 00000000..4edb0b36 +--- /dev/null ++++ b/whipper/common/yaml.py +@@ -0,0 +1,18 @@ ++from ruamel.yaml import YAML as ruamel_YAML ++from ruamel.yaml.compat import StringIO ++ ++# https://yaml.readthedocs.io/en/latest/example.html#output-of-dump-as-a-string ++class YAML(ruamel_YAML): ++ def __init__(self, *args, **kwargs): ++ super().__init__() ++ self.width = 4000 ++ self.default_flow_style = False ++ ++ def dump(self, data, stream=None, **kw): ++ inefficient = False ++ if stream is None: ++ inefficient = True ++ stream = StringIO() ++ ruamel_YAML.dump(self, data, stream, **kw) ++ if inefficient: ++ return stream.getvalue() +diff --git a/whipper/result/logger.py b/whipper/result/logger.py +index b7043adc..f4471a00 100644 +--- a/whipper/result/logger.py ++++ b/whipper/result/logger.py +@@ -1,12 +1,12 @@ + import time + import hashlib + import re +-import ruamel.yaml as yaml + from ruamel.yaml.comments import CommentedMap as OrderedDict + + import whipper + + from whipper.common import common ++from whipper.common.yaml import YAML + from whipper.result import result + + +@@ -148,11 +148,12 @@ def logRip(self, ripResult, epoch): + data["EOF"] = "End of status report" + riplog["Conclusive status report"] = data + ++ yaml = YAML( ++ typ="rt", ++ pure=True ++ ) + riplog = yaml.dump( +- riplog, +- default_flow_style=False, +- width=4000, +- Dumper=yaml.RoundTripDumper ++ riplog + ) + # Add a newline after the "Log creation date" line + riplog = re.sub( +diff --git a/whipper/test/test_result_logger.py b/whipper/test/test_result_logger.py +index 411b61af..98c89ab5 100644 +--- a/whipper/test/test_result_logger.py ++++ b/whipper/test/test_result_logger.py +@@ -3,8 +3,8 @@ + import os + import re + import unittest +-import ruamel.yaml + ++from whipper.common.yaml import YAML + from whipper.result.result import TrackResult, RipResult + from whipper.result.logger import WhipperLogger + +@@ -163,16 +163,14 @@ def testLogger(self): + )) + ) + +- yaml = ruamel.yaml.YAML() ++ yaml = YAML( ++ typ='rt', ++ pure=True ++ ) + parsedLog = yaml.load(actual) + self.assertEqual( + actual, +- ruamel.yaml.dump( +- parsedLog, +- default_flow_style=False, +- width=4000, +- Dumper=ruamel.yaml.RoundTripDumper +- ) ++ yaml.dump(parsedLog) + ) + log_body = "\n".join(actualLines[:-1]).encode() + self.assertEqual( diff --git a/whipper.spec b/whipper.spec index 5894113..b4a821c 100644 --- a/whipper.spec +++ b/whipper.spec @@ -5,12 +5,15 @@ Name: %{srcname} Version: 0.10.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: %{sum} URL: https://github.com/whipper-team/whipper License: GPL-3.0-or-later Source0: https://github.com/whipper-team/%{srcname}/archive/v%{version}.tar.gz +# Fix now deprecated usage of dump in ruamel.yaml causing crash (https://github.com/whipper-team/whipper/issues/626) +# Cherry pick commit fixing this from upstream +Patch: https://patch-diff.githubusercontent.com/raw/whipper-team/whipper/pull/543.patch BuildRequires: python3-devel BuildRequires: python3-setuptools @@ -41,7 +44,7 @@ ExcludeArch: s390x %{desc} %prep -%autosetup +%autosetup -p1 %build export SETUPTOOLS_SCM_PRETEND_VERSION=%{version} @@ -69,6 +72,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/com.github.wh %doc README.md TODO CHANGELOG.md HACKING COVERAGE %changelog +* Mon Jul 01 2024 Matthew Martin - 0.10.0-14 +- Cherry pick commit from upstream that updates now deprecated usage of dump in ruamel.yaml + * Fri Jun 07 2024 Python Maint - 0.10.0-13 - Rebuilt for Python 3.13 From 0e733da635e42fdfec9a03c792a4a95844f62c64 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:19:05 +0000 Subject: [PATCH 07/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- whipper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/whipper.spec b/whipper.spec index b4a821c..fc3d4c2 100644 --- a/whipper.spec +++ b/whipper.spec @@ -5,7 +5,7 @@ Name: %{srcname} Version: 0.10.0 -Release: 14%{?dist} +Release: 15%{?dist} Summary: %{sum} URL: https://github.com/whipper-team/whipper License: GPL-3.0-or-later @@ -72,6 +72,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/com.github.wh %doc README.md TODO CHANGELOG.md HACKING COVERAGE %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.10.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jul 01 2024 Matthew Martin - 0.10.0-14 - Cherry pick commit from upstream that updates now deprecated usage of dump in ruamel.yaml From 5a0a0b6e982559e9a83b0a466fb136efb0bae573 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Sun, 19 Jan 2025 13:47:07 +0000 Subject: [PATCH 08/20] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++ whipper.spec | 159 +-------------------------------------------------- 2 files changed, 158 insertions(+), 157 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..7fece2f --- /dev/null +++ b/changelog @@ -0,0 +1,156 @@ +* Sat Jul 20 2024 Fedora Release Engineering - 0.10.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jul 01 2024 Matthew Martin - 0.10.0-14 +- Cherry pick commit from upstream that updates now deprecated usage of dump in ruamel.yaml + +* Fri Jun 07 2024 Python Maint - 0.10.0-13 +- Rebuilt for Python 3.13 + +* Sat Jan 27 2024 Fedora Release Engineering - 0.10.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 0.10.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jun 13 2023 Python Maint - 0.10.0-10 +- Rebuilt for Python 3.12 + +* Mon Apr 24 2023 Peter Oliver - 0.10.0-9 +- SPDX migration. + +* Sat Jan 21 2023 Fedora Release Engineering - 0.10.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 0.10.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 0.10.0-6 +- Rebuilt for Python 3.11 + +* Sat Jan 22 2022 Fedora Release Engineering - 0.10.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 0.10.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 0.10.0-3 +- Rebuilt for Python 3.10 + +* Mon May 24 2021 Matthew Ruszczyk - 0.10.0-2 +- Include new python3-discid dependency + +* Mon May 17 2021 Matthew Ruszczyk - 0.10.0-1 +- Update to 0.10.0 + +* Wed Jan 27 2021 Fedora Release Engineering - 0.9.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.9.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 0.9.0-8 +- Rebuilt for Python 3.9 + +* Tue Mar 31 2020 Adrian Reber - 0.9.0-7 +- Rebuilt for libcdio-2.1.0 + +* Thu Mar 12 2020 Matthew Ruszczyk - 0.9.0-6 +- Bump release for rebuild + +* Thu Mar 12 2020 Matthew Ruszczyk - 0.9.0-5 +- Bump release for rebuild + +* Tue Mar 10 2020 Matthew Ruszczyk - 0.9.0-4 +- Bump release for rebuild due to Koji outage + +* Tue Mar 10 2020 Matthew Ruszczyk - 0.9.0-3 +- Adjust pycdio to require python3 version + +* Fri Jan 31 2020 Fedora Release Engineering - 0.9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Dec 04 2019 Matthew Ruszczyk - 0.9.0-1 +- Update to release of 0.9.0 + +* Mon Dec 02 2019 Matthew Ruszczyk - 0.9.0-0.1 +- Prerelease of 0.9.0, intended to comply with impending Py2 retirement + +* Sat Jul 27 2019 Fedora Release Engineering - 0.7.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 0.7.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Dec 17 2018 Matthew Ruszczyk - 0.7.3-1 +- Update to 0.7.3 + +* Thu Nov 01 2018 Matthew Ruszczyk - 0.7.2-3 +- Adjustment to metainfodir fix + +* Thu Nov 01 2018 Matthew Ruszczyk - 0.7.2-2 +- Fix metainfodir on f27 + +* Thu Nov 01 2018 Matthew Ruszczyk - 0.7.2-1 +- Update to version 0.7.2 + +* Tue Oct 23 2018 Matthew Ruszczyk - 0.7.1-1 +- Update to version 0.7.1 + +* Mon Oct 22 2018 Matthew Ruszczyk - 0.7.0-3 +- New upstream repository + +* Sat Jul 14 2018 Fedora Release Engineering - 0.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Apr 16 2018 Matthew Ruszczyk - 0.7.0-1 +- Update to version 0.7.0. + +* Tue Feb 20 2018 Matthew Ruszczyk - 0.6.0-7 +- Exclude s390x due to missing cdrdao dependency. + +* Sat Feb 17 2018 Matthew Ruszczyk - 0.6.0-6 +- Added gcc build requirement. + +* Tue Feb 13 2018 Matthew Ruszczyk - 0.6.0-5 +- Fix missing python2-setuptools requirement. + +* Mon Feb 12 2018 Matthew Ruszczyk - 0.6.0-4 +- Fix ownership of directories and returned to a single package. + +* Wed Feb 7 2018 Matthew Ruszczyk - 0.6.0-3 +- Fix incorrect gobject dependency. + +* Fri Feb 2 2018 Matthew Ruszczyk - 0.6.0-2 +- Split Requires into separate lines and commenting patch. + +* Fri Feb 2 2018 Matthew Ruszczyk - 0.6.0-1 +- Update to version 0.6.0. + +* Tue Jan 23 2018 Matthew Ruszczyk - 0.5.1-5 +- Adjust accuraterip patch to include debug info. + +* Tue Jun 27 2017 Matthew Ruszczyk - 0.5.1-4 +- Move python2 sitelib into python2 subpackage. + +* Tue Apr 25 2017 Matthew Ruszczyk - 0.5.1-3 +- Added license and doc macros to conform with proper best practices. + +* Mon Apr 24 2017 Matthew Ruszczyk - 0.5.1-2 +- Remove libsndfile dependency, rpm picks that up on build. + +* Mon Apr 24 2017 Matthew Ruszczyk - 0.5.1-1 +- Version 0.5.1 + +* Sun Jan 8 2017 Matthew Ruszczyk - 0.4.2-1 +- Version 0.4.2 released. Removal of submodule logic. + +* Wed Dec 21 2016 Matthew Ruszczyk - 0.4.0-3 +- Fixed setup macro and patches accuraterip-checksum to the correct bin + directory + +* Wed Dec 21 2016 Matthew Ruszczyk - 0.4.0-2 +- Added forgotten python2 requirement + +* Wed Dec 21 2016 Matthew Ruszczyk - 0.4.0-1 +- Initial RPM release diff --git a/whipper.spec b/whipper.spec index fc3d4c2..046b526 100644 --- a/whipper.spec +++ b/whipper.spec @@ -5,7 +5,7 @@ Name: %{srcname} Version: 0.10.0 -Release: 15%{?dist} +Release: %autorelease Summary: %{sum} URL: https://github.com/whipper-team/whipper License: GPL-3.0-or-later @@ -72,159 +72,4 @@ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/com.github.wh %doc README.md TODO CHANGELOG.md HACKING COVERAGE %changelog -* Sat Jul 20 2024 Fedora Release Engineering - 0.10.0-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jul 01 2024 Matthew Martin - 0.10.0-14 -- Cherry pick commit from upstream that updates now deprecated usage of dump in ruamel.yaml - -* Fri Jun 07 2024 Python Maint - 0.10.0-13 -- Rebuilt for Python 3.13 - -* Sat Jan 27 2024 Fedora Release Engineering - 0.10.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 0.10.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jun 13 2023 Python Maint - 0.10.0-10 -- Rebuilt for Python 3.12 - -* Mon Apr 24 2023 Peter Oliver - 0.10.0-9 -- SPDX migration. - -* Sat Jan 21 2023 Fedora Release Engineering - 0.10.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 0.10.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 13 2022 Python Maint - 0.10.0-6 -- Rebuilt for Python 3.11 - -* Sat Jan 22 2022 Fedora Release Engineering - 0.10.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 0.10.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 0.10.0-3 -- Rebuilt for Python 3.10 - -* Mon May 24 2021 Matthew Ruszczyk - 0.10.0-2 -- Include new python3-discid dependency - -* Mon May 17 2021 Matthew Ruszczyk - 0.10.0-1 -- Update to 0.10.0 - -* Wed Jan 27 2021 Fedora Release Engineering - 0.9.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 0.9.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue May 26 2020 Miro Hrončok - 0.9.0-8 -- Rebuilt for Python 3.9 - -* Tue Mar 31 2020 Adrian Reber - 0.9.0-7 -- Rebuilt for libcdio-2.1.0 - -* Thu Mar 12 2020 Matthew Ruszczyk - 0.9.0-6 -- Bump release for rebuild - -* Thu Mar 12 2020 Matthew Ruszczyk - 0.9.0-5 -- Bump release for rebuild - -* Tue Mar 10 2020 Matthew Ruszczyk - 0.9.0-4 -- Bump release for rebuild due to Koji outage - -* Tue Mar 10 2020 Matthew Ruszczyk - 0.9.0-3 -- Adjust pycdio to require python3 version - -* Fri Jan 31 2020 Fedora Release Engineering - 0.9.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Dec 04 2019 Matthew Ruszczyk - 0.9.0-1 -- Update to release of 0.9.0 - -* Mon Dec 02 2019 Matthew Ruszczyk - 0.9.0-0.1 -- Prerelease of 0.9.0, intended to comply with impending Py2 retirement - -* Sat Jul 27 2019 Fedora Release Engineering - 0.7.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 0.7.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Dec 17 2018 Matthew Ruszczyk - 0.7.3-1 -- Update to 0.7.3 - -* Thu Nov 01 2018 Matthew Ruszczyk - 0.7.2-3 -- Adjustment to metainfodir fix - -* Thu Nov 01 2018 Matthew Ruszczyk - 0.7.2-2 -- Fix metainfodir on f27 - -* Thu Nov 01 2018 Matthew Ruszczyk - 0.7.2-1 -- Update to version 0.7.2 - -* Tue Oct 23 2018 Matthew Ruszczyk - 0.7.1-1 -- Update to version 0.7.1 - -* Mon Oct 22 2018 Matthew Ruszczyk - 0.7.0-3 -- New upstream repository - -* Sat Jul 14 2018 Fedora Release Engineering - 0.7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Apr 16 2018 Matthew Ruszczyk - 0.7.0-1 -- Update to version 0.7.0. - -* Tue Feb 20 2018 Matthew Ruszczyk - 0.6.0-7 -- Exclude s390x due to missing cdrdao dependency. - -* Sat Feb 17 2018 Matthew Ruszczyk - 0.6.0-6 -- Added gcc build requirement. - -* Tue Feb 13 2018 Matthew Ruszczyk - 0.6.0-5 -- Fix missing python2-setuptools requirement. - -* Mon Feb 12 2018 Matthew Ruszczyk - 0.6.0-4 -- Fix ownership of directories and returned to a single package. - -* Wed Feb 7 2018 Matthew Ruszczyk - 0.6.0-3 -- Fix incorrect gobject dependency. - -* Fri Feb 2 2018 Matthew Ruszczyk - 0.6.0-2 -- Split Requires into separate lines and commenting patch. - -* Fri Feb 2 2018 Matthew Ruszczyk - 0.6.0-1 -- Update to version 0.6.0. - -* Tue Jan 23 2018 Matthew Ruszczyk - 0.5.1-5 -- Adjust accuraterip patch to include debug info. - -* Tue Jun 27 2017 Matthew Ruszczyk - 0.5.1-4 -- Move python2 sitelib into python2 subpackage. - -* Tue Apr 25 2017 Matthew Ruszczyk - 0.5.1-3 -- Added license and doc macros to conform with proper best practices. - -* Mon Apr 24 2017 Matthew Ruszczyk - 0.5.1-2 -- Remove libsndfile dependency, rpm picks that up on build. - -* Mon Apr 24 2017 Matthew Ruszczyk - 0.5.1-1 -- Version 0.5.1 - -* Sun Jan 8 2017 Matthew Ruszczyk - 0.4.2-1 -- Version 0.4.2 released. Removal of submodule logic. - -* Wed Dec 21 2016 Matthew Ruszczyk - 0.4.0-3 -- Fixed setup macro and patches accuraterip-checksum to the correct bin - directory - -* Wed Dec 21 2016 Matthew Ruszczyk - 0.4.0-2 -- Added forgotten python2 requirement - -* Wed Dec 21 2016 Matthew Ruszczyk - 0.4.0-1 -- Initial RPM release +%autochangelog From c6d871678ab0d4b7b6630c88bb45069c59e9c410 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:59:29 +0000 Subject: [PATCH 09/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 9044d551d0870c0e6bf662896622b3d913a18590 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 21:24:48 +0200 Subject: [PATCH 10/20] Rebuilt for Python 3.14 From de36f2bc26a2fe143b1e79e7c443de623e4fa389 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Wed, 9 Jul 2025 13:04:59 +0100 Subject: [PATCH 11/20] Modernize .spec, fixing rhbz#2378504. --- whipper.spec | 67 +++++++++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/whipper.spec b/whipper.spec index 046b526..f0c2e65 100644 --- a/whipper.spec +++ b/whipper.spec @@ -1,58 +1,62 @@ -%global srcname whipper -%global sum Python CD-DA ripper preferring accuracy over speed -%global desc CD ripper preferring accuracy over speed - - -Name: %{srcname} +Name: whipper Version: 0.10.0 Release: %autorelease -Summary: %{sum} +Summary: Python CD-DA ripper preferring accuracy over speed URL: https://github.com/whipper-team/whipper License: GPL-3.0-or-later +Source: https://github.com/whipper-team/%{name}/archive/v%{version}.tar.gz -Source0: https://github.com/whipper-team/%{srcname}/archive/v%{version}.tar.gz # Fix now deprecated usage of dump in ruamel.yaml causing crash (https://github.com/whipper-team/whipper/issues/626) # Cherry pick commit fixing this from upstream Patch: https://patch-diff.githubusercontent.com/raw/whipper-team/whipper/pull/543.patch -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-setuptools_scm BuildRequires: gcc BuildRequires: libsndfile-devel BuildRequires: libappstream-glib +BuildRequires: python3dist(musicbrainzngs) +BuildRequires: python3dist(mutagen) +BuildRequires: python3dist(pycdio) +BuildRequires: python3dist(pygobject) +BuildRequires: python3dist(ruamel-yaml) +BuildRequires: python3dist(twisted) Requires: cdrdao -Requires: libcdio-paranoia -Requires: gobject-introspection -Requires: python3-gobject -Requires: python3-setuptools -Requires: python3-musicbrainzngs -Requires: python3-mutagen -Requires: python3-requests -Requires: python3-ruamel-yaml -Requires: python3-pycdio -Requires: python3-discid Requires: flac +Requires: libcdio-paranoia +Requires: python3dist(discid) +Requires: python3dist(musicbrainzngs) +Requires: python3dist(mutagen) +Requires: python3dist(pycdio) +Requires: python3dist(pygobject) +Requires: python3dist(ruamel-yaml) Requires: sox # Exclude s390x due to missing cdrdao dep ExcludeArch: s390x + %description -%{desc} +CD ripper preferring accuracy over speed + %prep %autosetup -p1 + +%generate_buildrequires +%pyproject_buildrequires + + %build export SETUPTOOLS_SCM_PRETEND_VERSION=%{version} -%py3_build +%pyproject_wheel + %install export SETUPTOOLS_SCM_PRETEND_VERSION=%{version} -%py3_install +%pyproject_install +%pyproject_save_files -l %{name} 'accuraterip*' %if "%_metainfodir" != "%{_datadir}/metainfo" mv %{buildroot}%{_datadir}/metainfo/ \ @@ -61,15 +65,18 @@ mv %{buildroot}%{_datadir}/metainfo/ \ appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/com.github.whipper_team.Whipper.metainfo.xml -%files + +%check +%pyproject_check_import + + +%files -f %{pyproject_files} +%doc CHANGELOG.md +%doc README.md %{_bindir}/whipper %{_bindir}/accuraterip-checksum %{_metainfodir}/com.github.whipper_team.Whipper.metainfo.xml -%{python3_sitearch}/%{srcname}/ -%{python3_sitearch}/%{srcname}-*.egg-info/ -%{python3_sitearch}/accuraterip* -%license LICENSE -%doc README.md TODO CHANGELOG.md HACKING COVERAGE + %changelog %autochangelog From 362b44d33da787d37d1177c04567f6b23ab69523 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:24:24 +0000 Subject: [PATCH 12/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 6e21b115f3198a3a059971302de2a277aaaabb86 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:23:00 +0200 Subject: [PATCH 13/20] Rebuilt for Python 3.14.0rc2 bytecode From 9d4699e4a4b190223c9fc61ba908333b7d2f9ba8 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 15:03:27 +0200 Subject: [PATCH 14/20] Rebuilt for Python 3.14.0rc3 bytecode From 065659c5ecb7b44f2a2d2d75e67853ed22eff572 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:13:36 +0000 Subject: [PATCH 15/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From da35e4d616cd35146c0e91294ea5578beb1a6e6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= Date: Mon, 4 May 2026 11:25:57 +0200 Subject: [PATCH 16/20] Add BuildRequires on python3-pkg-resources for setuptools 82 compatibility Setuptools 82 dropped pkg_resources from the setuptools distribution. Add explicit build dependency on the compat package. Assisted-by: Cursor --- whipper.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/whipper.spec b/whipper.spec index f0c2e65..caf68cc 100644 --- a/whipper.spec +++ b/whipper.spec @@ -19,6 +19,7 @@ BuildRequires: python3dist(pycdio) BuildRequires: python3dist(pygobject) BuildRequires: python3dist(ruamel-yaml) BuildRequires: python3dist(twisted) +BuildRequires: python3-pkg-resources Requires: cdrdao Requires: flac From 8c834ebd845dac83b5c74aab66e05038e653752f Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Tue, 12 May 2026 23:00:05 +0100 Subject: [PATCH 17/20] Packit. --- .packit.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .packit.yaml diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..ac1b57a --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,19 @@ +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +jobs: + - job: pull_from_upstream + trigger: release + dist_git_branches: + rawhide: + fast_forward_merge_into: + - fedora-branched + - job: koji_build + trigger: commit + dist_git_branches: + - fedora-all + - job: bodhi_update + trigger: commit + dist_git_branches: + - fedora-branched +version_update_mask: \d+\.\d+\. From 695aa0aef2480c2d5b1a00fa60a2d57264aa0beb Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 5 Jun 2026 00:05:46 +0200 Subject: [PATCH 18/20] Rebuilt for Python 3.15 From 2424d6cb4d25b58bb5afe45bed5e12e8e602d871 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:47:56 +0000 Subject: [PATCH 19/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild From ba491af74579d8809c38e51ea214a801abd3b31c Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 22 Jul 2026 10:41:17 +0200 Subject: [PATCH 20/20] Rebuilt for Python 3.15.0b4 ABI change