From 8c4c4b7400f5709f0e6679f830d4b5e4a30e8077 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Mon, 19 Dec 2016 18:20:36 +0100
Subject: [PATCH 01/38] Rebuild for Python 3.6

---
 abcde.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abcde.spec b/abcde.spec
index eb655c4..8a1b306 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.7.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Better CD Encoder
 
 # cddb-tool is Public Domain, otherwise GPLv2+
@@ -61,6 +61,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, missing perl(Mus
 
 
 %changelog
+* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 2.7.2-2
+- Rebuild for Python 3.6
+
 * Sun Apr 10 2016 Dominik Mierzejewski <rpm@greysector.net> - 2.7.2-1
 - Update to 2.7.2
 - Use HTTPS for URLs

From 89f8d5ab7e1f0d45918730b127931c2b132238d9 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Wed, 18 Jan 2017 14:51:50 +0100
Subject: [PATCH 02/38] Update to 2.8

Add the supported additional tools packaged in Fedora to Suggests:
---
 abcde.spec | 16 ++++++++++++++--
 sources    |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/abcde.spec b/abcde.spec
index 8a1b306..974ed1e 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
-Version:        2.7.2
-Release:        2%{?dist}
+Version:        2.8
+Release:        1%{?dist}
 Summary:        A Better CD Encoder
 
 # cddb-tool is Public Domain, otherwise GPLv2+
@@ -19,9 +19,17 @@ Requires:       vorbis-tools
 # icedax for cd-text
 Recommends:     icedax
 Recommends:     flac
+Suggests:       cd-discid
+Suggests:       cdrdao
+Suggests:       ImageMagick
+Suggests:       libcdio-paranoia
+Suggests:       normalize
 Suggests:       opus-tools
 Suggests:       speex-tools
 Suggests:       wavpack
+Suggests:       vorbisgain
+# eyeD3 is smaller than id3v2
+Suggests:       %{_bindir}/eyeD3
 Conflicts:      python-eyed3 < 0.7.0
 
 %description
@@ -61,6 +69,10 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, missing perl(Mus
 
 
 %changelog
+* Wed Jan 18 2017 Dominik Mierzejewski <rpm@greysector.net> - 2.8-1
+- Update to 2.8
+- Add the supported additional tools packaged in Fedora to Suggests:
+
 * Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 2.7.2-2
 - Rebuild for Python 3.6
 
diff --git a/sources b/sources
index feb3d66..a76d1a4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f9455231436d80329eacedf32441d9be  abcde-2.7.2.tar.gz
+SHA512 (abcde-2.8.tar.gz) = 2124b2fd4fcea984a258ebeffeb7654eecc92d62bb20e76f032ed2e0de5084e9afaf665cccf0b632983baeb572321ce6913e3a956c7865da40fecccc9d23243d

From f242a8bdfb069cb9eb589abe9531db01ab25282f Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Thu, 19 Jan 2017 11:44:17 +0100
Subject: [PATCH 03/38] Update to 2.8.1

---
 abcde.spec | 5 ++++-
 sources    | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/abcde.spec b/abcde.spec
index 974ed1e..e4d2a2e 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,5 +1,5 @@
 Name:           abcde
-Version:        2.8
+Version:        2.8.1
 Release:        1%{?dist}
 Summary:        A Better CD Encoder
 
@@ -69,6 +69,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, missing perl(Mus
 
 
 %changelog
+* Thu Jan 19 2017 Dominik Mierzejewski <rpm@greysector.net> - 2.8.1-1
+- Update to 2.8.1
+
 * Wed Jan 18 2017 Dominik Mierzejewski <rpm@greysector.net> - 2.8-1
 - Update to 2.8
 - Add the supported additional tools packaged in Fedora to Suggests:
diff --git a/sources b/sources
index a76d1a4..59c1a61 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (abcde-2.8.tar.gz) = 2124b2fd4fcea984a258ebeffeb7654eecc92d62bb20e76f032ed2e0de5084e9afaf665cccf0b632983baeb572321ce6913e3a956c7865da40fecccc9d23243d
+SHA512 (abcde-2.8.1.tar.gz) = 18e9e46ec69d0b99fc5e2b71ec549e3961e5f6d7f88cef1a6c8da154689554a70cc8bc748c1ef78f81583a510f8b03906b8a4fec454aa0b06f0169d0bc4a7b36

From f3111bca3036c5826fe21d8761fb8dc9a07a64b9 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 10 Feb 2017 05:40:16 +0000
Subject: [PATCH 04/38] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

---
 abcde.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abcde.spec b/abcde.spec
index e4d2a2e..de472a2 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.8.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Better CD Encoder
 
 # cddb-tool is Public Domain, otherwise GPLv2+
@@ -69,6 +69,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, missing perl(Mus
 
 
 %changelog
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Thu Jan 19 2017 Dominik Mierzejewski <rpm@greysector.net> - 2.8.1-1
 - Update to 2.8.1
 

From 67e6d84725f0a10e7a50c6f28f04125273c6e919 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Mon, 3 Jul 2017 11:04:05 +0200
Subject: [PATCH 05/38] set the default CDDBMETHOD to cddb

(perl MusicBrainz modules are not packaged)

add a weak dependency on lame, since mp3 encoding is now in Fedora 25+
---
 abcde-cddbmethod.patch | 12 ++++++++++++
 abcde.spec             | 10 +++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 abcde-cddbmethod.patch

diff --git a/abcde-cddbmethod.patch b/abcde-cddbmethod.patch
new file mode 100644
index 0000000..105a7bb
--- /dev/null
+++ b/abcde-cddbmethod.patch
@@ -0,0 +1,12 @@
+diff -up abcde-2.8.1/abcde.conf.orig abcde-2.8.1/abcde.conf
+--- abcde-2.8.1/abcde.conf.orig	2017-07-02 16:00:35.009572935 +0200
++++ abcde-2.8.1/abcde.conf	2017-07-02 16:02:45.003049337 +0200
+@@ -9,7 +9,7 @@
+ # is "musicbrainz", but both can be specified in a comma delimited list
+ # to be tried sequentially in the event of failure of the first
+ # search.
+-#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.spec b/abcde.spec
index e4d2a2e..a9d493a 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.8.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Better CD Encoder
 
 # cddb-tool is Public Domain, otherwise GPLv2+
@@ -8,6 +8,7 @@ License:        GPLv2+ and Public Domain
 URL:            https://abcde.einval.com/
 Source0:        https://abcde.einval.com/download/%{name}-%{version}.tar.gz
 Patch0:         %{name}-2.7-normalize.patch
+Patch1:         %{name}-cddbmethod.patch
 
 BuildArch:      noarch
 Requires:       cd-discid
@@ -22,6 +23,7 @@ Recommends:     flac
 Suggests:       cd-discid
 Suggests:       cdrdao
 Suggests:       ImageMagick
+Suggests:       lame
 Suggests:       libcdio-paranoia
 Suggests:       normalize
 Suggests:       opus-tools
@@ -41,6 +43,7 @@ tags them, all in one go.
 %prep
 %setup -q
 %patch0 -p1 -F2
+%patch1 -p1
 mv examples/cue2discid .
 sed -i -e 's|bin/python\b|bin/python3|' cue2discid
 chmod -c -x abcde-musicbrainz-tool examples/musicbrainz-get-tracks
@@ -69,6 +72,11 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, missing perl(Mus
 
 
 %changelog
+* Sun Jul 02 2017 Dominik Mierzejewski <rpm@greysector.net> - 2.8.1-2
+- 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+
+
 * Thu Jan 19 2017 Dominik Mierzejewski <rpm@greysector.net> - 2.8.1-1
 - Update to 2.8.1
 

From 7a51db553373ab3fc234eb148283037f2d852887 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 26 Jul 2017 02:30:14 +0000
Subject: [PATCH 06/38] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 abcde.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abcde.spec b/abcde.spec
index 4a56089..8ed2eca 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.8.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Better CD Encoder
 
 # cddb-tool is Public Domain, otherwise GPLv2+
@@ -72,6 +72,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, missing perl(Mus
 
 
 %changelog
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Sun Jul 02 2017 Dominik Mierzejewski <rpm@greysector.net> - 2.8.1-3
 - set the default CDDBMETHOD to cddb, as perl MusicBrainz modules are
   not packaged

From ca9fa69361794140dbb570c979d76829bf109336 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 7 Feb 2018 01:43:30 +0000
Subject: [PATCH 07/38] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 abcde.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abcde.spec b/abcde.spec
index 8ed2eca..b70221d 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.8.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A Better CD Encoder
 
 # cddb-tool is Public Domain, otherwise GPLv2+
@@ -72,6 +72,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, missing perl(Mus
 
 
 %changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

From 7da343052533119c175bb209f5ca248a142f0ff2 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Wed, 21 Feb 2018 11:19:16 +0100
Subject: [PATCH 08/38] add Suggests for twolame, now that's included in Fedora
 27+ (#1534297)

---
 abcde.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/abcde.spec b/abcde.spec
index 8ed2eca..5b617c3 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.8.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A Better CD Encoder
 
 # cddb-tool is Public Domain, otherwise GPLv2+
@@ -28,6 +28,7 @@ Suggests:       libcdio-paranoia
 Suggests:       normalize
 Suggests:       opus-tools
 Suggests:       speex-tools
+Suggests:       twolame
 Suggests:       wavpack
 Suggests:       vorbisgain
 # eyeD3 is smaller than id3v2
@@ -72,6 +73,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, missing perl(Mus
 
 
 %changelog
+* Wed Feb 21 2018 Dominik Mierzejewski <rpm@greysector.net> - 2.8.1-5
+- add Suggests for twolame, now that's included in Fedora 27+ (#1534297)
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

From 7315d1d50263306884848e7336343290f14758ec Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Wed, 21 Feb 2018 11:30:45 +0100
Subject: [PATCH 09/38] verify GPG signature for the source tarball

---
 587979573442684E.gpg | Bin 0 -> 3433 bytes
 abcde.spec           |   7 +++++++
 sources              |   1 +
 3 files changed, 8 insertions(+)
 create mode 100644 587979573442684E.gpg

diff --git a/587979573442684E.gpg b/587979573442684E.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..6aba9c208834244adcf9e4a122e0208fbaa75771
GIT binary patch
literal 3433
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

literal 0
HcmV?d00001

diff --git a/abcde.spec b/abcde.spec
index 5b617c3..28d00cd 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -7,10 +7,15 @@ Summary:        A Better CD Encoder
 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}-2.7-normalize.patch
 Patch1:         %{name}-cddbmethod.patch
 
 BuildArch:      noarch
+BuildRequires:  %{_bindir}/gpgv2
 Requires:       cd-discid
 Requires:       wget
 Requires:       which
@@ -42,6 +47,7 @@ tags them, all in one go.
 
 
 %prep
+%{_bindir}/gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %setup -q
 %patch0 -p1 -F2
 %patch1 -p1
@@ -75,6 +81,7 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, missing perl(Mus
 %changelog
 * Wed Feb 21 2018 Dominik Mierzejewski <rpm@greysector.net> - 2.8.1-5
 - add Suggests for twolame, now that's included in Fedora 27+ (#1534297)
+- verify GPG signature for the source tarball
 
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/sources b/sources
index 59c1a61..8fa1f91 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 SHA512 (abcde-2.8.1.tar.gz) = 18e9e46ec69d0b99fc5e2b71ec549e3961e5f6d7f88cef1a6c8da154689554a70cc8bc748c1ef78f81583a510f8b03906b8a4fec454aa0b06f0169d0bc4a7b36
+SHA512 (abcde-2.8.1.tar.gz.sign) = c3e6a922ad895b15f41c0b89162c66bb65dce5d822fa0935afcca1def0057a25e14cb25af478d42bbc49dc94c6f62f68dc10ac1989e9dd5e7ae7923af352b2c9

From b374dd54adb47ed6f5e8b07f93b97d2485a4cb00 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Fri, 9 Mar 2018 16:40:43 +0100
Subject: [PATCH 10/38] update to 2.9 (#1553139)

rebase patches
use autosetup macro
---
 abcde-cddbmethod.patch                        | 14 ++---
 ...7-normalize.patch => abcde-normalize.patch | 56 +++++++++----------
 abcde.spec                                    | 15 +++--
 sources                                       |  4 +-
 4 files changed, 46 insertions(+), 43 deletions(-)
 rename abcde-2.7-normalize.patch => abcde-normalize.patch (59%)

diff --git a/abcde-cddbmethod.patch b/abcde-cddbmethod.patch
index 105a7bb..84b1604 100644
--- a/abcde-cddbmethod.patch
+++ b/abcde-cddbmethod.patch
@@ -1,10 +1,10 @@
-diff -up abcde-2.8.1/abcde.conf.orig abcde-2.8.1/abcde.conf
---- abcde-2.8.1/abcde.conf.orig	2017-07-02 16:00:35.009572935 +0200
-+++ abcde-2.8.1/abcde.conf	2017-07-02 16:02:45.003049337 +0200
-@@ -9,7 +9,7 @@
- # is "musicbrainz", but both can be specified in a comma delimited list
- # to be tried sequentially in the event of failure of the first
- # search.
+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
  
diff --git a/abcde-2.7-normalize.patch b/abcde-normalize.patch
similarity index 59%
rename from abcde-2.7-normalize.patch
rename to abcde-normalize.patch
index 5d0106b..1df4384 100644
--- a/abcde-2.7-normalize.patch
+++ b/abcde-normalize.patch
@@ -1,19 +1,7 @@
-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
+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
  .TP
  .B NORMALIZERSYNTAX
  Specifies the style of normalizer to use.  Valid options are \'default\'
@@ -22,7 +10,7 @@ diff -up abcde-2.7/abcde.1~ abcde-2.7/abcde.1
  ATM.
  .TP
  .B CDROMREADERSYNTAX
-@@ -606,7 +606,7 @@ ImageMagick package should be installed.
+@@ -669,7 +669,7 @@ ImageMagick package should be installed.
  (optional) distmp3, a client/server for distributed mp3 encoding.
  .TP
  .B *
@@ -31,8 +19,8 @@ diff -up abcde-2.7/abcde.1~ abcde-2.7/abcde.1
  .TP
  .B *
  (optional) a replaygain file volume modifier (vorbisgain, metaflac, mp3gain, mpcgain, wvgain),
-@@ -620,7 +620,7 @@ ImageMagick package should be installed.
- .BR cdda2wav (1),
+@@ -685,7 +685,7 @@ ImageMagick package should be installed.
+ .BR mid3v2 (1),
  .BR pird (1),
  .BR dagrab (1),
 -.BR normalize-audio (1),
@@ -40,10 +28,10 @@ diff -up abcde-2.7/abcde.1~ abcde-2.7/abcde.1
  .BR oggenc (1),
  .BR vorbize (1),
  .BR flac (1),
-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 @@
+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 @@
  #DISTMP3=distmp3
  #VORBISCOMMENT=vorbiscomment
  #METAFLAC=metaflac
@@ -52,10 +40,22 @@ diff -up abcde-2.7/abcde.conf~ abcde-2.7/abcde.conf
  #CDSPEED=eject
  #VORBISGAIN=vorbisgain
  #MKCUE=mkcue
-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
+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
  
  Options added/modified from 2.0.3 to 2.1.x:
  
@@ -64,7 +64,7 @@ diff -up abcde-2.7/README~ abcde-2.7/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.
-@@ -225,7 +225,7 @@ abcde requires the following backend too
+@@ -267,7 +267,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.spec b/abcde.spec
index 28d00cd..97f7069 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
-Version:        2.8.1
-Release:        5%{?dist}
+Version:        2.9
+Release:        1%{?dist}
 Summary:        A Better CD Encoder
 
 # cddb-tool is Public Domain, otherwise GPLv2+
@@ -11,7 +11,7 @@ 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}-2.7-normalize.patch
+Patch0:         %{name}-normalize.patch
 Patch1:         %{name}-cddbmethod.patch
 
 BuildArch:      noarch
@@ -48,9 +48,7 @@ tags them, all in one go.
 
 %prep
 %{_bindir}/gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
-%setup -q
-%patch0 -p1 -F2
-%patch1 -p1
+%autosetup
 mv examples/cue2discid .
 sed -i -e 's|bin/python\b|bin/python3|' cue2discid
 chmod -c -x abcde-musicbrainz-tool examples/musicbrainz-get-tracks
@@ -79,6 +77,11 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, missing perl(Mus
 
 
 %changelog
+* Fri Mar 09 2018 Dominik Mierzejewski <rpm@greysector.net> - 2.9-1
+- update to 2.9 (#1553139)
+- rebase patches
+- use autosetup macro
+
 * Wed Feb 21 2018 Dominik Mierzejewski <rpm@greysector.net> - 2.8.1-5
 - add Suggests for twolame, now that's included in Fedora 27+ (#1534297)
 - verify GPG signature for the source tarball
diff --git a/sources b/sources
index 8fa1f91..c23edaf 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (abcde-2.8.1.tar.gz) = 18e9e46ec69d0b99fc5e2b71ec549e3961e5f6d7f88cef1a6c8da154689554a70cc8bc748c1ef78f81583a510f8b03906b8a4fec454aa0b06f0169d0bc4a7b36
-SHA512 (abcde-2.8.1.tar.gz.sign) = c3e6a922ad895b15f41c0b89162c66bb65dce5d822fa0935afcca1def0057a25e14cb25af478d42bbc49dc94c6f62f68dc10ac1989e9dd5e7ae7923af352b2c9
+SHA512 (abcde-2.9.tar.gz) = fea7e59237592777df28badcea1f9510881148c79ca2a90b47605677aa52f07132fe93a2ccdccffc98d31524b2332735511cb648844335bdf42d3ce1c32a0252
+SHA512 (abcde-2.9.tar.gz.sign) = 6c4c794d12b209b6308bdf381b1539922b8af008b4f0ae701b83b14444f006fb4c5f09521f89efbacb9657b0009983fb8e310b828014342f4d12597f4d12aed1

From 59dfbe1f6f68cf0006834e5902ca537e58da3cd8 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Thu, 15 Mar 2018 20:48:33 +0100
Subject: [PATCH 11/38] update to 2.9.1 (#1553948)

---
 abcde.spec | 5 ++++-
 sources    | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/abcde.spec b/abcde.spec
index 97f7069..ae97a3d 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,5 +1,5 @@
 Name:           abcde
-Version:        2.9
+Version:        2.9.1
 Release:        1%{?dist}
 Summary:        A Better CD Encoder
 
@@ -77,6 +77,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, missing perl(Mus
 
 
 %changelog
+* Thu Mar 15 2018 Dominik Mierzejewski <rpm@greysector.net> - 2.9.1-1
+- update to 2.9.1 (#1553948)
+
 * Fri Mar 09 2018 Dominik Mierzejewski <rpm@greysector.net> - 2.9-1
 - update to 2.9 (#1553139)
 - rebase patches
diff --git a/sources b/sources
index c23edaf..aaa178b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (abcde-2.9.tar.gz) = fea7e59237592777df28badcea1f9510881148c79ca2a90b47605677aa52f07132fe93a2ccdccffc98d31524b2332735511cb648844335bdf42d3ce1c32a0252
-SHA512 (abcde-2.9.tar.gz.sign) = 6c4c794d12b209b6308bdf381b1539922b8af008b4f0ae701b83b14444f006fb4c5f09521f89efbacb9657b0009983fb8e310b828014342f4d12597f4d12aed1
+SHA512 (abcde-2.9.1.tar.gz) = d2c64bacdc24c5917bf30a78e89720dc976206412507477d98976b6ad2c78c3837f11ca77c3c4d6d19a6172f2697cb6045b064aa09948471d87cad6cb92c1473
+SHA512 (abcde-2.9.1.tar.gz.sign) = 8048608c6e6e1eaca4907d1d230683202a023287d61d0bf76f8ceb359e75d0a9fe8dc705d8a75b87a8c64da32fd5fd51ed5c01e185e8e9cef2ec4984b03da542

From c5b98c1b8b1d071b14981a452f47dc7e14a86650 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 12 Jul 2018 19:55:04 +0000
Subject: [PATCH 12/38] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 abcde.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abcde.spec b/abcde.spec
index 597301e..ef3e104 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.9.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Better CD Encoder
 
 # cddb-tool is Public Domain, otherwise GPLv2+
@@ -77,6 +77,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, missing perl(Mus
 
 
 %changelog
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Thu Mar 15 2018 Dominik Mierzejewski <rpm@greysector.net> - 2.9.1-1
 - update to 2.9.1 (#1553948)
 

From e7bf9fbcf66ab3f10be7e9effe1f166547e56be6 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Sun, 5 Aug 2018 02:39:57 +0200
Subject: [PATCH 13/38] update to 2.9.2 (#1611854)

fix version typo in Makefile
---
 abcde.spec | 7 ++++++-
 sources    | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/abcde.spec b/abcde.spec
index ae97a3d..99400af 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,5 +1,5 @@
 Name:           abcde
-Version:        2.9.1
+Version:        2.9.2
 Release:        1%{?dist}
 Summary:        A Better CD Encoder
 
@@ -51,6 +51,7 @@ tags them, all in one go.
 %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
 
 
@@ -77,6 +78,10 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, missing perl(Mus
 
 
 %changelog
+* Sat Aug 04 2018 Dominik Mierzejewski <rpm@greysector.net> - 2.9.2-1
+- update to 2.9.2 (#1611854)
+- fix version typo in Makefile
+
 * Thu Mar 15 2018 Dominik Mierzejewski <rpm@greysector.net> - 2.9.1-1
 - update to 2.9.1 (#1553948)
 
diff --git a/sources b/sources
index aaa178b..62c4f27 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (abcde-2.9.1.tar.gz) = d2c64bacdc24c5917bf30a78e89720dc976206412507477d98976b6ad2c78c3837f11ca77c3c4d6d19a6172f2697cb6045b064aa09948471d87cad6cb92c1473
-SHA512 (abcde-2.9.1.tar.gz.sign) = 8048608c6e6e1eaca4907d1d230683202a023287d61d0bf76f8ceb359e75d0a9fe8dc705d8a75b87a8c64da32fd5fd51ed5c01e185e8e9cef2ec4984b03da542
+SHA512 (abcde-2.9.2.tar.gz) = ef0048edf040ed5afee6fdd77377800ec02a3ba323647edd6d384679671b47eee63d8bd1c72ce6fe5ed3ab087a3d7f4024ab39e644be4ab8a92f5c5c0ddabfb5
+SHA512 (abcde-2.9.2.tar.gz.sign) = 50ee8da4bddbde1e25e3939ceec84633b3996287726fbbab86b501970a0e1dfa647471c345093e1007d58321b573c31d9c23b38f2429b66924aab7278f5ebb52

From fcc5ca790c456d0eaec925e611f261f97e828d74 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 31 Jan 2019 12:51:08 +0000
Subject: [PATCH 14/38] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 abcde.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abcde.spec b/abcde.spec
index d77d93c..7493411 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.9.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Better CD Encoder
 
 # cddb-tool is Public Domain, otherwise GPLv2+
@@ -78,6 +78,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, missing perl(Mus
 
 
 %changelog
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Sat Aug 04 2018 Dominik Mierzejewski <rpm@greysector.net> - 2.9.2-1
 - update to 2.9.2 (#1611854)
 - fix version typo in Makefile

From 7caa478489288ad8bf1420a6e4bd60913137de10 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Tue, 5 Feb 2019 23:10:57 +0100
Subject: [PATCH 15/38] update to 2.9.3 (#1672604)

---
 abcde.spec | 5 ++++-
 sources    | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/abcde.spec b/abcde.spec
index 309cc83..fd104e5 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,5 +1,5 @@
 Name:           abcde
-Version:        2.9.2
+Version:        2.9.3
 Release:        1%{?dist}
 Summary:        A Better CD Encoder
 
@@ -78,6 +78,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, missing perl(Mus
 
 
 %changelog
+* Tue Feb 05 2019 Dominik Mierzejewski <rpm@greysector.net> - 2.9.3-1
+- update to 2.9.3 (#1672604)
+
 * Sat Aug 04 2018 Dominik Mierzejewski <rpm@greysector.net> - 2.9.2-1
 - update to 2.9.2 (#1611854)
 - fix version typo in Makefile
diff --git a/sources b/sources
index 62c4f27..579479b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (abcde-2.9.2.tar.gz) = ef0048edf040ed5afee6fdd77377800ec02a3ba323647edd6d384679671b47eee63d8bd1c72ce6fe5ed3ab087a3d7f4024ab39e644be4ab8a92f5c5c0ddabfb5
-SHA512 (abcde-2.9.2.tar.gz.sign) = 50ee8da4bddbde1e25e3939ceec84633b3996287726fbbab86b501970a0e1dfa647471c345093e1007d58321b573c31d9c23b38f2429b66924aab7278f5ebb52
+SHA512 (abcde-2.9.3.tar.gz) = 51a1dfa1f1d2dab6b8dad7d9f70d0139938151bc2dae0e9fc80da5385b4bba4d71c89a4d1b2dec5bd24787a542cb0caeacbef423cf32b8014cf6320c391b4236
+SHA512 (abcde-2.9.3.tar.gz.sign) = b3fe879beee77d21d5e97968345e9a267241e6e9f52b195eb39f325acbfd82bf7eee6c156168fb673f8011cc38c69d69900ce4d66959eb995ed64bca6dc79928

From 5c811353e14ec9ed728f2c7390ce4f441d57f337 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 24 Jul 2019 17:25:46 +0000
Subject: [PATCH 16/38] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 abcde.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abcde.spec b/abcde.spec
index b277136..f51b17f 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.9.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Better CD Encoder
 
 # cddb-tool is Public Domain, otherwise GPLv2+
@@ -78,6 +78,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, missing perl(Mus
 
 
 %changelog
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Tue Feb 05 2019 Dominik Mierzejewski <rpm@greysector.net> - 2.9.3-1
 - update to 2.9.3 (#1672604)
 

From 110197b43d8e50d68391ed940a5334128a4a1d62 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Tue, 29 Oct 2019 10:31:04 +0100
Subject: [PATCH 17/38] 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
---
 abcde-cddbmethod.patch | 12 ------------
 abcde.spec             | 21 +++++++++++++--------
 2 files changed, 13 insertions(+), 20 deletions(-)
 delete mode 100644 abcde-cddbmethod.patch

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.spec b/abcde.spec
index b277136..04b88ee 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.9.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Better CD Encoder
 
 # cddb-tool is Public Domain, otherwise GPLv2+
@@ -12,11 +12,12 @@ 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
 
 BuildArch:      noarch
 BuildRequires:  %{_bindir}/gpgv2
+BuildRequires:  perl-generators
 Requires:       cd-discid
+Requires:       %{_bindir}/hostname
 Requires:       wget
 Requires:       which
 # cdparanoia, vorbis-tools for defaults
@@ -47,30 +48,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,6 +77,12 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, missing perl(Mus
 
 
 %changelog
+* Tue Oct 29 2019 Dominik Mierzejewski <rpm@greysector.net> - 2.9.3-2
+- 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
+
 * Tue Feb 05 2019 Dominik Mierzejewski <rpm@greysector.net> - 2.9.3-1
 - update to 2.9.3 (#1672604)
 

From 8f9ea27c41656598be0f74bd322ba8eeceb907ff Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 28 Jan 2020 11:05:56 +0000
Subject: [PATCH 18/38] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 abcde.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abcde.spec b/abcde.spec
index ccb6e9a..59b095d 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.9.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Better CD Encoder
 
 # cddb-tool is Public Domain, otherwise GPLv2+
@@ -77,6 +77,9 @@ install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir}
 
 
 %changelog
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Tue Oct 29 2019 Dominik Mierzejewski <rpm@greysector.net> - 2.9.3-3
 - MusicBrainz lookup support for abcde (#1758816)
 - use gpgverify macro

From 8f7e7cae4481717be90e971da26022ed73c7253c Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Sun, 31 May 2020 23:08:10 +0200
Subject: [PATCH 19/38] fix gpgverify macro invocation

---
 abcde.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/abcde.spec b/abcde.spec
index ccb6e9a..b040b59 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -48,7 +48,7 @@ tags them, all in one go.
 
 
 %prep
-%gpgverify --keyring='%{S:2}' --signature='%{S:1}' --data='%{S:0}'
+%{gpgverify} --keyring='%{S:2}' --signature='%{S:1}' --data='%{S:0}'
 %autosetup
 mv examples/cue2discid .
 sed -i -e 's|bin/python\b|bin/python3|' cue2discid

From 37363b5e7158bbc64b5d0471cd9a6d6f075a885f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 27 Jul 2020 11:39:02 +0000
Subject: [PATCH 20/38] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 abcde.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abcde.spec b/abcde.spec
index 20fafe3..33f28b0 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.9.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A Better CD Encoder
 
 # cddb-tool is Public Domain, otherwise GPLv2+
@@ -77,6 +77,9 @@ install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir}
 
 
 %changelog
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From 3e583c9dde43c6dacb657f8d977f958607be35be Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Mon, 14 Dec 2020 10:43:12 +0100
Subject: [PATCH 21/38] add explicit BR: make

https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
---
 abcde.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/abcde.spec b/abcde.spec
index 20fafe3..624ee4f 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -15,6 +15,7 @@ Patch0:         %{name}-normalize.patch
 
 BuildArch:      noarch
 BuildRequires:  %{_bindir}/gpgv2
+BuildRequires:  make
 BuildRequires:  perl-generators
 Requires:       cd-discid
 Requires:       %{_bindir}/hostname

From ff0818afb78517c1521e75633311c24577555f01 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 25 Jan 2021 23:42:59 +0000
Subject: [PATCH 22/38] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 abcde.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abcde.spec b/abcde.spec
index 817ae3e..bcda93a 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.9.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A Better CD Encoder
 
 # cddb-tool is Public Domain, otherwise GPLv2+
@@ -78,6 +78,9 @@ install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir}
 
 
 %changelog
+* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From 983aaf7035441f11feed54bb966a86fd676d5866 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Sat, 22 May 2021 23:30:01 +0200
Subject: [PATCH 23/38] point to gnudb.org instead of the discontinued
 freedb.org (#1916974)

---
 abcde-gnudb.patch | 31 +++++++++++++++++++++++++++++++
 abcde.spec        |  5 +++++
 2 files changed, 36 insertions(+)
 create mode 100644 abcde-gnudb.patch

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 817ae3e..bbda332 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -12,6 +12,8 @@ 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
 
 BuildArch:      noarch
 BuildRequires:  %{_bindir}/gpgv2
@@ -78,6 +80,9 @@ install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir}
 
 
 %changelog
+* Sat May 22 2021 Dominik Mierzejewski <rpm@greysector.net> - 2.9.3-6
+- point to gnudb.org instead of the discontinued freedb.org (#1916974)
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From b27ecd918cfd46cf892a329c4505534c65b5c639 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 21 Jul 2021 12:14:50 +0000
Subject: [PATCH 24/38] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

From 573fdfbb294886e23f59780890cab9ddb249d081 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 21 Jul 2021 17:09:56 +0000
Subject: [PATCH 25/38] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 abcde.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abcde.spec b/abcde.spec
index a0c570a..2fa105a 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.9.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A Better CD Encoder
 
 # cddb-tool is Public Domain, otherwise GPLv2+
@@ -80,6 +80,9 @@ install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir}
 
 
 %changelog
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Sat May 22 2021 Dominik Mierzejewski <rpm@greysector.net> - 2.9.3-7
 - point to gnudb.org instead of the discontinued freedb.org (#1916974)
 

From 09080a5e5ba894d62561b5c4b14d5a183497ef57 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jan 2022 20:49:42 +0000
Subject: [PATCH 26/38] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 abcde.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abcde.spec b/abcde.spec
index 2fa105a..2ddc505 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.9.3
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A Better CD Encoder
 
 # cddb-tool is Public Domain, otherwise GPLv2+
@@ -80,6 +80,9 @@ install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir}
 
 
 %changelog
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From b11080aa25eac8b6a19e3631b3073148e7629abd Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 20 Jul 2022 20:20:25 +0000
Subject: [PATCH 27/38] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 abcde.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abcde.spec b/abcde.spec
index 2ddc505..e48c888 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.9.3
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A Better CD Encoder
 
 # cddb-tool is Public Domain, otherwise GPLv2+
@@ -80,6 +80,9 @@ install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir}
 
 
 %changelog
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From 5aefca1d22a1955d968793f437fc6957392ae85f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 18 Jan 2023 21:18:05 +0000
Subject: [PATCH 28/38] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 abcde.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abcde.spec b/abcde.spec
index e48c888..b5dfb33 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.9.3
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        A Better CD Encoder
 
 # cddb-tool is Public Domain, otherwise GPLv2+
@@ -80,6 +80,9 @@ install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir}
 
 
 %changelog
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From b81be8506cf10fc6677f8c9c52ad89a7bcf75cd2 Mon Sep 17 00:00:00 2001
From: Jilayne Lovejoy <jlovejoy@redhat.com>
Date: Thu, 16 Mar 2023 17:06:16 +0000
Subject: [PATCH 29/38] Update abcde.spec License field

Update License: field to SPDX identifier GPL-2.0-or-later as result of test run using FOSSology to inspect packages

Signed-off-by: Jilayne Lovejoy
---
 abcde.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/abcde.spec b/abcde.spec
index b5dfb33..93fd937 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -3,8 +3,7 @@ Version:        2.9.3
 Release:        11%{?dist}
 Summary:        A Better CD Encoder
 
-# cddb-tool is Public Domain, otherwise GPLv2+
-License:        GPLv2+ and Public Domain
+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
@@ -80,6 +79,9 @@ install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir}
 
 
 %changelog
+* Thur Mar 16 2023 Jilayne Lovejoy <jlovejoy@redhat.com>
+- migrated to SPDX license
+
 * Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From 5c385b0cba0ab52780d6865f57e3c1097b18bce3 Mon Sep 17 00:00:00 2001
From: Jilayne Lovejoy <jlovejoy@redhat.com>
Date: Tue, 21 Mar 2023 03:31:59 +0000
Subject: [PATCH 30/38] update commit

update commit to proper format
---
 abcde.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/abcde.spec b/abcde.spec
index 93fd937..772a036 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -79,7 +79,7 @@ install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir}
 
 
 %changelog
-* Thur Mar 16 2023 Jilayne Lovejoy <jlovejoy@redhat.com>
+* Thu Mar 16 2023 Jilayne Lovejoy <jlovejoy@redhat.com> - 2.9.3-12
 - migrated to SPDX license
 
 * Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-11

From dab0c06e20da5b4bd58d13e1f11f81c156315b63 Mon Sep 17 00:00:00 2001
From: Jilayne Lovejoy <jlovejoy@redhat.com>
Date: Tue, 28 Mar 2023 20:57:35 +0000
Subject: [PATCH 31/38] add comment update release

---
 abcde.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abcde.spec b/abcde.spec
index 772a036..c16852e 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,8 +1,11 @@
 Name:           abcde
 Version:        2.9.3
-Release:        11%{?dist}
+Release:        12%{?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
 URL:            https://abcde.einval.com/
 Source0:        https://abcde.einval.com/download/%{name}-%{version}.tar.gz

From 10743f0e31186c671e6666080b838dc38e16c939 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jul 2023 12:47:57 +0000
Subject: [PATCH 32/38] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 abcde.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abcde.spec b/abcde.spec
index c16852e..8413c8b 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.9.3
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        A Better CD Encoder
 
 # previously license field included Public Domain, but FOSSology scan of v2.9.3 did not 
@@ -82,6 +82,9 @@ install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir}
 
 
 %changelog
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Thu Mar 16 2023 Jilayne Lovejoy <jlovejoy@redhat.com> - 2.9.3-12
 - migrated to SPDX license
 

From b11087ea0837402221e52817b8cbd3b89cd4072e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jan 2024 11:59:30 +0000
Subject: [PATCH 33/38] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 abcde.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abcde.spec b/abcde.spec
index 8413c8b..8b6c297 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.9.3
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        A Better CD Encoder
 
 # previously license field included Public Domain, but FOSSology scan of v2.9.3 did not 
@@ -82,6 +82,9 @@ install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir}
 
 
 %changelog
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From 22e39e00a0059cab9329f89bce9d6335c3e3a2c2 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 22 Jan 2024 22:32:53 +0000
Subject: [PATCH 34/38] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 abcde.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abcde.spec b/abcde.spec
index 8b6c297..cc60a55 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.9.3
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        A Better CD Encoder
 
 # previously license field included Public Domain, but FOSSology scan of v2.9.3 did not 
@@ -82,6 +82,9 @@ install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir}
 
 
 %changelog
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 3fdba40eb0b4024543294f926f5287ff9dca60d2 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 17 Jul 2024 16:29:22 +0000
Subject: [PATCH 35/38] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 abcde.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abcde.spec b/abcde.spec
index cc60a55..e17a038 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.9.3
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        A Better CD Encoder
 
 # previously license field included Public Domain, but FOSSology scan of v2.9.3 did not 
@@ -82,6 +82,9 @@ install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir}
 
 
 %changelog
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From dc15006409fecb65d0d8ed5669927b7c541ebbe9 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 16 Jan 2025 10:27:17 +0000
Subject: [PATCH 36/38] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 abcde.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abcde.spec b/abcde.spec
index e17a038..009fd40 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.9.3
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        A Better CD Encoder
 
 # previously license field included Public Domain, but FOSSology scan of v2.9.3 did not 
@@ -82,6 +82,9 @@ install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir}
 
 
 %changelog
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From 05506e8f8740ada913ffd794fc1c69d0571c4084 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 23 Jul 2025 16:41:39 +0000
Subject: [PATCH 37/38] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 abcde.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abcde.spec b/abcde.spec
index 009fd40..6cf9221 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.9.3
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        A Better CD Encoder
 
 # previously license field included Public Domain, but FOSSology scan of v2.9.3 did not 
@@ -82,6 +82,9 @@ install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir}
 
 
 %changelog
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

From 8c06198c2d9589485a6fe5b422fd4dda08426f4a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 16 Jan 2026 03:22:59 +0000
Subject: [PATCH 38/38] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild

---
 abcde.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/abcde.spec b/abcde.spec
index 6cf9221..3716ca4 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.9.3
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        A Better CD Encoder
 
 # previously license field included Public Domain, but FOSSology scan of v2.9.3 did not 
@@ -82,6 +82,9 @@ install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir}
 
 
 %changelog
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
 * Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.3-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild