From 1b0f42a260bfc94a114f990f09059bb1c84f3249 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Mar 25 2013 09:45:30 +0000 Subject: Sync with current F19 (sans the rebuild bump) Merge commit '7d404fe6a3d0750ad86cd99965483d6e8fbd2c60' into el6 Conflicts: .gitignore --- diff --git a/.gitignore b/.gitignore index f3fd931..73d135b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -abcde_2.3.99.8.orig.tar.gz +/abcde-2.5.4.tar.gz diff --git a/abcde-2.1.19-inst.patch b/abcde-2.1.19-inst.patch deleted file mode 100644 index 0f39e39..0000000 --- a/abcde-2.1.19-inst.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- 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 @@ - - install: - $(INSTALL) -d -m 755 $(bindir) -- $(INSTALL) -m 755 -o 0 abcde $(bindir) -- $(INSTALL) -m 755 -o 0 cddb-tool $(bindir) -+ $(INSTALL) -m 755 abcde $(bindir) -+ $(INSTALL) -m 755 cddb-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-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-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-2.3.99.8-config.patch b/abcde-2.3.99.8-config.patch deleted file mode 100644 index 24346f9..0000000 --- a/abcde-2.3.99.8-config.patch +++ /dev/null @@ -1,75 +0,0 @@ -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 - EJECT=eject - MD5SUM=md5sum - DISTMP3=distmp3 --NORMALIZE=normalize-audio -+NORMALIZE=normalize - 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 -@@ -325,7 +325,7 @@ only support \'faac\', so \'default\' po - .TP - .B NORMALIZERSYNTAX - Specifies the style of normalizer to use. Valid options are \'default\' --and \'normalize'\ (and both run \'normalize-audio\'), since we only support it, -+and \'normalize'\ (and both run \'normalize\'), since we only support it, - ATM. - .TP - .B CDROMREADERSYNTAX -@@ -563,7 +563,7 @@ An HTTP retrieval program: wget, fetch ( - (optional) distmp3, a client/server for distributed mp3 encoding. - .TP - .B * --(optional) normalize-audio, a WAV file volume normalizer. -+(optional) normalize, a WAV file volume normalizer. - .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), - .BR cdda2wav (1), - .BR dagrab (1), --.BR normalize-audio (1), -+.BR normalize (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 -@@ -139,7 +139,7 @@ - #DISTMP3=distmp3 - #VORBISCOMMENT=vorbiscomment - #METAFLAC=metaflac --#NORMALIZE=normalize-audio -+#NORMALIZE=normalize - #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 -@@ -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: - --* -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) --* 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: - * dagrab, another audio CD reading utility. diff --git a/abcde-2.4.0-config.patch b/abcde-2.4.0-config.patch new file mode 100644 index 0000000..037c9df --- /dev/null +++ b/abcde-2.4.0-config.patch @@ -0,0 +1,75 @@ +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 +-NORMALIZE=normalize-audio ++NORMALIZE=normalize + 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 + .TP + .B NORMALIZERSYNTAX + Specifies the style of normalizer to use. Valid options are \'default\' +-and \'normalize'\ (and both run \'normalize-audio\'), since we only support it, ++and \'normalize'\ (and both run \'normalize\'), since we only support it, + ATM. + .TP + .B CDROMREADERSYNTAX +@@ -563,7 +563,7 @@ An HTTP retrieval program: wget, fetch ( + (optional) distmp3, a client/server for distributed mp3 encoding. + .TP + .B * +-(optional) normalize-audio, a WAV file volume normalizer. ++(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), + .BR cdda2wav (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 @@ + #DISTMP3=distmp3 + #VORBISCOMMENT=vorbiscomment + #METAFLAC=metaflac +-#NORMALIZE=normalize-audio ++#NORMALIZE=normalize + #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 + + 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 + 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) +-* 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. diff --git a/abcde.spec b/abcde.spec index 6204c83..2d83375 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,36 +1,25 @@ Name: abcde -Version: 2.3.99.8 +Version: 2.5.4 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.3.99.8-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=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) +Source0: http://abcde.googlecode.com/files/%{name}-%{version}.tar.gz +Patch0: %{name}-2.4.0-config.patch BuildArch: noarch Requires: cd-discid Requires: cdparanoia +Requires: flac +Requires: icedax +Requires: vorbis-tools Requires: wget Requires: which -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. @@ -38,10 +27,6 @@ tags them, all in one go. %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p0 -%patch4 -p1 mv examples/cue2discid . @@ -52,15 +37,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 @@ -70,10 +52,44 @@ rm -rf $RPM_BUILD_ROOT %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 + +* 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. + +* 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 + +* 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 + +* 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. + +* 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 +100,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/abcde_2.3.99.7-1ubuntu1.diff b/abcde_2.3.99.7-1ubuntu1.diff deleted file mode 100644 index 2e08719..0000000 --- a/abcde_2.3.99.7-1ubuntu1.diff +++ /dev/null @@ -1,27 +0,0 @@ ---- abcde-2.3.99.7.orig/abcde -+++ abcde-2.3.99.7/abcde -@@ -1116,9 +1116,10 @@ - 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" "$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" -+ - else - $RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS "$IN" "$OUT" - fi -@@ -1133,8 +1134,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/sources b/sources index 108723b..ab24bea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -981fd4bfd6938bb6a1130f6193bffb00 abcde_2.3.99.8.orig.tar.gz +d761c5a07854ce24748be9aa10100e74 abcde-2.5.4.tar.gz