diff --git a/abcde-cddbmethod.patch b/abcde-cddbmethod.patch deleted file mode 100644 index 84b1604..0000000 --- a/abcde-cddbmethod.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up abcde-2.9/abcde.conf.method abcde-2.9/abcde.conf ---- abcde-2.9/abcde.conf.method 2018-03-09 16:32:30.780911417 +0100 -+++ abcde-2.9/abcde.conf 2018-03-09 16:33:30.555453030 +0100 -@@ -10,7 +10,7 @@ - # "cdtext". Default is "musicbrainz", but all can be specified in a - # comma delimited list to be tried sequentially. All the results will - # be displayed ready for user choice. --#CDDBMETHOD=musicbrainz -+CDDBMETHOD=cddb - - # If you wish to use a different CDDB server, edit this line. - # If you just wanted to use a proxy server, just set your http_proxy diff --git a/abcde-gnudb.patch b/abcde-gnudb.patch new file mode 100644 index 0000000..dc00ee0 --- /dev/null +++ b/abcde-gnudb.patch @@ -0,0 +1,31 @@ +--- ./abcde.conf~ 2019-02-05 03:19:03.000000000 -0700 ++++ ./abcde.conf 2021-01-15 18:07:27.125346596 -0700 +@@ -15,19 +15,24 @@ + # If you wish to use a different CDDB server, edit this line. + # If you just wanted to use a proxy server, just set your http_proxy + # environment variable - wget will use it correctly. +-#CDDBURL="http://freedb.freedb.org/~cddb/cddb.cgi" ++# In the past freedb.org was a popular choice but this service ++# was acquired and discontinued. The following may serve as ++# a replacemet ++#CDDBURL="http://gnudb.gnudb.org/~cddb/cddb.cgi" + + # The CDDB protocol level. + # Right now 5 is latin1 output and 6 is UTF8 encoding. + #CDDBPROTO=6 + + # The CDDB protocol requires hello information, including a valid username +-# and hostname. If you feel paranoid about giving away such info, edit this +-# line - the format is username@hostname. ++# and hostname. If you feel paranoid about giving away such info, edit ++# "HELLOINFO" line - the format is username@hostname. ++# Submissions to cddb actually require a valid email address which may, or may ++# not be like the following: + #HELLOINFO="`whoami`@`hostname`" + + # This controls the email address CDDB changes are submitted to. +-#CDDBSUBMIT=freedb-submit@freedb.org ++#CDDBSUBMIT=submit@gnudb.org + + # The following options control whether or not fetched CDDB entries + # are cached locally in $CDDBLOCALDIR diff --git a/abcde.spec b/abcde.spec index 2269d3c..3716ca4 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,10 +1,12 @@ Name: abcde Version: 2.9.3 -Release: 1%{?dist} +Release: 19%{?dist} Summary: A Better CD Encoder -# cddb-tool is Public Domain, otherwise GPLv2+ -License: GPLv2+ and Public Domain +# previously license field included Public Domain, but FOSSology scan of v2.9.3 did not +# turn up any public domain dedications other than a reference in an old changelog entry +# to a public domain mention that has since been removed upstream. +License: GPL-2.0-or-later URL: https://abcde.einval.com/ Source0: https://abcde.einval.com/download/%{name}-%{version}.tar.gz Source1: https://abcde.einval.com/download/%{name}-%{version}.tar.gz.sign @@ -12,11 +14,15 @@ Source1: https://abcde.einval.com/download/%{name}-%{version}.tar.gz.sign # gpg2 --export --export-options export-minimal 0x587979573442684E > 587979573442684E.gpg Source2: 587979573442684E.gpg Patch0: %{name}-normalize.patch -Patch1: %{name}-cddbmethod.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1916974 +Patch1: https://bugzilla.redhat.com/attachment.cgi?id=1748056#/abcde-gnudb.patch BuildArch: noarch BuildRequires: %{_bindir}/gpgv2 +BuildRequires: make +BuildRequires: perl-generators Requires: cd-discid +Requires: %{_bindir}/hostname Requires: wget Requires: which # cdparanoia, vorbis-tools for defaults @@ -47,30 +53,28 @@ tags them, all in one go. %prep -%{_bindir}/gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} +%{gpgverify} --keyring='%{S:2}' --signature='%{S:1}' --data='%{S:0}' %autosetup mv examples/cue2discid . sed -i -e 's|bin/python\b|bin/python3|' cue2discid -sed -i -e '/^abcde_version =/ s/2.9.1/%{version}/' Makefile -chmod -c -x abcde-musicbrainz-tool examples/musicbrainz-get-tracks +chmod -c -x examples/musicbrainz-get-tracks %build %install -rm -rf $RPM_BUILD_ROOT %make_install prefix=%{_prefix} sysconfdir=%{_sysconfdir} rm -r $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version} # handled separately install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir} -rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, missing perl(MusicBrainz::DiscID) %files %license COPYING -%doc FAQ README abcde-musicbrainz-tool changelog examples/ +%doc FAQ README changelog examples/ %config(noreplace) %{_sysconfdir}/abcde.conf %{_bindir}/abcde +%{_bindir}/abcde-musicbrainz-tool %{_bindir}/cddb-tool %{_bindir}/cue2discid %{_mandir}/man1/abcde.1* @@ -78,9 +82,69 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, missing perl(Mus %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 2.9.3-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Wed Jul 23 2025 Fedora Release Engineering - 2.9.3-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Thu Jan 16 2025 Fedora Release Engineering - 2.9.3-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Jul 17 2024 Fedora Release Engineering - 2.9.3-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 2.9.3-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 2.9.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 2.9.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Mar 16 2023 Jilayne Lovejoy - 2.9.3-12 +- migrated to SPDX license + +* Wed Jan 18 2023 Fedora Release Engineering - 2.9.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 2.9.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jan 19 2022 Fedora Release Engineering - 2.9.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 2.9.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sat May 22 2021 Dominik Mierzejewski - 2.9.3-7 +- point to gnudb.org instead of the discontinued freedb.org (#1916974) + +* Mon Jan 25 2021 Fedora Release Engineering - 2.9.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 2.9.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Oct 29 2019 Dominik Mierzejewski - 2.9.3-3 +- MusicBrainz lookup support for abcde (#1758816) +- use gpgverify macro +- add missing BR: perl-generators to generate perl dependencies +- add Requires: hostname which might be missing on minimal installs + +* Wed Jul 24 2019 Fedora Release Engineering - 2.9.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Feb 05 2019 Dominik Mierzejewski - 2.9.3-1 - update to 2.9.3 (#1672604) +* Thu Jan 31 2019 Fedora Release Engineering - 2.9.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Aug 04 2018 Dominik Mierzejewski - 2.9.2-1 - update to 2.9.2 (#1611854) - fix version typo in Makefile