From dda86a11dd226774fe45cb16c6c33d91c2896619 Mon Sep 17 00:00:00 2001
From: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date: Oct 29 2019 10:33:06 +0000
Subject: Merge branch 'f30' into f31


---

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 f51b17f..ccb6e9a 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.9.3
-Release:        2%{?dist}
+Release:        3%{?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-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 <releng@fedoraproject.org> - 2.9.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild