diff --git a/.cvsignore b/.cvsignore index e32dfc9..116288b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abcde_2.3.99.6.orig.tar.gz +abcde_2.3.99.7.orig.tar.gz diff --git a/abcde-2.3.99.6-speex-comment.patch b/abcde-2.3.99.6-speex-comment.patch deleted file mode 100644 index e31c4cf..0000000 --- a/abcde-2.3.99.6-speex-comment.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up abcde-2.3.99.6/abcde~ abcde-2.3.99.6/abcde ---- abcde-2.3.99.6/abcde~ 2008-01-20 14:39:48.000000000 +0200 -+++ abcde-2.3.99.6/abcde 2008-01-20 14:39:56.000000000 +0200 -@@ -1068,11 +1068,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" "$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 diff --git a/abcde-2.3.99.6-usage.patch b/abcde-2.3.99.6-usage.patch deleted file mode 100644 index 6c5836d..0000000 --- a/abcde-2.3.99.6-usage.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up abcde-2.3.99.6/abcde~ abcde-2.3.99.6/abcde ---- abcde-2.3.99.6/abcde~ 2008-01-20 13:47:40.000000000 +0200 -+++ abcde-2.3.99.6/abcde 2008-01-20 13:51:15.000000000 +0200 -@@ -56,7 +56,7 @@ echo "-r " - echo " Also encode on these remote hosts" - echo "-R Use local CDDB in recursive mode" - echo "-s " --echo " Show dielfs from the CDDB info (year,genre)" -+echo " Show fields from the CDDB info (year,genre)" - echo "-S <#> Set the CD speed" - echo "-t <#> Start the track numbering at a given number" - echo "-T <#> Same as -t but modifies tag numbering" -@@ -66,7 +66,7 @@ echo "-V Be a bit more verbose about - echo "-x Eject CD after all tracks are read" - echo "-w " - echo " Add a comment to the CD tracks" --echo "-W <#> Contatenate CDs: -T #01 -w \"CD #\"" -+echo "-W <#> Concatenate CDs: -T #01 -w \"CD #\"" - echo "-z Use debug CDROMREADERSYNTAX option (needs cdparanoia)" - echo "" - echo "Tracks is a space-delimited list of tracks to grab." diff --git a/abcde-2.3.99.6-wget111-441862.patch b/abcde-2.3.99.6-wget111-441862.patch deleted file mode 100644 index 4652864..0000000 --- a/abcde-2.3.99.6-wget111-441862.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://savannah.gnu.org/bugs/?22896 - -diff -up abcde-2.3.99.6/abcde~ abcde-2.3.99.6/abcde ---- abcde-2.3.99.6/abcde~ 2006-08-05 22:14:00.000000000 +0300 -+++ abcde-2.3.99.6/abcde 2008-04-10 21:58:57.000000000 +0300 -@@ -3065,7 +3065,7 @@ fi - - if [ "$HTTPGETOPTS" = "" ] ; then - case $HTTPGET in -- wget) HTTPGETOPTS="-q -O -";; -+ wget) HTTPGETOPTS="-q -e timestamping=off -O -";; - curl) HTTPGETOPTS="-f -s";; - fetch)HTTPGETOPTS="-q -o -";; - ftp) HTTPGETOPTS="-a -V -o - ";; -diff -up abcde-2.3.99.6/cddb-tool~ abcde-2.3.99.6/cddb-tool ---- abcde-2.3.99.6/cddb-tool~ 2006-04-11 14:57:39.000000000 +0300 -+++ abcde-2.3.99.6/cddb-tool 2008-04-10 21:58:29.000000000 +0300 -@@ -44,7 +44,7 @@ if [ "$HTTPGET" = "" ]; then - HTTPGETOPTS=${HTTPGETOPTS:="-f -s"} - else - HTTPGET=wget -- HTTPGETOPTS=${HTTPGETOPTS:="-q -O -"} -+ HTTPGETOPTS=${HTTPGETOPTS:="-q -e timestamping=off -O -"} - fi - fi - diff --git a/abcde-2.3.99.7-config.patch b/abcde-2.3.99.7-config.patch new file mode 100644 index 0000000..22a10df --- /dev/null +++ b/abcde-2.3.99.7-config.patch @@ -0,0 +1,84 @@ +diff -up abcde-2.3.99.7/abcde~ abcde-2.3.99.7/abcde +--- abcde-2.3.99.7/abcde~ 2008-06-10 13:39:05.000000000 +0300 ++++ abcde-2.3.99.7/abcde 2009-07-27 23:46:34.000000000 +0300 +@@ -2998,7 +2998,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.7/abcde.1~ abcde-2.3.99.7/abcde.1 +--- abcde-2.3.99.7/abcde.1~ 2007-06-07 10:31:34.000000000 +0300 ++++ abcde-2.3.99.7/abcde.1 2009-07-27 23:46:34.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.7/abcde.conf~ abcde-2.3.99.7/abcde.conf +--- abcde-2.3.99.7/abcde.conf~ 2008-06-10 13:32:24.000000000 +0300 ++++ abcde-2.3.99.7/abcde.conf 2009-07-27 23:46:45.000000000 +0300 +@@ -139,7 +139,7 @@ + #DISTMP3=distmp3 + #VORBISCOMMENT=vorbiscomment + #METAFLAC=metaflac +-#NORMALIZE=normalize-audio ++#NORMALIZE=normalize + #CDSPEED=eject + #VORBISGAIN=vorbisgain + #MKCUE=mkcue +@@ -271,7 +271,7 @@ + #BATCHNORM=n + + # Enables nogap encoding when using the 'lame' encoder. +-#NOGAP=n ++#NOGAP=y + + # Set the playlist file location format. Uses the same variables and format + # as OUTPUTFORMAT. If the playlist is specified to be in a subdirectory, it +diff -up abcde-2.3.99.7/README~ abcde-2.3.99.7/README +--- abcde-2.3.99.7/README~ 2006-08-05 05:23:25.000000000 +0300 ++++ abcde-2.3.99.7/README 2009-07-27 23:46:34.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.3.99.7-speex-comment.patch b/abcde-2.3.99.7-speex-comment.patch new file mode 100644 index 0000000..cd788b7 --- /dev/null +++ b/abcde-2.3.99.7-speex-comment.patch @@ -0,0 +1,16 @@ +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 new file mode 100644 index 0000000..51e5c5e --- /dev/null +++ b/abcde-2.3.99.7-trackinfo.patch @@ -0,0 +1,13 @@ +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 f3ccf7b..bba04c9 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,21 +1,24 @@ Name: abcde -Version: 2.3.99.6 -Release: 9 +Version: 2.3.99.7 +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 +# 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+ -URL: http://www.hispalinux.es/~data/abcde.php +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.1.19-inst.patch -# Patch1: http://patches.ubuntu.com/a/abcde/abcde_2.3.99.6-1ubuntu2.patch -# with non-applicable parts removed. -Patch1: %{name}_2.3.99.6-1ubuntu2.patch -Patch2: %{name}-2.3.99.6-usage.patch -Patch3: %{name}-2.3.99.6-speex-comment.patch -Patch4: %{name}-2.3.99.6-wget111-441862.patch +Patch0: %{name}-2.3.99.7-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) BuildArch: noarch @@ -37,10 +40,8 @@ tags them, all in one go. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 +%patch3 -p0 %patch4 -p1 -sed -i -e 's/normalize-audio/normalize/g' abcde* -sed -i -e 's/^#NOGAP$/#NOGAP=y/' abcde.conf mv examples/cue2discid . @@ -59,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc COPYING FAQ README TODO USEPIPES changelog examples/ +%doc COPYING FAQ KNOWN.BUGS README TODO USEPIPES changelog examples/ %config(noreplace) %{_sysconfdir}/abcde.conf %{_bindir}/abcde %{_bindir}/cddb-tool @@ -69,6 +70,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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. + * Fri Jul 24 2009 Fedora Release Engineering - 2.3.99.6-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/abcde_2.3.99.6-1ubuntu2.patch b/abcde_2.3.99.6-1ubuntu2.patch deleted file mode 100644 index a2830ac..0000000 --- a/abcde_2.3.99.6-1ubuntu2.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -pruN 2.3.99.6-1/abcde 2.3.99.6-1ubuntu2/abcde ---- 2.3.99.6-1/abcde 2006-08-05 20:14:00.000000000 +0100 -+++ 2.3.99.6-1ubuntu2/abcde 2007-10-18 16:24:45.000000000 +0100 -@@ -1070,8 +1070,8 @@ do_encode () - 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 -+ # 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" "$IN" "$OUT" - else - $RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS "$IN" "$OUT" -@@ -1087,8 +1087,8 @@ do_encode () - $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 -@@ -3221,14 +3221,17 @@ if [ "$ONETRACK" = "y" ]; then - else - while [ $# -gt 0 ]; do - # Range parsing code courtesy of Vincent Ho -- RSTART=$(echo $1 | cut -f1 -d-) -- REND=$(echo $1 | cut -f2 -d-) -- if [ "$RSTART" = "$REND" ]; then -- NEWTRACKS="$RSTART" -+ # Cleaned up to use shell built-ins by Charles Steinkuehler -+ if [ "${1#*[^0-9-]}" != "$1" ]; then -+ log error "syntax error while processing track numbers" - else -- NEWTRACKS=$(f_seq_line $RSTART $REND) -+ RSTART=${1%%-*} -+ REND=${1##*-} -+ while [ ${RSTART:=1} -le ${REND:=0} ] ; do -+ TRACKQUEUE="$TRACKQUEUE $RSTART" -+ RSTART=$(( $RSTART + 1 )) -+ done - fi -- TRACKQUEUE=$(echo "$TRACKQUEUE" "$NEWTRACKS") - shift - done - fi -@@ -3249,7 +3252,11 @@ DOMOVE=n - DOREPLAYGAIN=n - DOPLAYLIST=n - DOCLEAN=n --DOCUE=n -+ -+# Don't clobber the -M command-line flag. -+if [ -z "$DOCUE" ]; then -+ DOCUE=n -+fi - - for ACTION in $(echo $ACTIONS | tr , \ ) - do diff --git a/abcde_2.3.99.7-1ubuntu1.diff b/abcde_2.3.99.7-1ubuntu1.diff new file mode 100644 index 0000000..86e0c49 --- /dev/null +++ b/abcde_2.3.99.7-1ubuntu1.diff @@ -0,0 +1,59 @@ +--- 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 +@@ -3291,14 +3292,17 @@ + else + while [ $# -gt 0 ]; do + # Range parsing code courtesy of Vincent Ho +- RSTART=$(echo $1 | cut -f1 -d-) +- REND=$(echo $1 | cut -f2 -d-) +- if [ "$RSTART" = "$REND" ]; then +- NEWTRACKS="$RSTART" ++ # Cleaned up to use shell built-ins by Charles Steinkuehler ++ if [ "${1#*[^0-9-]}" != "$1" ]; then ++ log error "syntax error while processing track numbers" + else +- NEWTRACKS=$(f_seq_line $RSTART $REND) ++ RSTART=${1%%-*} ++ REND=${1##*-} ++ while [ ${RSTART:=1} -le ${REND:=0} ] ; do ++ TRACKQUEUE="$TRACKQUEUE $RSTART" ++ RSTART=$(( $RSTART + 1 )) ++ done + fi +- TRACKQUEUE=$(echo "$TRACKQUEUE" "$NEWTRACKS") + shift + done + fi +@@ -3594,6 +3598,7 @@ + FLACENCODER="$FLAC" + if [ "$DOREPLAYGAIN" = "y" ]; then + FLACENCODEROPTS="${FLACENCODEROPTS} --replay-gain" ++ fi + # FLAC streams can be encapsulated on a Ogg transport layer + if echo "$FLACENCODEROPTS" | egrep -- "(^| )--ogg($| )" > /dev/null 2>&1 ;then + log error "FLAC on an Ogg container is not yet supported" diff --git a/sources b/sources index 271bdb9..083e49b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ac9be20f3098b0943212168171d33ffa abcde_2.3.99.6.orig.tar.gz +a0baa57edecf40c8423eac7e36d06882 abcde_2.3.99.7.orig.tar.gz