diff --git a/abcde-cddbmethod.patch b/abcde-cddbmethod.patch new file mode 100644 index 0000000..84b1604 --- /dev/null +++ b/abcde-cddbmethod.patch @@ -0,0 +1,12 @@ +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 deleted file mode 100644 index dc00ee0..0000000 --- a/abcde-gnudb.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- ./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 3716ca4..99400af 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,12 +1,10 @@ Name: abcde -Version: 2.9.3 -Release: 19%{?dist} +Version: 2.9.2 +Release: 1%{?dist} Summary: A Better CD Encoder -# 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 +# cddb-tool is Public Domain, otherwise GPLv2+ +License: GPLv2+ and Public Domain 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 @@ -14,15 +12,11 @@ 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 -# https://bugzilla.redhat.com/show_bug.cgi?id=1916974 -Patch1: https://bugzilla.redhat.com/attachment.cgi?id=1748056#/abcde-gnudb.patch +Patch1: %{name}-cddbmethod.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 @@ -53,28 +47,30 @@ tags them, all in one go. %prep -%{gpgverify} --keyring='%{S:2}' --signature='%{S:1}' --data='%{S:0}' +%{_bindir}/gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} %autosetup mv examples/cue2discid . sed -i -e 's|bin/python\b|bin/python3|' cue2discid -chmod -c -x examples/musicbrainz-get-tracks +sed -i -e '/^abcde_version =/ s/2.9.1/%{version}/' Makefile +chmod -c -x abcde-musicbrainz-tool 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 changelog examples/ +%doc FAQ README abcde-musicbrainz-tool changelog examples/ %config(noreplace) %{_sysconfdir}/abcde.conf %{_bindir}/abcde -%{_bindir}/abcde-musicbrainz-tool %{_bindir}/cddb-tool %{_bindir}/cue2discid %{_mandir}/man1/abcde.1* @@ -82,76 +78,10 @@ install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir} %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 -* Thu Jul 12 2018 Fedora Release Engineering - 2.9.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - * Thu Mar 15 2018 Dominik Mierzejewski - 2.9.1-1 - update to 2.9.1 (#1553948) @@ -160,13 +90,10 @@ install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir} - rebase patches - use autosetup macro -* Wed Feb 21 2018 Dominik Mierzejewski - 2.8.1-6 +* Wed Feb 21 2018 Dominik Mierzejewski - 2.8.1-5 - add Suggests for twolame, now that's included in Fedora 27+ (#1534297) - verify GPG signature for the source tarball -* Wed Feb 07 2018 Fedora Release Engineering - 2.8.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - * Wed Jul 26 2017 Fedora Release Engineering - 2.8.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 579479b..62c4f27 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (abcde-2.9.3.tar.gz) = 51a1dfa1f1d2dab6b8dad7d9f70d0139938151bc2dae0e9fc80da5385b4bba4d71c89a4d1b2dec5bd24787a542cb0caeacbef423cf32b8014cf6320c391b4236 -SHA512 (abcde-2.9.3.tar.gz.sign) = b3fe879beee77d21d5e97968345e9a267241e6e9f52b195eb39f325acbfd82bf7eee6c156168fb673f8011cc38c69d69900ce4d66959eb995ed64bca6dc79928 +SHA512 (abcde-2.9.2.tar.gz) = ef0048edf040ed5afee6fdd77377800ec02a3ba323647edd6d384679671b47eee63d8bd1c72ce6fe5ed3ab087a3d7f4024ab39e644be4ab8a92f5c5c0ddabfb5 +SHA512 (abcde-2.9.2.tar.gz.sign) = 50ee8da4bddbde1e25e3939ceec84633b3996287726fbbab86b501970a0e1dfa647471c345093e1007d58321b573c31d9c23b38f2429b66924aab7278f5ebb52