diff --git a/587979573442684E.gpg b/587979573442684E.gpg deleted file mode 100644 index 6aba9c2..0000000 Binary files a/587979573442684E.gpg and /dev/null differ diff --git a/abcde-normalize.patch b/abcde-2.7-normalize.patch similarity index 59% rename from abcde-normalize.patch rename to abcde-2.7-normalize.patch index 1df4384..5d0106b 100644 --- a/abcde-normalize.patch +++ b/abcde-2.7-normalize.patch @@ -1,7 +1,19 @@ -diff -up abcde-2.9/abcde.1.normalize abcde-2.9/abcde.1 ---- abcde-2.9/abcde.1.normalize 2018-03-08 01:22:48.000000000 +0100 -+++ abcde-2.9/abcde.1 2018-03-09 16:16:02.405903317 +0100 -@@ -385,7 +385,7 @@ At this point only \'ffmpeg\' is availab +diff -up abcde-2.7/abcde~ abcde-2.7/abcde +--- abcde-2.7/abcde~ 2015-06-18 15:26:40.000000000 +0300 ++++ abcde-2.7/abcde 2015-06-20 22:57:18.918621425 +0300 +@@ -3451,7 +3451,7 @@ MUSICBRAINZ=abcde-musicbrainz-tool + EJECT=eject + MD5SUM=md5sum + DISTMP3=distmp3 +-NORMALIZE=normalize-audio ++NORMALIZE=normalize + CDSPEED=eject + VORBISGAIN=vorbisgain + MP3GAIN=mp3gain +diff -up abcde-2.7/abcde.1~ abcde-2.7/abcde.1 +--- abcde-2.7/abcde.1~ 2015-06-18 15:26:40.000000000 +0300 ++++ abcde-2.7/abcde.1 2015-06-20 22:57:53.084714455 +0300 +@@ -345,7 +345,7 @@ Specifies the style of encoder to use fo .TP .B NORMALIZERSYNTAX Specifies the style of normalizer to use. Valid options are \'default\' @@ -10,7 +22,7 @@ diff -up abcde-2.9/abcde.1.normalize abcde-2.9/abcde.1 ATM. .TP .B CDROMREADERSYNTAX -@@ -669,7 +669,7 @@ ImageMagick package should be installed. +@@ -606,7 +606,7 @@ ImageMagick package should be installed. (optional) distmp3, a client/server for distributed mp3 encoding. .TP .B * @@ -19,8 +31,8 @@ diff -up abcde-2.9/abcde.1.normalize abcde-2.9/abcde.1 .TP .B * (optional) a replaygain file volume modifier (vorbisgain, metaflac, mp3gain, mpcgain, wvgain), -@@ -685,7 +685,7 @@ ImageMagick package should be installed. - .BR mid3v2 (1), +@@ -620,7 +620,7 @@ ImageMagick package should be installed. + .BR cdda2wav (1), .BR pird (1), .BR dagrab (1), -.BR normalize-audio (1), @@ -28,10 +40,10 @@ diff -up abcde-2.9/abcde.1.normalize abcde-2.9/abcde.1 .BR oggenc (1), .BR vorbize (1), .BR flac (1), -diff -up abcde-2.9/abcde.conf.normalize abcde-2.9/abcde.conf ---- abcde-2.9/abcde.conf.normalize 2018-03-08 01:22:48.000000000 +0100 -+++ abcde-2.9/abcde.conf 2018-03-09 16:16:02.405903317 +0100 -@@ -189,7 +189,7 @@ +diff -up abcde-2.7/abcde.conf~ abcde-2.7/abcde.conf +--- abcde-2.7/abcde.conf~ 2015-06-18 15:26:40.000000000 +0300 ++++ abcde-2.7/abcde.conf 2015-06-20 22:57:25.573857690 +0300 +@@ -162,7 +162,7 @@ #DISTMP3=distmp3 #VORBISCOMMENT=vorbiscomment #METAFLAC=metaflac @@ -40,22 +52,10 @@ diff -up abcde-2.9/abcde.conf.normalize abcde-2.9/abcde.conf #CDSPEED=eject #VORBISGAIN=vorbisgain #MKCUE=mkcue -diff -up abcde-2.9/abcde.normalize abcde-2.9/abcde ---- abcde-2.9/abcde.normalize 2018-03-09 16:16:02.404903308 +0100 -+++ abcde-2.9/abcde 2018-03-09 16:16:42.876271969 +0100 -@@ -3890,7 +3890,7 @@ MUSICBRAINZ=abcde-musicbrainz-tool - EJECT=eject - MD5SUM=md5sum - DISTMP3=distmp3 --NORMALIZE="normalize-audio" -+NORMALIZE="normalize" - CDSPEED=eject - VORBISGAIN=vorbisgain - MP3GAIN=mp3gain -diff -up abcde-2.9/README.normalize abcde-2.9/README ---- abcde-2.9/README.normalize 2018-03-08 01:22:48.000000000 +0100 -+++ abcde-2.9/README 2018-03-09 16:16:02.405903317 +0100 -@@ -218,7 +218,7 @@ Options added/modified from 2.1.1 to 2.1 +diff -up abcde-2.7/README~ abcde-2.7/README +--- abcde-2.7/README~ 2015-06-18 15:26:40.000000000 +0300 ++++ abcde-2.7/README 2015-06-20 22:56:51.829662255 +0300 +@@ -176,7 +176,7 @@ Options added/modified from 2.1.1 to 2.1 Options added/modified from 2.0.3 to 2.1.x: @@ -64,7 +64,7 @@ diff -up abcde-2.9/README.normalize abcde-2.9/README the songs, and a -g gapless option from lame to remove gaps. Only available for mp3+lame combination. * a new "normalize" option has been added to -a, to normalize the volume. -@@ -267,7 +267,7 @@ abcde requires the following backend too +@@ -225,7 +225,7 @@ abcde requires the following backend too * An Opus encoder )opusenc) or: * A Monkey's Ausio encoder (mac) or: * A WavPack encoder (wavpack) 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..eb655c4 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,28 +1,16 @@ Name: abcde -Version: 2.9.3 -Release: 19%{?dist} +Version: 2.7.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 -# gpg2 --recv-key 0x587979573442684E -# 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 +Patch0: %{name}-2.7-normalize.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 @@ -31,19 +19,9 @@ Requires: vorbis-tools # icedax for cd-text Recommends: icedax Recommends: flac -Suggests: cd-discid -Suggests: cdrdao -Suggests: ImageMagick -Suggests: lame -Suggests: libcdio-paranoia -Suggests: normalize Suggests: opus-tools Suggests: speex-tools -Suggests: twolame Suggests: wavpack -Suggests: vorbisgain -# eyeD3 is smaller than id3v2 -Suggests: %{_bindir}/eyeD3 Conflicts: python-eyed3 < 0.7.0 %description @@ -53,28 +31,29 @@ tags them, all in one go. %prep -%{gpgverify} --keyring='%{S:2}' --signature='%{S:1}' --data='%{S:0}' -%autosetup +%setup -q +%patch0 -p1 -F2 mv examples/cue2discid . sed -i -e 's|bin/python\b|bin/python3|' cue2discid -chmod -c -x examples/musicbrainz-get-tracks +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,112 +61,6 @@ 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) - -* Fri Mar 09 2018 Dominik Mierzejewski - 2.9-1 -- update to 2.9 (#1553139) -- rebase patches -- use autosetup macro - -* Wed Feb 21 2018 Dominik Mierzejewski - 2.8.1-6 -- 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 - -* Sun Jul 02 2017 Dominik Mierzejewski - 2.8.1-3 -- set the default CDDBMETHOD to cddb, as perl MusicBrainz modules are - not packaged -- add a weak dependency on lame, since mp3 encoding is now in Fedora 25+ - -* Fri Feb 10 2017 Fedora Release Engineering - 2.8.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Jan 19 2017 Dominik Mierzejewski - 2.8.1-1 -- Update to 2.8.1 - -* Wed Jan 18 2017 Dominik Mierzejewski - 2.8-1 -- Update to 2.8 -- Add the supported additional tools packaged in Fedora to Suggests: - -* Mon Dec 19 2016 Miro Hrončok - 2.7.2-2 -- Rebuild for Python 3.6 - * Sun Apr 10 2016 Dominik Mierzejewski - 2.7.2-1 - Update to 2.7.2 - Use HTTPS for URLs diff --git a/sources b/sources index 579479b..feb3d66 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (abcde-2.9.3.tar.gz) = 51a1dfa1f1d2dab6b8dad7d9f70d0139938151bc2dae0e9fc80da5385b4bba4d71c89a4d1b2dec5bd24787a542cb0caeacbef423cf32b8014cf6320c391b4236 -SHA512 (abcde-2.9.3.tar.gz.sign) = b3fe879beee77d21d5e97968345e9a267241e6e9f52b195eb39f325acbfd82bf7eee6c156168fb673f8011cc38c69d69900ce4d66959eb995ed64bca6dc79928 +f9455231436d80329eacedf32441d9be abcde-2.7.2.tar.gz