$ git diff --patch-with-stat --summary 66544e523a7c0cf89decb9685c3582a88b6c20bf..9c7b083ef2215163d826d4c7c5f6bc25ee42f2ce
.abf.yml | 2 --
abcde.spec | 53 +++++++++++++++++++++++++----------------------------
2 files changed, 25 insertions(+), 30 deletions(-)
diff --git a/.abf.yml b/.abf.yml
index 4d7b303..bec4854 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,4 +1,2 @@
sources:
abcde-2.9.3.tar.gz: 8acf90090093dc5f61020330ac4fa092a23cfa2c
- abcde_2.9.3.orig.tar.gz: 8acf90090093dc5f61020330ac4fa092a23cfa2c
- cd-discid-1.3.1.tar.gz: 32580d3fa446c59d6519c700e1180efb7d5fe23e
diff --git a/abcde.spec b/abcde.spec
index 4935244..1e54c35 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -4,51 +4,48 @@
Summary: Command-line utility to rip and encode audio cds
Name: abcde
Version: 2.9.3
-Release: 3
+Release: 4
License: GPLv2
URL: https://abcde.einval.com
Group: Sound
-#Source0: http://ftp.de.debian.org/debian/pool/main/a/abcde/%{name}_%{version}.orig.tar.gz
+#Source0: https://ftp.de.debian.org/debian/pool/main/a/abcde/%%{name}_%%{version}.orig.tar.gz
Source0: https://abcde.einval.com/download/%{name}-%{version}.tar.gz
-Source1: http://linukz.org/download/cd-discid-1.3.1.tar.gz
Patch0: abcde-2.3.99.6-install.patch
-Requires: cdparanoia
-Requires: wget
-Requires: vorbis-tools
-Requires: perl(MusicBrainz::DiscID)
-Requires: perl(WebService::MusicBrainz)
+Requires: cd-discid
+Requires: cdparanoia
+Requires: wget
+Requires: vorbis-tools
+Requires: perl(MusicBrainz::DiscID)
+Requires: perl(WebService::MusicBrainz)
+Recommends: glyr
+Recommends: flac
+Recommends: lame
+Recommends: mkcue
+Suggests: cdrdao
+Suggests: imagemagick
+Suggests: normalize
+Suggests: opus-tools
+Suggests: twolame
+Suggests: vorbisgain
+Suggests: wavpack
%description
abcde is a frontend command-line utility (actually, a shell script) that
grabs tracks off a CD, encodes them to Ogg/Vorbis, MP3, FLAC, Ogg/Speex and/or
MPP/MP+(Musepack) format, and tags them, all in one go.
+%prep
+%autosetup -p1 -b0
+
+%install
+%make_install
+
%files
%doc changelog COPYING README FAQ
%doc examples/abcded examples/abcde.init examples/autorip.sh
%{_bindir}/abcde
%{_bindir}/abcde-musicbrainz-tool
-%{_bindir}/cd-discid
%{_bindir}/cddb-tool
%{_mandir}/man1/abcde.*
-%{_mandir}/man1/cd-discid.*
%{_mandir}/man1/cddb-tool.*
%config(noreplace) %{_sysconfdir}/%{name}.conf
-
-#----------------------------------------------------------------------------
-
-%prep
-%autosetup -p1 -b0 -a1
-
-#%%patch0 -p1 -b .FIX_MAK
-#pushd cd-discid-1.3.1
-#patch1 -p0
-#popd
-
-%build
-%make_build -C cd-discid-1.3.1
-
-%install
-%make_install
-%make_install PREFIX=%{buildroot}%{_prefix} -C cd-discid-1.3.1
-