From 39619c88b51311fbdae231b2bd2b93d5c2d87bff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 18 Oct 2009 10:39:29 +0000 Subject: [PATCH 01/63] - Update to 2.4.0 (#529509). --- .cvsignore | 2 +- ...8-config.patch => abcde-2.4.0-config.patch | 32 ++++++++-------- abcde.spec | 37 ++++++++++--------- sources | 2 +- 4 files changed, 38 insertions(+), 35 deletions(-) rename abcde-2.3.99.8-config.patch => abcde-2.4.0-config.patch (67%) diff --git a/.cvsignore b/.cvsignore index f3fd931..09c8106 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abcde_2.3.99.8.orig.tar.gz +abcde_2.4.0.orig.tar.gz diff --git a/abcde-2.3.99.8-config.patch b/abcde-2.4.0-config.patch similarity index 67% rename from abcde-2.3.99.8-config.patch rename to abcde-2.4.0-config.patch index 24346f9..037c9df 100644 --- a/abcde-2.3.99.8-config.patch +++ b/abcde-2.4.0-config.patch @@ -1,7 +1,7 @@ -diff -up abcde-2.3.99.8/abcde~ abcde-2.3.99.8/abcde ---- abcde-2.3.99.8/abcde~ 2009-07-26 20:28:29.000000000 +0300 -+++ abcde-2.3.99.8/abcde 2009-08-12 00:47:00.000000000 +0300 -@@ -3008,7 +3008,7 @@ MUSICBRAINZ=musicbrainz-get-tracks +diff -up abcde-2.4.0/abcde~ abcde-2.4.0/abcde +--- abcde-2.4.0/abcde~ 2009-10-17 11:51:57.000000000 +0300 ++++ abcde-2.4.0/abcde 2009-10-18 12:07:31.000000000 +0300 +@@ -3035,7 +3035,7 @@ MUSICBRAINZ=musicbrainz-get-tracks EJECT=eject MD5SUM=md5sum DISTMP3=distmp3 @@ -10,9 +10,9 @@ diff -up abcde-2.3.99.8/abcde~ abcde-2.3.99.8/abcde CDSPEED=eject VORBISGAIN=vorbisgain MP3GAIN=mp3gain -diff -up abcde-2.3.99.8/abcde.1~ abcde-2.3.99.8/abcde.1 ---- abcde-2.3.99.8/abcde.1~ 2009-07-26 14:36:02.000000000 +0300 -+++ abcde-2.3.99.8/abcde.1 2009-08-12 00:47:02.000000000 +0300 +diff -up abcde-2.4.0/abcde.1~ abcde-2.4.0/abcde.1 +--- abcde-2.4.0/abcde.1~ 2009-10-16 22:02:54.000000000 +0300 ++++ abcde-2.4.0/abcde.1 2009-10-18 12:07:32.000000000 +0300 @@ -325,7 +325,7 @@ only support \'faac\', so \'default\' po .TP .B NORMALIZERSYNTAX @@ -31,8 +31,8 @@ diff -up abcde-2.3.99.8/abcde.1~ abcde-2.3.99.8/abcde.1 .TP .B * (optional) a replaygain file volume modifier (vorbisgain, metaflac, mp3gain, replaygain), -@@ -574,7 +574,7 @@ An HTTP retrieval program: wget, fetch ( - .BR cdparanoia (1), +@@ -575,7 +575,7 @@ An HTTP retrieval program: wget, fetch ( + .BR icedax (1), .BR cdda2wav (1), .BR dagrab (1), -.BR normalize-audio (1), @@ -40,9 +40,9 @@ diff -up abcde-2.3.99.8/abcde.1~ abcde-2.3.99.8/abcde.1 .BR oggenc (1), .BR vorbize (1), .BR flac (1), -diff -up abcde-2.3.99.8/abcde.conf~ abcde-2.3.99.8/abcde.conf ---- abcde-2.3.99.8/abcde.conf~ 2009-07-26 14:46:44.000000000 +0300 -+++ abcde-2.3.99.8/abcde.conf 2009-08-12 00:47:04.000000000 +0300 +diff -up abcde-2.4.0/abcde.conf~ abcde-2.4.0/abcde.conf +--- abcde-2.4.0/abcde.conf~ 2009-10-16 22:02:54.000000000 +0300 ++++ abcde-2.4.0/abcde.conf 2009-10-18 12:07:34.000000000 +0300 @@ -139,7 +139,7 @@ #DISTMP3=distmp3 #VORBISCOMMENT=vorbiscomment @@ -52,9 +52,9 @@ diff -up abcde-2.3.99.8/abcde.conf~ abcde-2.3.99.8/abcde.conf #CDSPEED=eject #VORBISGAIN=vorbisgain #MKCUE=mkcue -diff -up abcde-2.3.99.8/README~ abcde-2.3.99.8/README ---- abcde-2.3.99.8/README~ 2009-07-26 14:46:44.000000000 +0300 -+++ abcde-2.3.99.8/README 2009-08-12 00:46:53.000000000 +0300 +diff -up abcde-2.4.0/README~ abcde-2.4.0/README +--- abcde-2.4.0/README~ 2009-10-16 22:02:54.000000000 +0300 ++++ abcde-2.4.0/README 2009-10-18 12:07:27.000000000 +0300 @@ -152,7 +152,7 @@ Options added/modified from 2.1.1 to 2.1 Options added/modified from 2.0.3 to 2.1.x: @@ -71,5 +71,5 @@ diff -up abcde-2.3.99.8/README~ abcde-2.3.99.8/README -* normalize-audio for volume normalization. +* normalize for volume normalization. * CD Paranoia, an audio CD reading utility or: - * cdda2wav, the audio CD reading utility cdparanoia was born from or: + * icedax/cdda2wav, the audio CD reading utility cdparanoia was born from or: * dagrab, another audio CD reading utility. diff --git a/abcde.spec b/abcde.spec index 6204c83..7c12355 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,5 +1,5 @@ Name: abcde -Version: 2.3.99.8 +Version: 2.4.0 Release: 1%{?dist} Summary: A Better CD Encoder @@ -10,7 +10,7 @@ Group: Applications/Multimedia License: GPLv2+ URL: http://code.google.com/p/abcde/ Source0: http://ftp.debian.org/debian/pool/main/a/abcde/%{name}_%{version}.orig.tar.gz -Patch0: %{name}-2.3.99.8-config.patch +Patch0: %{name}-2.4.0-config.patch # http://code.google.com/p/abcde/issues/detail?id=17 Patch1: %{name}-2.1.19-inst.patch # Cherry-picked bits from Ubuntu's 2.3.99.7-1ubuntu1 @@ -70,10 +70,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Oct 18 2009 Ville Skyttä - 2.4.0-1 +- Update to 2.4.0 (#529509). + * Wed Aug 12 2009 Ville Skyttä - 2.3.99.8-1 - Update to 2.3.99.8 (#516886). -* Mon Jul 27 2009 Ville Skyttä - 2.3.99.7-1 +* Mon Jul 27 2009 Ville Skyttä - 2.3.99.7-1 - Update to 2.3.99.7 (#513795); wget and usage patches applied upstream. - Patch to improve CDDB track info handling. - Update URL. @@ -84,57 +87,57 @@ rm -rf $RPM_BUILD_ROOT * Mon Feb 23 2009 Fedora Release Engineering - 2.3.99.6-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -* Thu Apr 10 2008 Ville Skyttä - 2.3.99.6-7 +* Thu Apr 10 2008 Ville Skyttä - 2.3.99.6-7 - Patch to work around wget 1.11 regression (#441862). -* Sat Jan 19 2008 Ville Skyttä - 2.3.99.6-6 +* Sat Jan 19 2008 Ville Skyttä - 2.3.99.6-6 - Include fixes from Ubuntu's 2.3.99.6-1ubuntu2: enables M4A and Speex tagging, fixes range code, and the -M option. - Fix Speex comment tagging. - Fix some usage message spelling errors. - Drop disttag. -* Sat Sep 29 2007 Ville Skyttä - 2.3.99.6-4 +* Sat Sep 29 2007 Ville Skyttä - 2.3.99.6-4 - Requires: which -* Mon Aug 13 2007 Ville Skyttä - 2.3.99.6-3 +* Mon Aug 13 2007 Ville Skyttä - 2.3.99.6-3 - License: GPLv2+ - Add (empty) %%build section. -* Tue Aug 29 2006 Ville Skyttä - 2.3.99.6-2 +* Tue Aug 29 2006 Ville Skyttä - 2.3.99.6-2 - Change vorbis-tools and flac dependencies to Requires(hint), drop speex dependency. -* Mon Aug 7 2006 Ville Skyttä - 2.3.99.6-1 +* Mon Aug 7 2006 Ville Skyttä - 2.3.99.6-1 - 2.3.99.6. -* Wed Mar 1 2006 Ville Skyttä - 2.3.99.5-1 +* Wed Mar 1 2006 Ville Skyttä - 2.3.99.5-1 - 2.3.99.5. -* Wed Dec 14 2005 Ville Skyttä - 2.3.99.2-1 +* Wed Dec 14 2005 Ville Skyttä - 2.3.99.2-1 - 2.3.99.2, config file fixes mostly applied upstream. -* Sat Dec 10 2005 Ville Skyttä - 2.3.99-1 +* Sat Dec 10 2005 Ville Skyttä - 2.3.99-1 - 2.3.99, minor config file fixes. -* Mon Sep 5 2005 Ville Skyttä - 2.3.4-1 +* Mon Sep 5 2005 Ville Skyttä - 2.3.4-1 - 2.3.4. -* Fri Aug 26 2005 Ville Skyttä - 2.3.3-1 +* Fri Aug 26 2005 Ville Skyttä - 2.3.3-1 - 2.3.3. - Reformat specfile. -* Sat Aug 20 2005 Ville Skyttä - 2.3.2-1 +* Sat Aug 20 2005 Ville Skyttä - 2.3.2-1 - 2.3.2, vi and genre patches applied upstream. - Convert man page to UTF-8. * Fri Apr 7 2005 Michael Schwendt - 2.2.3-2 - rebuilt -* Thu Feb 10 2005 Ville Skyttä - 2.2.3-1 +* Thu Feb 10 2005 Ville Skyttä - 2.2.3-1 - Update to 2.2.3. -* Mon Jan 17 2005 Ville Skyttä - 2.2.0-2 +* Mon Jan 17 2005 Ville Skyttä - 2.2.0-2 - Add vorbis-tools, flac, cdparanoia, wget, and speex dependencies. - Weed out some Debianisms from default external tool names. - Include more docs. diff --git a/sources b/sources index 108723b..8588586 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -981fd4bfd6938bb6a1130f6193bffb00 abcde_2.3.99.8.orig.tar.gz +621abafbfc4eecbbc887dc400d697c2f abcde_2.4.0.orig.tar.gz From 6d61cd8bb80afb91d3d102504b0ab3461aed8533 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:38:02 +0000 Subject: [PATCH 02/63] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 657f638..c25dc0b 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := abcde SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 5487c743de9968f8474114bdba73501bd5ac7c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 2 Apr 2010 06:36:15 +0000 Subject: [PATCH 03/63] - Update to 2.4.1. --- .cvsignore | 2 +- abcde-2.3.99.7-speex-comment.patch | 16 -------------- ...1ubuntu1.diff => abcde-2.4.1-tagging.patch | 19 +++++++++------- abcde.spec | 22 +++++++++---------- sources | 2 +- 5 files changed, 23 insertions(+), 38 deletions(-) delete mode 100644 abcde-2.3.99.7-speex-comment.patch rename abcde_2.3.99.7-1ubuntu1.diff => abcde-2.4.1-tagging.patch (77%) diff --git a/.cvsignore b/.cvsignore index 09c8106..5cc4ed8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abcde_2.4.0.orig.tar.gz +abcde_2.4.1.orig.tar.gz diff --git a/abcde-2.3.99.7-speex-comment.patch b/abcde-2.3.99.7-speex-comment.patch deleted file mode 100644 index cd788b7..0000000 --- a/abcde-2.3.99.7-speex-comment.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up abcde-2.3.99.7/abcde~ abcde-2.3.99.7/abcde ---- abcde-2.3.99.7/abcde~ 2009-07-27 23:06:31.000000000 +0300 -+++ abcde-2.3.99.7/abcde 2009-07-27 23:07:55.000000000 +0300 -@@ -1114,11 +1114,10 @@ do_encode () - *=*) ;; - *) COMMENT="COMMENT=$COMMENT" ;; - esac -- COMMENT="--comment \"$COMMENT\"" - fi - # Tag the file at encode time, as it can't be done after encoding. - if [ "$DOTAG" = "y" ]; then -- $RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS --author "$TRACKARTIST" --title "$TRACKNAME" --comment "$COMMENT" "$IN" "$OUT" -+ $RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS --author "$TRACKARTIST" --title "$TRACKNAME" ${COMMENT:+--comment "$COMMENT"} "$IN" "$OUT" - - else - $RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS "$IN" "$OUT" diff --git a/abcde_2.3.99.7-1ubuntu1.diff b/abcde-2.4.1-tagging.patch similarity index 77% rename from abcde_2.3.99.7-1ubuntu1.diff rename to abcde-2.4.1-tagging.patch index 2e08719..f8267c5 100644 --- a/abcde_2.3.99.7-1ubuntu1.diff +++ b/abcde-2.4.1-tagging.patch @@ -1,20 +1,23 @@ ---- abcde-2.3.99.7.orig/abcde -+++ abcde-2.3.99.7/abcde -@@ -1116,9 +1116,10 @@ +Index: abcde +=================================================================== +--- abcde (revision 290) ++++ abcde (working copy) +@@ -1121,11 +1121,10 @@ + *=*) ;; + *) COMMENT="COMMENT=$COMMENT" ;; esac - COMMENT="--comment \"$COMMENT\"" +- COMMENT="--comment \"$COMMENT\"" fi - # Quick hack to avoid tagging Ogg/Speex, since there is no other way to tag than inline tagging - if [ ! "$DOTAG" = "y" ]; then -- $RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS --author "$TRACKARTIST" --title "$TRACKNAME" "$COMMENT" "$IN" "$OUT" +- $RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS --author "$TRACKARTIST" --title "$TRACKNAME" --comment "$COMMENT" "$IN" "$OUT" + # Tag the file at encode time, as it can't be done after encoding. + if [ "$DOTAG" = "y" ]; then -+ $RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS --author "$TRACKARTIST" --title "$TRACKNAME" --comment "$COMMENT" "$IN" "$OUT" -+ ++ $RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS --author "$TRACKARTIST" --title "$TRACKNAME" ${COMMENT:+--comment "$COMMENT"} "$IN" "$OUT" else $RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS "$IN" "$OUT" fi -@@ -1133,8 +1134,8 @@ +@@ -1140,8 +1139,8 @@ $RUN_COMMAND nice $EFFECTIVE_NICE $MPPENCODER $MPPENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" --year "$CDYEAR" --comment "$COMMENT" "$IN" "$OUT" ;; m4a) diff --git a/abcde.spec b/abcde.spec index 7c12355..f85f841 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,24 +1,20 @@ Name: abcde -Version: 2.4.0 +Version: 2.4.1 Release: 1%{?dist} Summary: A Better CD Encoder Group: Applications/Multimedia -# Also "Larry Wall's Artistic" upstream, but the original Artistic is -# not accepted in Fedora. Note that the license will be public domain as of -# 2010-01-01 (see comments in abcde, cddb-tool). -License: GPLv2+ +# Public domain after 2010-01-01, see comments in abcde and cddb-tool +License: Public Domain URL: http://code.google.com/p/abcde/ Source0: http://ftp.debian.org/debian/pool/main/a/abcde/%{name}_%{version}.orig.tar.gz Patch0: %{name}-2.4.0-config.patch # http://code.google.com/p/abcde/issues/detail?id=17 Patch1: %{name}-2.1.19-inst.patch -# Cherry-picked bits from Ubuntu's 2.3.99.7-1ubuntu1 -Patch2: %{name}_2.3.99.7-1ubuntu1.diff +# http://code.google.com/p/abcde/issues/detail?id=19 +Patch2: %{name}-2.4.1-tagging.patch # http://code.google.com/p/abcde/issues/detail?id=18 Patch3: %{name}-2.3.99.7-trackinfo.patch -# http://code.google.com/p/abcde/issues/detail?id=19 -Patch4: %{name}-2.3.99.7-speex-comment.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -30,7 +26,7 @@ Requires(hint): vorbis-tools Requires(hint): flac %description -abcde is a frontend command-line utility (actually, a shell script) +abcde is a front end command line utility (actually, a shell script) that grabs audio tracks off a CD, encodes them to various formats, and tags them, all in one go. @@ -39,9 +35,8 @@ tags them, all in one go. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 +%patch2 -p0 %patch3 -p0 -%patch4 -p1 mv examples/cue2discid . @@ -70,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Apr 2 2010 Ville Skyttä - 2.4.1-1 +- Update to 2.4.1. + * Sun Oct 18 2009 Ville Skyttä - 2.4.0-1 - Update to 2.4.0 (#529509). diff --git a/sources b/sources index 8588586..aea6e87 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -621abafbfc4eecbbc887dc400d697c2f abcde_2.4.0.orig.tar.gz +1f663da556060354626354b4dc5ce5cf abcde_2.4.1.orig.tar.gz From e93d752f06da0c51c9903835eda801696cbc3b04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 30 May 2010 17:26:48 +0000 Subject: [PATCH 04/63] - Update to 2.4.2 (#597723), track info patch applied upstream. --- .cvsignore | 2 +- abcde-2.3.99.7-trackinfo.patch | 13 ------------- abcde.spec | 8 ++++---- sources | 2 +- 4 files changed, 6 insertions(+), 19 deletions(-) delete mode 100644 abcde-2.3.99.7-trackinfo.patch diff --git a/.cvsignore b/.cvsignore index 5cc4ed8..f0cc9b5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abcde_2.4.1.orig.tar.gz +abcde_2.4.2.orig.tar.gz diff --git a/abcde-2.3.99.7-trackinfo.patch b/abcde-2.3.99.7-trackinfo.patch deleted file mode 100644 index 51e5c5e..0000000 --- a/abcde-2.3.99.7-trackinfo.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: abcde -=================================================================== ---- abcde (revision 256) -+++ abcde (working copy) -@@ -421,7 +421,7 @@ - TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')" - ;; - TRACK-INFO) -- grep ^EXTT$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | perl -p -e 's/\\n/\n/;' -+ grep ^EXTT$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | sed -e 's/\\n/\n/g' - ;; - esac - } diff --git a/abcde.spec b/abcde.spec index f85f841..4f74543 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,5 +1,5 @@ Name: abcde -Version: 2.4.1 +Version: 2.4.2 Release: 1%{?dist} Summary: A Better CD Encoder @@ -13,8 +13,6 @@ Patch0: %{name}-2.4.0-config.patch Patch1: %{name}-2.1.19-inst.patch # http://code.google.com/p/abcde/issues/detail?id=19 Patch2: %{name}-2.4.1-tagging.patch -# http://code.google.com/p/abcde/issues/detail?id=18 -Patch3: %{name}-2.3.99.7-trackinfo.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -36,7 +34,6 @@ tags them, all in one go. %patch0 -p1 %patch1 -p1 %patch2 -p0 -%patch3 -p0 mv examples/cue2discid . @@ -65,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun May 30 2010 Ville Skyttä - 2.4.2-1 +- Update to 2.4.2 (#597723), track info patch applied upstream. + * Fri Apr 2 2010 Ville Skyttä - 2.4.1-1 - Update to 2.4.1. diff --git a/sources b/sources index aea6e87..51178f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1f663da556060354626354b4dc5ce5cf abcde_2.4.1.orig.tar.gz +2147527c245ed70af7b218b642201669 abcde_2.4.2.orig.tar.gz From 8b79e0d3b45fd48a439388509f513cab8d596808 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:30:53 +0000 Subject: [PATCH 05/63] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index c25dc0b..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: abcde -# $Id$ -NAME := abcde -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 266a7ca1174f73b6cded4c5a6ccb48f908acff2b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 18:06:30 -0600 Subject: [PATCH 06/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- abcde.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abcde.spec b/abcde.spec index 4f74543..8c5a173 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,6 +1,6 @@ Name: abcde Version: 2.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Better CD Encoder Group: Applications/Multimedia @@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 07 2011 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sun May 30 2010 Ville Skyttä - 2.4.2-1 - Update to 2.4.2 (#597723), track info patch applied upstream. From 1965e3c25bb269ff0d7a2b459ad478b7d9aa157f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 21:08:45 -0600 Subject: [PATCH 07/63] fix up version in changelog --- abcde.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abcde.spec b/abcde.spec index 8c5a173..c0f91b8 100644 --- a/abcde.spec +++ b/abcde.spec @@ -62,7 +62,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Mon Feb 07 2011 Fedora Release Engineering +* Mon Feb 07 2011 Fedora Release Engineering -2.4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild * Sun May 30 2010 Ville Skyttä - 2.4.2-1 From cc9ffd1c5e075baa3b4487280796991c62947b24 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 23:23:22 -0600 Subject: [PATCH 08/63] remove unsupported Requires(hint) from spec --- abcde.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/abcde.spec b/abcde.spec index c0f91b8..520c68c 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,6 +1,6 @@ Name: abcde Version: 2.4.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Better CD Encoder Group: Applications/Multimedia @@ -20,8 +20,8 @@ Requires: cd-discid Requires: cdparanoia Requires: wget Requires: which -Requires(hint): vorbis-tools -Requires(hint): flac +Requires: vorbis-tools +Requires: flac %description abcde is a front end command line utility (actually, a shell script) @@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Feb 09 2011 Dennis Gilmore -2.4.2-3 +- remove unsupported Requires(hint) from spec + * Mon Feb 07 2011 Fedora Release Engineering -2.4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 9ab988b5b0a8fd8d7f9ee65f7101a7189c0deb20 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 14:56:33 -0600 Subject: [PATCH 09/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- abcde.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abcde.spec b/abcde.spec index 520c68c..a612fb3 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,6 +1,6 @@ Name: abcde Version: 2.4.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A Better CD Encoder Group: Applications/Multimedia @@ -62,6 +62,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 2.4.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Wed Feb 09 2011 Dennis Gilmore -2.4.2-3 - remove unsupported Requires(hint) from spec From 14bb6bff056aa5950798a43d2289ba24471eb1c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 15 Apr 2012 21:16:24 +0300 Subject: [PATCH 10/63] Update to 2.5.0. - Clean up specfile constructs no longer needed in Fedora or EL6+. --- .gitignore | 2 +- ...19-inst.patch => abcde-2.5.0-install.patch | 9 +++++--- abcde.spec | 21 +++++++++---------- sources | 2 +- 4 files changed, 18 insertions(+), 16 deletions(-) rename abcde-2.1.19-inst.patch => abcde-2.5.0-install.patch (65%) diff --git a/.gitignore b/.gitignore index f0cc9b5..dafa321 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -abcde_2.4.2.orig.tar.gz +/*.tar.* diff --git a/abcde-2.1.19-inst.patch b/abcde-2.5.0-install.patch similarity index 65% rename from abcde-2.1.19-inst.patch rename to abcde-2.5.0-install.patch index 0f39e39..1025d9a 100644 --- a/abcde-2.1.19-inst.patch +++ b/abcde-2.5.0-install.patch @@ -1,13 +1,16 @@ ---- abcde-2.1.19/Makefile.inst 2004-04-09 20:12:15.000000000 +0200 -+++ abcde-2.1.19/Makefile 2004-04-14 13:06:31.680708323 +0200 -@@ -14,13 +14,13 @@ +diff -up abcde-2.5.0/Makefile~ abcde-2.5.0/Makefile +--- abcde-2.5.0/Makefile~ 2012-04-13 23:56:01.000000000 +0300 ++++ abcde-2.5.0/Makefile 2012-04-15 20:56:47.544597621 +0300 +@@ -14,14 +14,14 @@ clean: install: $(INSTALL) -d -m 755 $(bindir) - $(INSTALL) -m 755 -o 0 abcde $(bindir) - $(INSTALL) -m 755 -o 0 cddb-tool $(bindir) +- $(INSTALL) -m 755 -o 0 abcde-musicbrainz-tool $(bindir) + $(INSTALL) -m 755 abcde $(bindir) + $(INSTALL) -m 755 cddb-tool $(bindir) ++ $(INSTALL) -m 755 abcde-musicbrainz-tool $(bindir) $(INSTALL) -d -m 755 $(mandir) - $(INSTALL) -m 644 -o 0 abcde.1 $(mandir) - $(INSTALL) -m 644 -o 0 cddb-tool.1 $(mandir) diff --git a/abcde.spec b/abcde.spec index a612fb3..4cb6f1b 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,19 +1,17 @@ Name: abcde -Version: 2.4.2 -Release: 4%{?dist} +Version: 2.5.0 +Release: 1%{?dist} Summary: A Better CD Encoder -Group: Applications/Multimedia # Public domain after 2010-01-01, see comments in abcde and cddb-tool License: Public Domain URL: http://code.google.com/p/abcde/ -Source0: http://ftp.debian.org/debian/pool/main/a/abcde/%{name}_%{version}.orig.tar.gz +Source0: http://abcde.googlecode.com/files/%{name}-%{version}.tar.gz Patch0: %{name}-2.4.0-config.patch # http://code.google.com/p/abcde/issues/detail?id=17 -Patch1: %{name}-2.1.19-inst.patch +Patch1: %{name}-2.5.0-install.patch # http://code.google.com/p/abcde/issues/detail?id=19 Patch2: %{name}-2.4.1-tagging.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: cd-discid @@ -44,15 +42,12 @@ mv examples/cue2discid . rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir} - - -%clean -rm -rf $RPM_BUILD_ROOT +rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, some deps N/A %files -%defattr(-,root,root,-) %doc COPYING FAQ KNOWN.BUGS README TODO USEPIPES changelog examples/ +%doc abcde-musicbrainz-tool %config(noreplace) %{_sysconfdir}/abcde.conf %{_bindir}/abcde %{_bindir}/cddb-tool @@ -62,6 +57,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Apr 15 2012 Ville Skyttä - 2.5.0-1 +- Update to 2.5.0. +- Clean up specfile constructs no longer needed in Fedora or EL6+. + * Thu Jan 12 2012 Fedora Release Engineering - 2.4.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 51178f9..84b050b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2147527c245ed70af7b218b642201669 abcde_2.4.2.orig.tar.gz +4792184ae0a1711b23006d4333a79837 abcde-2.5.0.tar.gz From b4b93380665686b0db414580700e67e96dabb00c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 29 Apr 2012 23:27:15 +0300 Subject: [PATCH 11/63] Update to 2.5.2. --- abcde-2.4.1-tagging.patch | 30 ------------------------------ abcde-2.5.0-install.patch | 24 ------------------------ abcde.spec | 16 +++++++--------- sources | 2 +- 4 files changed, 8 insertions(+), 64 deletions(-) delete mode 100644 abcde-2.4.1-tagging.patch delete mode 100644 abcde-2.5.0-install.patch diff --git a/abcde-2.4.1-tagging.patch b/abcde-2.4.1-tagging.patch deleted file mode 100644 index f8267c5..0000000 --- a/abcde-2.4.1-tagging.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: abcde -=================================================================== ---- abcde (revision 290) -+++ abcde (working copy) -@@ -1121,11 +1121,10 @@ - *=*) ;; - *) COMMENT="COMMENT=$COMMENT" ;; - esac -- COMMENT="--comment \"$COMMENT\"" - fi -- # Quick hack to avoid tagging Ogg/Speex, since there is no other way to tag than inline tagging -- if [ ! "$DOTAG" = "y" ]; then -- $RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS --author "$TRACKARTIST" --title "$TRACKNAME" --comment "$COMMENT" "$IN" "$OUT" -+ # Tag the file at encode time, as it can't be done after encoding. -+ if [ "$DOTAG" = "y" ]; then -+ $RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS --author "$TRACKARTIST" --title "$TRACKNAME" ${COMMENT:+--comment "$COMMENT"} "$IN" "$OUT" - else - $RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS "$IN" "$OUT" - fi -@@ -1140,8 +1139,8 @@ - $RUN_COMMAND nice $EFFECTIVE_NICE $MPPENCODER $MPPENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" --year "$CDYEAR" --comment "$COMMENT" "$IN" "$OUT" - ;; - m4a) -- # Quick hack to avoid tagging Ogg/Speex, since there is no other way to tag than inline tagging -- if [ ! "$DOTAG" = "y" ]; then -+ # Tag the file at encode time, as it can't be done after encoding. -+ if [ "$DOTAG" = "y" ]; then - $RUN_COMMAND nice $EFFECTIVE_NICE $AACENCODER $AACENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" --year "$CDYEAR" --comment "$COMMENT" -o "$OUT" "$IN" - - else diff --git a/abcde-2.5.0-install.patch b/abcde-2.5.0-install.patch deleted file mode 100644 index 1025d9a..0000000 --- a/abcde-2.5.0-install.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up abcde-2.5.0/Makefile~ abcde-2.5.0/Makefile ---- abcde-2.5.0/Makefile~ 2012-04-13 23:56:01.000000000 +0300 -+++ abcde-2.5.0/Makefile 2012-04-15 20:56:47.544597621 +0300 -@@ -14,14 +14,14 @@ clean: - - install: - $(INSTALL) -d -m 755 $(bindir) -- $(INSTALL) -m 755 -o 0 abcde $(bindir) -- $(INSTALL) -m 755 -o 0 cddb-tool $(bindir) -- $(INSTALL) -m 755 -o 0 abcde-musicbrainz-tool $(bindir) -+ $(INSTALL) -m 755 abcde $(bindir) -+ $(INSTALL) -m 755 cddb-tool $(bindir) -+ $(INSTALL) -m 755 abcde-musicbrainz-tool $(bindir) - $(INSTALL) -d -m 755 $(mandir) -- $(INSTALL) -m 644 -o 0 abcde.1 $(mandir) -- $(INSTALL) -m 644 -o 0 cddb-tool.1 $(mandir) -+ $(INSTALL) -m 644 abcde.1 $(mandir) -+ $(INSTALL) -m 644 cddb-tool.1 $(mandir) - $(INSTALL) -d -m 755 $(etcdir) -- $(INSTALL) -m 644 -o 0 abcde.conf $(etcdir) -+ $(INSTALL) -m 644 abcde.conf $(etcdir) - - tarball: - @cd .. && tar czvf abcde_$(VERSION).orig.tar.gz \ diff --git a/abcde.spec b/abcde.spec index 4cb6f1b..59fd481 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,5 +1,5 @@ Name: abcde -Version: 2.5.0 +Version: 2.5.2 Release: 1%{?dist} Summary: A Better CD Encoder @@ -8,18 +8,15 @@ License: Public Domain URL: http://code.google.com/p/abcde/ Source0: http://abcde.googlecode.com/files/%{name}-%{version}.tar.gz Patch0: %{name}-2.4.0-config.patch -# http://code.google.com/p/abcde/issues/detail?id=17 -Patch1: %{name}-2.5.0-install.patch -# http://code.google.com/p/abcde/issues/detail?id=19 -Patch2: %{name}-2.4.1-tagging.patch BuildArch: noarch Requires: cd-discid Requires: cdparanoia +Requires: flac +Requires: icedax +Requires: vorbis-tools Requires: wget Requires: which -Requires: vorbis-tools -Requires: flac %description abcde is a front end command line utility (actually, a shell script) @@ -30,8 +27,6 @@ tags them, all in one go. %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p0 mv examples/cue2discid . @@ -57,6 +52,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, some deps N/A %changelog +* Sun Apr 29 2012 Ville Skyttä - 2.5.2-1 +- Update to 2.5.2. + * Sun Apr 15 2012 Ville Skyttä - 2.5.0-1 - Update to 2.5.0. - Clean up specfile constructs no longer needed in Fedora or EL6+. diff --git a/sources b/sources index 84b050b..dc789a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4792184ae0a1711b23006d4333a79837 abcde-2.5.0.tar.gz +6ab225f808822d0a1956efa18f7cabc5 abcde-2.5.2.tar.gz From 24dc21cb929580d5124468ec4846dbb13abe9184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 17 Jun 2012 13:03:48 +0300 Subject: [PATCH 12/63] Update to 2.5.3. --- abcde.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/abcde.spec b/abcde.spec index 59fd481..e1147be 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,5 +1,5 @@ Name: abcde -Version: 2.5.2 +Version: 2.5.3 Release: 1%{?dist} Summary: A Better CD Encoder @@ -52,6 +52,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, some deps N/A %changelog +* Sun Jun 17 2012 Ville Skyttä - 2.5.3-1 +- Update to 2.5.3. + * Sun Apr 29 2012 Ville Skyttä - 2.5.2-1 - Update to 2.5.2. diff --git a/sources b/sources index dc789a7..17717e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6ab225f808822d0a1956efa18f7cabc5 abcde-2.5.2.tar.gz +33faab8dfddcef9c720b3b335e9ada81 abcde-2.5.3.tar.gz From 562d97147e60036523915a1e8b58769aac82c5f4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 10:27:20 -0500 Subject: [PATCH 13/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- abcde.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abcde.spec b/abcde.spec index e1147be..1f3b10a 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,6 +1,6 @@ Name: abcde Version: 2.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Better CD Encoder # Public domain after 2010-01-01, see comments in abcde and cddb-tool @@ -52,6 +52,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, some deps N/A %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 2.5.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sun Jun 17 2012 Ville Skyttä - 2.5.3-1 - Update to 2.5.3. From 7d404fe6a3d0750ad86cd99965483d6e8fbd2c60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 20 Sep 2012 00:22:07 +0300 Subject: [PATCH 14/63] Update to 2.5.4. --- abcde.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/abcde.spec b/abcde.spec index 1f3b10a..2d83375 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,6 +1,6 @@ Name: abcde -Version: 2.5.3 -Release: 2%{?dist} +Version: 2.5.4 +Release: 1%{?dist} Summary: A Better CD Encoder # Public domain after 2010-01-01, see comments in abcde and cddb-tool @@ -52,6 +52,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, some deps N/A %changelog +* Wed Sep 19 2012 Ville Skyttä - 2.5.4-1 +- Update to 2.5.4. + * Wed Jul 18 2012 Fedora Release Engineering - 2.5.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 17717e1..ab24bea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -33faab8dfddcef9c720b3b335e9ada81 abcde-2.5.3.tar.gz +d761c5a07854ce24748be9aa10100e74 abcde-2.5.4.tar.gz From 409611814fd269a8ecca6d938941f6fecfae678d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 10:12:43 -0600 Subject: [PATCH 15/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- abcde.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abcde.spec b/abcde.spec index 2d83375..6d45bc1 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,6 +1,6 @@ Name: abcde Version: 2.5.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Better CD Encoder # Public domain after 2010-01-01, see comments in abcde and cddb-tool @@ -52,6 +52,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, some deps N/A %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 2.5.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Wed Sep 19 2012 Ville Skyttä - 2.5.4-1 - Update to 2.5.4. From 37c8d6927ff8ab015e355b22b26433952c6e10b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 2 Aug 2013 00:03:17 +0300 Subject: [PATCH 16/63] Apply upstream + --comment fixes for eyeD3 >= 0.7.0 (#991163). --- abcde-2.5.4-eyed3_07-991163.patch | 28 ++++++++++++++++++++++++++++ abcde.spec | 10 +++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 abcde-2.5.4-eyed3_07-991163.patch diff --git a/abcde-2.5.4-eyed3_07-991163.patch b/abcde-2.5.4-eyed3_07-991163.patch new file mode 100644 index 0000000..a77a879 --- /dev/null +++ b/abcde-2.5.4-eyed3_07-991163.patch @@ -0,0 +1,28 @@ +diff -up abcde-2.5.4/abcde~ abcde-2.5.4/abcde +--- abcde-2.5.4/abcde~ 2012-09-18 16:09:31.000000000 +0300 ++++ abcde-2.5.4/abcde 2013-08-01 23:58:04.137972845 +0300 +@@ -825,12 +825,12 @@ do_tag () + # FIXME # track numbers in mp3 come with 1/10, so we cannot + # happily substitute them with $TRACKNUM + run_command tagtrack-$OUTPUT-$1 nice $ENCNICE $TAGGER $TAGGEROPTS \ +- --comment=::"$COMMENTOUTPUT" -A "$DALBUM" \ ++ --comment="$COMMENTOUTPUT" -A "$DALBUM" \ + -a "$TRACKARTIST" -t "$TRACKNAME" -Y "$CDYEAR" \ + -G "$GENREID" -n "${TRACKNUM:-$1}" \ + ${TRACKNUM:+-N "$TRACKS"} \ +- ${ENCODING:+--set-encoding="$ENCODING"} \ +- ${TPE2:+--set-text-frame=TPE2:"$TPE2"} \ ++ ${ENCODING:+--encoding="$ENCODING"} \ ++ ${TPE2:+--text-frame=TPE2:"$TPE2"} \ + "$ABCDETEMPDIR/track$1.$OUTPUT" + ;; + # FIXME # Still not activated... +@@ -3879,7 +3879,7 @@ else + TAGGER="$EYED3" + TAGGEROPTS="$ID3V2OPTS" + ID3SYNTAX=eyed3 +- TAGGEROPTS="--set-encoding=utf16-LE $ID3V2OPTS" ++ TAGGEROPTS="--encoding=utf16 $ID3V2OPTS" + fi + + # NOGAP is specific to lame. Other encoders fail ... diff --git a/abcde.spec b/abcde.spec index 6d45bc1..af2caca 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,6 +1,6 @@ Name: abcde Version: 2.5.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Better CD Encoder # Public domain after 2010-01-01, see comments in abcde and cddb-tool @@ -8,6 +8,9 @@ License: Public Domain URL: http://code.google.com/p/abcde/ Source0: http://abcde.googlecode.com/files/%{name}-%{version}.tar.gz Patch0: %{name}-2.4.0-config.patch +# http://code.google.com/p/abcde/source/detail?r=379 +# http://code.google.com/p/abcde/issues/detail?id=99 +Patch1: %{name}-2.5.4-eyed3_07-991163.patch BuildArch: noarch Requires: cd-discid @@ -17,6 +20,7 @@ Requires: icedax Requires: vorbis-tools Requires: wget Requires: which +Conflicts: python-eyed3 < 0.7.0 %description abcde is a front end command line utility (actually, a shell script) @@ -27,6 +31,7 @@ tags them, all in one go. %prep %setup -q %patch0 -p1 +%patch1 -p1 mv examples/cue2discid . @@ -52,6 +57,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, some deps N/A %changelog +* Thu Aug 1 2013 Ville Skyttä - 2.5.4-3 +- Apply upstream + --comment fixes for eyeD3 >= 0.7.0 (#991163). + * Wed Feb 13 2013 Fedora Release Engineering - 2.5.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 4e089ec145ec31c7bc00d335aa308634b9fa8271 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 17 Apr 2014 22:36:25 +0300 Subject: [PATCH 17/63] Fix eyeD3 tagging of entries without year info --- abcde-2.5.4-eyed3-empty-year.patch | 12 ++++++++++++ abcde.spec | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 abcde-2.5.4-eyed3-empty-year.patch diff --git a/abcde-2.5.4-eyed3-empty-year.patch b/abcde-2.5.4-eyed3-empty-year.patch new file mode 100644 index 0000000..6f64b5a --- /dev/null +++ b/abcde-2.5.4-eyed3-empty-year.patch @@ -0,0 +1,12 @@ +diff -up abcde-2.5.4/abcde.orig abcde-2.5.4/abcde +--- abcde-2.5.4/abcde.orig 2014-04-17 21:56:03.675957914 +0300 ++++ abcde-2.5.4/abcde 2014-04-17 21:56:14.415166223 +0300 +@@ -826,7 +826,7 @@ do_tag () + # happily substitute them with $TRACKNUM + run_command tagtrack-$OUTPUT-$1 nice $ENCNICE $TAGGER $TAGGEROPTS \ + --comment="$COMMENTOUTPUT" -A "$DALBUM" \ +- -a "$TRACKARTIST" -t "$TRACKNAME" -Y "$CDYEAR" \ ++ -a "$TRACKARTIST" -t "$TRACKNAME" ${CDYEAR:+-Y "$CDYEAR"} \ + -G "$GENREID" -n "${TRACKNUM:-$1}" \ + ${TRACKNUM:+-N "$TRACKS"} \ + ${ENCODING:+--encoding="$ENCODING"} \ diff --git a/abcde.spec b/abcde.spec index af2caca..f12a4a9 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,6 +1,6 @@ Name: abcde Version: 2.5.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A Better CD Encoder # Public domain after 2010-01-01, see comments in abcde and cddb-tool @@ -11,6 +11,8 @@ Patch0: %{name}-2.4.0-config.patch # http://code.google.com/p/abcde/source/detail?r=379 # http://code.google.com/p/abcde/issues/detail?id=99 Patch1: %{name}-2.5.4-eyed3_07-991163.patch +# http://code.google.com/p/abcde/issues/detail?id=107 +Patch2: %{name}-2.5.4-eyed3-empty-year.patch BuildArch: noarch Requires: cd-discid @@ -32,6 +34,7 @@ tags them, all in one go. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 mv examples/cue2discid . @@ -57,6 +60,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, some deps N/A %changelog +* Thu Apr 17 2014 Ville Skyttä - 2.5.4-4 +- Fix eyeD3 tagging of entries without year info + * Thu Aug 1 2013 Ville Skyttä - 2.5.4-3 - Apply upstream + --comment fixes for eyeD3 >= 0.7.0 (#991163). From 29a2e3de8dc24c05619b1a661cb2b4870d329009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 17 Apr 2014 22:39:52 +0300 Subject: [PATCH 18/63] Fix bogus date in %changelog --- abcde.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/abcde.spec b/abcde.spec index f12a4a9..33db7bc 100644 --- a/abcde.spec +++ b/abcde.spec @@ -62,6 +62,7 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, some deps N/A %changelog * Thu Apr 17 2014 Ville Skyttä - 2.5.4-4 - Fix eyeD3 tagging of entries without year info +- Fix bogus date in %%changelog * Thu Aug 1 2013 Ville Skyttä - 2.5.4-3 - Apply upstream + --comment fixes for eyeD3 >= 0.7.0 (#991163). @@ -161,7 +162,7 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, some deps N/A - 2.3.2, vi and genre patches applied upstream. - Convert man page to UTF-8. -* Fri Apr 7 2005 Michael Schwendt - 2.2.3-2 +* Wed Apr 6 2005 Michael Schwendt - 2.2.3-2 - rebuilt * Thu Feb 10 2005 Ville Skyttä - 2.2.3-1 From 8cfdbde9fb81b15696f24323d25290b0d4780081 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 18:56:54 -0500 Subject: [PATCH 19/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- abcde.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abcde.spec b/abcde.spec index 33db7bc..7f3cc50 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,6 +1,6 @@ Name: abcde Version: 2.5.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A Better CD Encoder # Public domain after 2010-01-01, see comments in abcde and cddb-tool @@ -60,6 +60,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, some deps N/A %changelog +* Fri Jun 06 2014 Fedora Release Engineering - 2.5.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu Apr 17 2014 Ville Skyttä - 2.5.4-4 - Fix eyeD3 tagging of entries without year info - Fix bogus date in %%changelog From 9fa08be20d9abfee47c85f410008cf4d0c3998c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 9 Nov 2014 20:05:08 +0200 Subject: [PATCH 20/63] Update to 2.6 - Mark COPYING as %license where applicable --- 0001-Drop-EXTRAVERBOSE-debugging-noise.patch | 24 +++++++++++++++++ abcde-2.5.4-eyed3-empty-year.patch | 12 --------- abcde-2.5.4-eyed3_07-991163.patch | 28 -------------------- abcde.spec | 27 ++++++++++--------- sources | 2 +- 5 files changed, 40 insertions(+), 53 deletions(-) create mode 100644 0001-Drop-EXTRAVERBOSE-debugging-noise.patch delete mode 100644 abcde-2.5.4-eyed3-empty-year.patch delete mode 100644 abcde-2.5.4-eyed3_07-991163.patch diff --git a/0001-Drop-EXTRAVERBOSE-debugging-noise.patch b/0001-Drop-EXTRAVERBOSE-debugging-noise.patch new file mode 100644 index 0000000..d7e67f7 --- /dev/null +++ b/0001-Drop-EXTRAVERBOSE-debugging-noise.patch @@ -0,0 +1,24 @@ +From 3a8aef3db1c8effa1dc9a5a770dcd38c96169b2a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ville=20Skytt=C3=A4?= +Date: Sun, 9 Nov 2014 20:00:40 +0200 +Subject: [PATCH] Drop EXTRAVERBOSE debugging noise + +--- + abcde | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/abcde b/abcde +index f6bf90d..2d1ecc4 100755 +--- a/abcde ++++ b/abcde +@@ -3447,7 +3447,6 @@ fi + # We used to use EXTRAVERBOSE=y to turn on more debug output. Now + # that's changed to a number to allow for more control. Deal with + # EXTRAVERBOSE=y/n, set it to 1/0 for backwards compatibility. +-echo "Looking at EXTRAVERBOSE ($EXTRAVERBOSE)" + case "$EXTRAVERBOSE" in + *y*|*Y*) + EXTRAVERBOSE=1 +-- +1.9.3 + diff --git a/abcde-2.5.4-eyed3-empty-year.patch b/abcde-2.5.4-eyed3-empty-year.patch deleted file mode 100644 index 6f64b5a..0000000 --- a/abcde-2.5.4-eyed3-empty-year.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up abcde-2.5.4/abcde.orig abcde-2.5.4/abcde ---- abcde-2.5.4/abcde.orig 2014-04-17 21:56:03.675957914 +0300 -+++ abcde-2.5.4/abcde 2014-04-17 21:56:14.415166223 +0300 -@@ -826,7 +826,7 @@ do_tag () - # happily substitute them with $TRACKNUM - run_command tagtrack-$OUTPUT-$1 nice $ENCNICE $TAGGER $TAGGEROPTS \ - --comment="$COMMENTOUTPUT" -A "$DALBUM" \ -- -a "$TRACKARTIST" -t "$TRACKNAME" -Y "$CDYEAR" \ -+ -a "$TRACKARTIST" -t "$TRACKNAME" ${CDYEAR:+-Y "$CDYEAR"} \ - -G "$GENREID" -n "${TRACKNUM:-$1}" \ - ${TRACKNUM:+-N "$TRACKS"} \ - ${ENCODING:+--encoding="$ENCODING"} \ diff --git a/abcde-2.5.4-eyed3_07-991163.patch b/abcde-2.5.4-eyed3_07-991163.patch deleted file mode 100644 index a77a879..0000000 --- a/abcde-2.5.4-eyed3_07-991163.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -up abcde-2.5.4/abcde~ abcde-2.5.4/abcde ---- abcde-2.5.4/abcde~ 2012-09-18 16:09:31.000000000 +0300 -+++ abcde-2.5.4/abcde 2013-08-01 23:58:04.137972845 +0300 -@@ -825,12 +825,12 @@ do_tag () - # FIXME # track numbers in mp3 come with 1/10, so we cannot - # happily substitute them with $TRACKNUM - run_command tagtrack-$OUTPUT-$1 nice $ENCNICE $TAGGER $TAGGEROPTS \ -- --comment=::"$COMMENTOUTPUT" -A "$DALBUM" \ -+ --comment="$COMMENTOUTPUT" -A "$DALBUM" \ - -a "$TRACKARTIST" -t "$TRACKNAME" -Y "$CDYEAR" \ - -G "$GENREID" -n "${TRACKNUM:-$1}" \ - ${TRACKNUM:+-N "$TRACKS"} \ -- ${ENCODING:+--set-encoding="$ENCODING"} \ -- ${TPE2:+--set-text-frame=TPE2:"$TPE2"} \ -+ ${ENCODING:+--encoding="$ENCODING"} \ -+ ${TPE2:+--text-frame=TPE2:"$TPE2"} \ - "$ABCDETEMPDIR/track$1.$OUTPUT" - ;; - # FIXME # Still not activated... -@@ -3879,7 +3879,7 @@ else - TAGGER="$EYED3" - TAGGEROPTS="$ID3V2OPTS" - ID3SYNTAX=eyed3 -- TAGGEROPTS="--set-encoding=utf16-LE $ID3V2OPTS" -+ TAGGEROPTS="--encoding=utf16 $ID3V2OPTS" - fi - - # NOGAP is specific to lame. Other encoders fail ... diff --git a/abcde.spec b/abcde.spec index 7f3cc50..4d13438 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,18 +1,15 @@ Name: abcde -Version: 2.5.4 -Release: 5%{?dist} +Version: 2.6 +Release: 1%{?dist} Summary: A Better CD Encoder # Public domain after 2010-01-01, see comments in abcde and cddb-tool License: Public Domain -URL: http://code.google.com/p/abcde/ -Source0: http://abcde.googlecode.com/files/%{name}-%{version}.tar.gz +URL: http://abcde.einval.com/ +Source0: http://abcde.einval.com/download/%{name}-%{version}.tar.gz Patch0: %{name}-2.4.0-config.patch -# http://code.google.com/p/abcde/source/detail?r=379 -# http://code.google.com/p/abcde/issues/detail?id=99 -Patch1: %{name}-2.5.4-eyed3_07-991163.patch -# http://code.google.com/p/abcde/issues/detail?id=107 -Patch2: %{name}-2.5.4-eyed3-empty-year.patch +# http://git.einval.com/cgi-bin/gitweb.cgi?p=abcde.git;a=patch;h=3a8aef3 +Patch1: 0001-Drop-EXTRAVERBOSE-debugging-noise.patch BuildArch: noarch Requires: cd-discid @@ -32,10 +29,10 @@ tags them, all in one go. %prep %setup -q -%patch0 -p1 +%patch0 -p1 -F2 %patch1 -p1 -%patch2 -p1 mv examples/cue2discid . +chmod -c -x abcde-musicbrainz-tool %build @@ -49,7 +46,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, some deps N/A %files -%doc COPYING FAQ KNOWN.BUGS README TODO USEPIPES changelog examples/ +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc FAQ KNOWN.BUGS README TODO USEPIPES changelog examples/ %doc abcde-musicbrainz-tool %config(noreplace) %{_sysconfdir}/abcde.conf %{_bindir}/abcde @@ -60,6 +59,10 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, some deps N/A %changelog +* Sun Nov 9 2014 Ville Skyttä - 2.6-1 +- Update to 2.6 +- Mark COPYING as %%license where applicable + * Fri Jun 06 2014 Fedora Release Engineering - 2.5.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index ab24bea..26a7b44 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d761c5a07854ce24748be9aa10100e74 abcde-2.5.4.tar.gz +c8b91d5c53386cfc4345d9d49f67e1dd abcde-2.6.tar.gz From 3d546c657140f4c054e87309e682a1cb96620e28 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 16 Jun 2015 23:31:47 +0000 Subject: [PATCH 21/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- abcde.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abcde.spec b/abcde.spec index 4d13438..550f7c0 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,6 +1,6 @@ Name: abcde Version: 2.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Better CD Encoder # Public domain after 2010-01-01, see comments in abcde and cddb-tool @@ -59,6 +59,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, some deps N/A %changelog +* Tue Jun 16 2015 Fedora Release Engineering - 2.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Sun Nov 9 2014 Ville Skyttä - 2.6-1 - Update to 2.6 - Mark COPYING as %%license where applicable From 5584bc913af30b007b00405f8dcf485b728b5896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 22 Jun 2015 11:44:45 +0300 Subject: [PATCH 22/63] Update to 2.7 - Use python3 in cue2discid - Soften some dependencies --- 0001-Drop-EXTRAVERBOSE-debugging-noise.patch | 24 --------- ...-config.patch => abcde-2.7-normalize.patch | 54 +++++++++---------- abcde.spec | 38 +++++++------ sources | 2 +- 4 files changed, 50 insertions(+), 68 deletions(-) delete mode 100644 0001-Drop-EXTRAVERBOSE-debugging-noise.patch rename abcde-2.4.0-config.patch => abcde-2.7-normalize.patch (55%) diff --git a/0001-Drop-EXTRAVERBOSE-debugging-noise.patch b/0001-Drop-EXTRAVERBOSE-debugging-noise.patch deleted file mode 100644 index d7e67f7..0000000 --- a/0001-Drop-EXTRAVERBOSE-debugging-noise.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 3a8aef3db1c8effa1dc9a5a770dcd38c96169b2a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Skytt=C3=A4?= -Date: Sun, 9 Nov 2014 20:00:40 +0200 -Subject: [PATCH] Drop EXTRAVERBOSE debugging noise - ---- - abcde | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/abcde b/abcde -index f6bf90d..2d1ecc4 100755 ---- a/abcde -+++ b/abcde -@@ -3447,7 +3447,6 @@ fi - # We used to use EXTRAVERBOSE=y to turn on more debug output. Now - # that's changed to a number to allow for more control. Deal with - # EXTRAVERBOSE=y/n, set it to 1/0 for backwards compatibility. --echo "Looking at EXTRAVERBOSE ($EXTRAVERBOSE)" - case "$EXTRAVERBOSE" in - *y*|*Y*) - EXTRAVERBOSE=1 --- -1.9.3 - diff --git a/abcde-2.4.0-config.patch b/abcde-2.7-normalize.patch similarity index 55% rename from abcde-2.4.0-config.patch rename to abcde-2.7-normalize.patch index 037c9df..5d0106b 100644 --- a/abcde-2.4.0-config.patch +++ b/abcde-2.7-normalize.patch @@ -1,7 +1,7 @@ -diff -up abcde-2.4.0/abcde~ abcde-2.4.0/abcde ---- abcde-2.4.0/abcde~ 2009-10-17 11:51:57.000000000 +0300 -+++ abcde-2.4.0/abcde 2009-10-18 12:07:31.000000000 +0300 -@@ -3035,7 +3035,7 @@ MUSICBRAINZ=musicbrainz-get-tracks +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 @@ -10,10 +10,10 @@ diff -up abcde-2.4.0/abcde~ abcde-2.4.0/abcde CDSPEED=eject VORBISGAIN=vorbisgain MP3GAIN=mp3gain -diff -up abcde-2.4.0/abcde.1~ abcde-2.4.0/abcde.1 ---- abcde-2.4.0/abcde.1~ 2009-10-16 22:02:54.000000000 +0300 -+++ abcde-2.4.0/abcde.1 2009-10-18 12:07:32.000000000 +0300 -@@ -325,7 +325,7 @@ only support \'faac\', so \'default\' po +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\' @@ -22,7 +22,7 @@ diff -up abcde-2.4.0/abcde.1~ abcde-2.4.0/abcde.1 ATM. .TP .B CDROMREADERSYNTAX -@@ -563,7 +563,7 @@ An HTTP retrieval program: wget, fetch ( +@@ -606,7 +606,7 @@ ImageMagick package should be installed. (optional) distmp3, a client/server for distributed mp3 encoding. .TP .B * @@ -30,20 +30,20 @@ diff -up abcde-2.4.0/abcde.1~ abcde-2.4.0/abcde.1 +(optional) normalize, a WAV file volume normalizer. .TP .B * - (optional) a replaygain file volume modifier (vorbisgain, metaflac, mp3gain, replaygain), -@@ -575,7 +575,7 @@ An HTTP retrieval program: wget, fetch ( - .BR icedax (1), + (optional) a replaygain file volume modifier (vorbisgain, metaflac, mp3gain, mpcgain, wvgain), +@@ -620,7 +620,7 @@ ImageMagick package should be installed. .BR cdda2wav (1), + .BR pird (1), .BR dagrab (1), -.BR normalize-audio (1), +.BR normalize (1), .BR oggenc (1), .BR vorbize (1), .BR flac (1), -diff -up abcde-2.4.0/abcde.conf~ abcde-2.4.0/abcde.conf ---- abcde-2.4.0/abcde.conf~ 2009-10-16 22:02:54.000000000 +0300 -+++ abcde-2.4.0/abcde.conf 2009-10-18 12:07:34.000000000 +0300 -@@ -139,7 +139,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 @@ -52,24 +52,24 @@ diff -up abcde-2.4.0/abcde.conf~ abcde-2.4.0/abcde.conf #CDSPEED=eject #VORBISGAIN=vorbisgain #MKCUE=mkcue -diff -up abcde-2.4.0/README~ abcde-2.4.0/README ---- abcde-2.4.0/README~ 2009-10-16 22:02:54.000000000 +0300 -+++ abcde-2.4.0/README 2009-10-18 12:07:27.000000000 +0300 -@@ -152,7 +152,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: --* -b use batch processing. It uses normalize-audio to adjust the volume of -+* -b use batch processing. It uses normalize to adjust the volume of +-* -b use batch processing. It uses normalize-audio to adjust the volume of ++* -b use batch processing. It uses normalize to adjust the volume of 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. -@@ -205,7 +205,7 @@ abcde requires the following backend too - * Ogg/Speex encoder (speexenc) or: - * MPP/MP+(Musepack) encoder (mppenc) or: - * AAC encoder (faac) +@@ -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) -* normalize-audio for volume normalization. +* normalize for volume normalization. * CD Paranoia, an audio CD reading utility or: * icedax/cdda2wav, the audio CD reading utility cdparanoia was born from or: - * dagrab, another audio CD reading utility. + * cd-paranoia, an audio cd reading utility, courtesy of GNU libcdio or: diff --git a/abcde.spec b/abcde.spec index 550f7c0..64fcbbd 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,24 +1,27 @@ Name: abcde -Version: 2.6 -Release: 2%{?dist} +Version: 2.7 +Release: 1%{?dist} Summary: A Better CD Encoder -# Public domain after 2010-01-01, see comments in abcde and cddb-tool -License: Public Domain +# cddb-tool is Public Domain, otherwise GPLv2+ +License: GPLv2+ and Public Domain URL: http://abcde.einval.com/ Source0: http://abcde.einval.com/download/%{name}-%{version}.tar.gz -Patch0: %{name}-2.4.0-config.patch -# http://git.einval.com/cgi-bin/gitweb.cgi?p=abcde.git;a=patch;h=3a8aef3 -Patch1: 0001-Drop-EXTRAVERBOSE-debugging-noise.patch +Patch0: %{name}-2.7-normalize.patch BuildArch: noarch Requires: cd-discid -Requires: cdparanoia -Requires: flac -Requires: icedax -Requires: vorbis-tools Requires: wget Requires: which +# cdparanoia, vorbis-tools for defaults +Requires: cdparanoia +Requires: vorbis-tools +# icedax for cd-text +Recommends: icedax +Recommends: flac +Suggests: opus-tools +Suggests: speex-tools +Suggests: wavpack Conflicts: python-eyed3 < 0.7.0 %description @@ -30,9 +33,9 @@ tags them, all in one go. %prep %setup -q %patch0 -p1 -F2 -%patch1 -p1 mv examples/cue2discid . -chmod -c -x abcde-musicbrainz-tool +sed -i -e 's|bin/python\b|bin/python3|' cue2discid +chmod -c -x abcde-musicbrainz-tool examples/musicbrainz-get-tracks %build @@ -46,10 +49,8 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, some deps N/A %files -%{!?_licensedir:%global license %%doc} %license COPYING -%doc FAQ KNOWN.BUGS README TODO USEPIPES changelog examples/ -%doc abcde-musicbrainz-tool +%doc FAQ README abcde-musicbrainz-tool changelog examples/ %config(noreplace) %{_sysconfdir}/abcde.conf %{_bindir}/abcde %{_bindir}/cddb-tool @@ -59,6 +60,11 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, some deps N/A %changelog +* Sun Jun 21 2015 Ville Skyttä - 2.7-1 +- Update to 2.7 +- Use python3 in cue2discid +- Soften some dependencies + * Tue Jun 16 2015 Fedora Release Engineering - 2.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 26a7b44..e689791 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c8b91d5c53386cfc4345d9d49f67e1dd abcde-2.6.tar.gz +b947ec2b6baab8cf8388b1d6613664cb abcde-2.7.tar.gz From 707c54dcf42fab763cd3ee7755cf8dcdcfbf4485 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 4 Oct 2015 18:50:03 +0300 Subject: [PATCH 23/63] Update to 2.7.1 --- abcde.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/abcde.spec b/abcde.spec index 64fcbbd..5f18d8e 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,5 +1,5 @@ Name: abcde -Version: 2.7 +Version: 2.7.1 Release: 1%{?dist} Summary: A Better CD Encoder @@ -43,7 +43,8 @@ chmod -c -x abcde-musicbrainz-tool examples/musicbrainz-get-tracks %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$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, some deps N/A @@ -60,6 +61,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, some deps N/A %changelog +* Sun Oct 4 2015 Ville Skyttä - 2.7.1-1 +- Update to 2.7.1 + * Sun Jun 21 2015 Ville Skyttä - 2.7-1 - Update to 2.7 - Use python3 in cue2discid diff --git a/sources b/sources index e689791..3f79f98 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b947ec2b6baab8cf8388b1d6613664cb abcde-2.7.tar.gz +09d5c9dc6c0bf6dd4b3fb159e1433018 abcde-2.7.1.tar.gz From 0ff5605bb1e7b2793851f569501f862a13be4df6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 15:55:01 +0000 Subject: [PATCH 24/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- abcde.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abcde.spec b/abcde.spec index 5f18d8e..c2a3793 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,6 +1,6 @@ Name: abcde Version: 2.7.1 -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, some deps N/A %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 2.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sun Oct 4 2015 Ville Skyttä - 2.7.1-1 - Update to 2.7.1 From fcf4e0f9919d9cb794a741b66417535955ea2f17 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Sun, 10 Apr 2016 11:51:58 +0200 Subject: [PATCH 25/63] Update to 2.7.2 - Use HTTPS for URLs --- abcde.spec | 14 +++++++++----- sources | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/abcde.spec b/abcde.spec index c2a3793..eb655c4 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,12 +1,12 @@ Name: abcde -Version: 2.7.1 -Release: 2%{?dist} +Version: 2.7.2 +Release: 1%{?dist} Summary: A Better CD Encoder # cddb-tool is Public Domain, otherwise GPLv2+ License: GPLv2+ and Public Domain -URL: http://abcde.einval.com/ -Source0: http://abcde.einval.com/download/%{name}-%{version}.tar.gz +URL: https://abcde.einval.com/ +Source0: https://abcde.einval.com/download/%{name}-%{version}.tar.gz Patch0: %{name}-2.7-normalize.patch BuildArch: noarch @@ -46,7 +46,7 @@ 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, some deps N/A +rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, missing perl(MusicBrainz::DiscID) %files @@ -61,6 +61,10 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, some deps N/A %changelog +* Sun Apr 10 2016 Dominik Mierzejewski - 2.7.2-1 +- Update to 2.7.2 +- Use HTTPS for URLs + * Wed Feb 03 2016 Fedora Release Engineering - 2.7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 3f79f98..feb3d66 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -09d5c9dc6c0bf6dd4b3fb159e1433018 abcde-2.7.1.tar.gz +f9455231436d80329eacedf32441d9be abcde-2.7.2.tar.gz From 8c4c4b7400f5709f0e6679f830d4b5e4a30e8077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Dec 2016 18:20:36 +0100 Subject: [PATCH 26/63] 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 - 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 From 89f8d5ab7e1f0d45918730b127931c2b132238d9 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 18 Jan 2017 14:51:50 +0100 Subject: [PATCH 27/63] 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 - 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 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 Date: Thu, 19 Jan 2017 11:44:17 +0100 Subject: [PATCH 28/63] 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 - 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: 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 Date: Fri, 10 Feb 2017 05:40:16 +0000 Subject: [PATCH 29/63] - 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 - 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 From 67e6d84725f0a10e7a50c6f28f04125273c6e919 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 3 Jul 2017 11:04:05 +0200 Subject: [PATCH 30/63] 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 - 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 - 2.8.1-1 - Update to 2.8.1 From 7a51db553373ab3fc234eb148283037f2d852887 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 02:30:14 +0000 Subject: [PATCH 31/63] - 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 - 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 From ca9fa69361794140dbb570c979d76829bf109336 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 01:43:30 +0000 Subject: [PATCH 32/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 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 From 7da343052533119c175bb209f5ca248a142f0ff2 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 21 Feb 2018 11:19:16 +0100 Subject: [PATCH 33/63] 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 - 2.8.1-5 +- add Suggests for twolame, now that's included in Fedora 27+ (#1534297) + * Wed Jul 26 2017 Fedora Release Engineering - 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 Date: Wed, 21 Feb 2018 11:30:45 +0100 Subject: [PATCH 34/63] 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 zcmaLZ^;Z)B0>E(?Abk4|c^hG~U$b3}@w1%UP^|7$c2sj5UN$Ca^pLt=!_L&+H9NMWjrpd| zQK0?E;byKjDe;{uCV(x@C18oFb)?hz39zU7Q!0m4Q{g4W<|IR=B9p?zP{3&-9;3qp zCv|8g=Y5{8Z;N`I-OlfS&y?`Wmx12Nd%d09l$djoUWrpXNBV&x4!ZX7nrvaa2UQD# zj-aC|@`DZ?@wb}UU&jwp&?@;t(gl{0EwYVT4~R#g@yjEKq9~x7OgVFMx+F9G+1G_D znRlQbl%7Csw%yfM@A zPuV>=g?4i?dd8D>jz`lNJPD7?tDNXB*(mBh1rfEUn++iHV}kH7l?gUSsf`;>AClUJ z#%@Oyos*fpDN3A-ms@-d3)tgjX{}L%r>$85v$wq<*SLz|D9Y6ohg~MeFcGWA>3p0& z_9TVj?B}*A_-xxR@y6GTSrHSQBo^AuSyP7%^EaxtXV)D!yaeh%5qJb)+&W9 zWP(IbfYtgeFShmsBm#`>)7=@;cwt)m|Vn7;ooodxss1#?@96g`~A&ezrh z_~oZFZ?2K+$(S#t_`i-bBFrBs7SfKb;MFP-Yo`AELrqO7upvuJ=GVN#O*kW18-jgy zr4`oup6W>vorPSppZ0G~RLbj$QfNRsy>gQbBBS%I?uCASdTx$H0iz6S$)vRbB5sLl z(>Sp1}UmkOmj5Ftl%g`^Or z2ekzFd8YA-@aPmA|(bIv%K?TtN5> z?A<|xuHZsdF6dj=(bJhckPUD>(~R6VosRMK@lw?xrCAxH09}iBeb4(hrdE^J zGHYiP5Pf}v)6j$C^IgnqZd(zyoHzzjuDoHqdH;(wj_ws!m#vm^8yCLxZ65_5RVVis z+WTCKJ4`t|0tUszH|Fx4T9+p4Tr6E|Dl9F#%&=dHX}Y$!Jhakocq1B0ye&u+7&gm% zx%%?Iae4d`8w76e{KmowY~_NGjRHvi#l`tATmUBAzrKY2zb_+QAWj8X_eyD=YLid1 zvJmm!1dpkG;xI`ulnmFW0@U zV3qIVPehN49c0adJu(C-zwHd`aK#}4`nWqQJCM{^g6e#J#_KPJ6j!1{))mny!zV!+ zaAyT<;Y8aO*Mz=m5Ub_!m&EdhSN1IDPuAtTnew4Oj?rsJ*!ktQjPWlR6cQTBU^N$7 zD0x^PNc`#~YMbc5w2+luO6i4M6nhKu>F8nPfPC*jB)^btdynRr zOl!AoYsOfF%{A#ta)h6{oMk1c)9jgyQz~-{5aDV@i?w#`<~<}#64BsjrrN!YB;Ou7 zEk)b5LQpb(Ae^SAKMjgxnyN70^c}3Vqw=eYk^ZlJ*zfsaR~SA>sJ>!)$L5xFki$Tv zq#|~W@(V>NOS$*tP$4$ImC42?92bW(up!wt<48798H9pdm#X>pAU?_K1tP@oR#Y%@q*}Lj-iJ zvR0v3E(FvD$tZc@dd`#Yl^_B7zS;Q&C>9bnlSIj+?p#%V#r98ZSn( z@X#$E|)j z_c~SKzEA6q>S{VOrsA)??1^6Z9WiHRQa2vUJvovM6=m32gHrs-+#&yL85ec%Q0H@6v$;E*#XOA8KmWvZt+Y(2Id zh!w2I!vtLzBT1(^%>|Rwo(E1wqw3O_8{&vQK6ulnPBORkg(sx;qd6}0B?r6jr;SmB z1gD07ZcuLG;A*4R0PEk2q z*Ex5<)L3p+C%BdNMT~Y*{jFX|fnp43{1LGSjYD6d;Zw-RMfrpg0xF6T3N>Vb5`m~< zHL~7COUBI8Sxtz9MZfv)Hgy@`0&!|0rH{I)U>Z|g^t4yJdYG@Z2PNfM_p0b_9%(+E zsK^xgX^qV7G+GSK4w+f;VT=N2#=8^KpT=$_O6s$^X9)MX-&+}!^oXlrvx4PS4A|MH z`w26i#NH4UgQs_Aasqo>;C5GQg6iV)gVPL9qp8ILqtqbpSIKJ}d&wR)D!L_~B?*uW z+Btx`AO#O%uKnnbCza}uNR*AZ-gt+mOmA8sPc{bTbD%BM1qplJR=dcWe4k-^71B7m zC7qC&F{K2r?VIj3i*2cFha`-5WbHh95Ie9L;+LuP;|RX8vQoPSVza%O8&BkWy=ng= zTfC?=hwyvON_x^m_n#hz*CP>hV7ts!0Ih$X*d&Rc(XvMg-m<`nBu4A z#o|LTfidmc2*>rNi#PPyXsQX)_H9&>*$P)I53=T91|;YuSfRh&5fNYM3-aBT>yZ=P^oC zzquQc3K|_Pzh=silYh4<3c!lbh)aY+OaRaz=rRC+$o~C(w(2SGG`-nfa0MdHN@HJZ_vN((5LXAPjgUR(@o4Bx)*2DK zMSAYo5w+Wgl%YI!>kk>3)T38Vgj8=x*70c$jwOs~4m_!KBGa7cb~%Ht?{v~HMt7~U zY3eF6uF{VBS4;|d6nRDXVKhLhv*d8vN?cBrrKwHLHz27yrTO$X<`$Vyz(?z)B%YL? zx}H4=BfF+QxT4w$9;L;y)h{ZWp`FPs&OH?2;UuXHHim;r?SbUx2K+_eVC`BOM-2%U zR{8@W5>76N{n$jY7;3>px{t&9`8C@3YucSF)gmMrCXBOcjV`Zn^H922#%(lfOarHS zru93vi9SbxyXP9C^S|-;aE6yQ)CJ6NM2cF;JAyrQ+Sdg&R1Y;H{@7H>c+ii z^K`6BsHSabih2f_wS1f2tCNZv-Jt&td1Ahco-r~^H6rk#zTUG0sg}0*L`U30Rf6cd z3vo5$e>Tq5Rh+QB3$~Smd(%AL&rm`yX?%E91dTW#^v%4UU5>V34ni-x@gn%$#QNti zeY9GL;KjbAzZ(!a=+RfD2`$&BZQ$DY;ZeDQ;#wWEz)>$Z-C4tP;17IhYUbP=`M}Hs kVXFDbEOywp_PQ6eQP 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 - 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 - 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 Date: Fri, 9 Mar 2018 16:40:43 +0100 Subject: [PATCH 35/63] 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 - 2.9-1 +- update to 2.9 (#1553139) +- rebase patches +- use autosetup macro + * 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 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 Date: Thu, 15 Mar 2018 20:48:33 +0100 Subject: [PATCH 36/63] 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 - 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 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 Date: Thu, 12 Jul 2018 19:55:04 +0000 Subject: [PATCH 37/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 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) From e7bf9fbcf66ab3f10be7e9effe1f166547e56be6 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 5 Aug 2018 02:39:57 +0200 Subject: [PATCH 38/63] 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 - 2.9.2-1 +- update to 2.9.2 (#1611854) +- fix version typo in Makefile + * Thu Mar 15 2018 Dominik Mierzejewski - 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 Date: Thu, 31 Jan 2019 12:51:08 +0000 Subject: [PATCH 39/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 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 From 7caa478489288ad8bf1420a6e4bd60913137de10 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Tue, 5 Feb 2019 23:10:57 +0100 Subject: [PATCH 40/63] 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 - 2.9.3-1 +- update to 2.9.3 (#1672604) + * Sat Aug 04 2018 Dominik Mierzejewski - 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 Date: Wed, 24 Jul 2019 17:25:46 +0000 Subject: [PATCH 41/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 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) From 110197b43d8e50d68391ed940a5334128a4a1d62 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Tue, 29 Oct 2019 10:31:04 +0100 Subject: [PATCH 42/63] 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 - 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 - 2.9.3-1 - update to 2.9.3 (#1672604) From 8f9ea27c41656598be0f74bd322ba8eeceb907ff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:05:56 +0000 Subject: [PATCH 43/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 +- 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 From 8f7e7cae4481717be90e971da26022ed73c7253c Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sun, 31 May 2020 23:08:10 +0200 Subject: [PATCH 44/63] 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 Date: Mon, 27 Jul 2020 11:39:02 +0000 Subject: [PATCH 45/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 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 From 3e583c9dde43c6dacb657f8d977f958607be35be Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 14 Dec 2020 10:43:12 +0100 Subject: [PATCH 46/63] 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 Date: Mon, 25 Jan 2021 23:42:59 +0000 Subject: [PATCH 47/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 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 From 983aaf7035441f11feed54bb966a86fd676d5866 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sat, 22 May 2021 23:30:01 +0200 Subject: [PATCH 48/63] 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 - 2.9.3-6 +- point to gnudb.org instead of the discontinued freedb.org (#1916974) + * Mon Jul 27 2020 Fedora Release Engineering - 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 Date: Wed, 21 Jul 2021 12:14:50 +0000 Subject: [PATCH 49/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 573fdfbb294886e23f59780890cab9ddb249d081 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:09:56 +0000 Subject: [PATCH 50/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 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) From 09080a5e5ba894d62561b5c4b14d5a183497ef57 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 20:49:42 +0000 Subject: [PATCH 51/63] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 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 From b11080aa25eac8b6a19e3631b3073148e7629abd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:20:25 +0000 Subject: [PATCH 52/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 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 From 5aefca1d22a1955d968793f437fc6957392ae85f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:18:05 +0000 Subject: [PATCH 53/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 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 From b81be8506cf10fc6677f8c9c52ad89a7bcf75cd2 Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Thu, 16 Mar 2023 17:06:16 +0000 Subject: [PATCH 54/63] 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 +- 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 From 5c385b0cba0ab52780d6865f57e3c1097b18bce3 Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Tue, 21 Mar 2023 03:31:59 +0000 Subject: [PATCH 55/63] 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 +* 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 From dab0c06e20da5b4bd58d13e1f11f81c156315b63 Mon Sep 17 00:00:00 2001 From: Jilayne Lovejoy Date: Tue, 28 Mar 2023 20:57:35 +0000 Subject: [PATCH 56/63] 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 Date: Wed, 19 Jul 2023 12:47:57 +0000 Subject: [PATCH 57/63] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 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 From b11087ea0837402221e52817b8cbd3b89cd4072e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 11:59:30 +0000 Subject: [PATCH 58/63] 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 - 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 From 22e39e00a0059cab9329f89bce9d6335c3e3a2c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:32:53 +0000 Subject: [PATCH 59/63] 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 - 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 From 3fdba40eb0b4024543294f926f5287ff9dca60d2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:29:22 +0000 Subject: [PATCH 60/63] 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 - 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 From dc15006409fecb65d0d8ed5669927b7c541ebbe9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:27:17 +0000 Subject: [PATCH 61/63] 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 - 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 From 05506e8f8740ada913ffd794fc1c69d0571c4084 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:41:39 +0000 Subject: [PATCH 62/63] 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 - 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 From 8c06198c2d9589485a6fe5b422fd4dda08426f4a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:22:59 +0000 Subject: [PATCH 63/63] 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 - 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