rpms/abcde/F-8 abcde-2.3.99.6-speex-comment.patch, NONE, 1.1 abcde-2.3.99.6-usage.patch, NONE, 1.1 abcde_2.3.99.6-1ubuntu2.patch, NONE, 1.1 abcde.spec, 1.15, 1.16

Sun Jan 20 19:40:54 UTC 2008

Author: scop

Update of /cvs/pkgs/rpms/abcde/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19981/F-8

Modified Files:
	abcde.spec 
Added Files:
	abcde-2.3.99.6-speex-comment.patch abcde-2.3.99.6-usage.patch 
	abcde_2.3.99.6-1ubuntu2.patch 
Log Message:
* Sat Jan 19 2008 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 2.3.99.6-5
- 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.


abcde-2.3.99.6-speex-comment.patch:

--- NEW FILE abcde-2.3.99.6-speex-comment.patch ---
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

abcde-2.3.99.6-usage.patch:

--- NEW FILE abcde-2.3.99.6-usage.patch ---
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 <host1[,host2]...>"
 echo "       Also encode on these remote hosts"
 echo "-R     Use local CDDB in recursive mode"
 echo "-s <field>"
-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 <comment>"
 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."

abcde_2.3.99.6-1ubuntu2.patch:

--- NEW FILE abcde_2.3.99.6-1ubuntu2.patch ---
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


Index: abcde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abcde/F-8/abcde.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- abcde.spec	29 Sep 2007 17:52:43 -0000	1.15
+++ abcde.spec	20 Jan 2008 19:40:12 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.3.99.6
-Release:        4%{?dist}
+Release:        5
 Summary:        A Better CD Encoder
 
 Group:          Applications/Multimedia
@@ -10,6 +10,11 @@
 URL:            http://www.hispalinux.es/~data/abcde.php
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -29,6 +34,9 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 sed -i -e 's/normalize-audio/normalize/g' abcde*
 sed -i -e 's/^#NOGAP$/#NOGAP=y/' abcde.conf
 mv examples/cue2discid .
@@ -39,9 +47,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall \
-  etcdir=$RPM_BUILD_ROOT%{_sysconfdir} \
-  mandir=$RPM_BUILD_ROOT%{_mandir}/man1
+make install DESTDIR=$RPM_BUILD_ROOT
 install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir}
 
 
@@ -61,6 +67,13 @@
 
 
 %changelog
+* Sat Jan 19 2008 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 2.3.99.6-5
+- 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Ã¤ <ville.skytta at iki.fi> - 2.3.99.6-4
 - Requires: which
 


