rpms/cuetools/F-9 0001-cuetag.sh-Fix-metaflac-options-for-flac-1.1.3.patch, NONE, 1.1 0002-cuetag.sh-Fix-handling-of-files-with-spaces.patch, NONE, 1.1 0003-cuetag.sh-Correct-typo-in-error-output.patch, NONE, 1.1 cuetools.spec, 1.1, 1.2

Paul P Komkoff Jr stingray at fedoraproject.org
Sat Jul 4 18:24:15 UTC 2009


Author: stingray

Update of /cvs/pkgs/rpms/cuetools/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2860/F-9

Modified Files:
	cuetools.spec 
Added Files:
	0001-cuetag.sh-Fix-metaflac-options-for-flac-1.1.3.patch 
	0002-cuetag.sh-Fix-handling-of-files-with-spaces.patch 
	0003-cuetag.sh-Correct-typo-in-error-output.patch 
Log Message:
cuetools-1.4.0-0.4.svn305

0001-cuetag.sh-Fix-metaflac-options-for-flac-1.1.3.patch:

--- NEW FILE 0001-cuetag.sh-Fix-metaflac-options-for-flac-1.1.3.patch ---
>From b5937f85fb78a141575a2c60d655373b4f1be099 Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz at pobox.com>
Date: Wed, 28 Jan 2009 01:10:06 -0500
Subject: [PATCH 1/3] cuetag.sh: Fix metaflac options for flac >= 1.1.3

The --remove-vc-all and --import-vc options were removed in flac-1.1.3
(27-Nov-2006).  They were deprecated since flac-1.1.1 (01-Oct-2004).
Use the options which replaced them, -remove-all-tags and
--import-tags-from, respectively.
---
 src/tools/cuetag.sh |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/tools/cuetag.sh b/src/tools/cuetag.sh
index 73f4660..809be82 100755
--- a/src/tools/cuetag.sh
+++ b/src/tools/cuetag.sh
@@ -28,8 +28,7 @@ usage()
 vorbis()
 {
 	# FLAC tagging
-	# --remove-vc-all overwrites existing comments
-	METAFLAC="metaflac --remove-vc-all --import-vc-from=-"
+	METAFLAC="metaflac --remove-all-tags --import-tags-from=-"
 
 	# Ogg Vorbis tagging
 	# -w overwrites existing comments
-- 
1.6.3


0002-cuetag.sh-Fix-handling-of-files-with-spaces.patch:

--- NEW FILE 0002-cuetag.sh-Fix-handling-of-files-with-spaces.patch ---
>From 3b4e408467caaebe71e5dc557587da4728901118 Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz at pobox.com>
Date: Fri, 8 May 2009 16:19:30 -0400
Subject: [PATCH 2/3] cuetag.sh: Fix handling of files with spaces

---
 src/tools/cuetag.sh |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/tools/cuetag.sh b/src/tools/cuetag.sh
index 809be82..4d8be69 100755
--- a/src/tools/cuetag.sh
+++ b/src/tools/cuetag.sh
@@ -80,7 +80,7 @@ vorbis()
 	(for field in $fields; do
 		value=""
 		for conv in $(eval echo \$$field); do
-			value=$($CUEPRINT -n $1 -t "$conv\n" $cue_file)
+			value=$($CUEPRINT -n $1 -t "$conv\n" "$cue_file")
 
 			if [ -n "$value" ]; then
 				echo "$field=$value"
@@ -113,7 +113,7 @@ id3()
 	for field in $fields; do
 		value=""
 		for conv in $(eval echo \$$field); do
-			value=$($CUEPRINT -n $1 -t "$conv\n" $cue_file)
+			value=$($CUEPRINT -n $1 -t "$conv\n" "$cue_file")
 
 			if [ -n "$value" ]; then
 				break
@@ -158,14 +158,14 @@ main()
 	cue_file=$1
 	shift
 
-	ntrack=$(cueprint -d '%N' $cue_file)
+	ntrack=$(cueprint -d '%N' "$cue_file")
 	trackno=1
 
 	if [ $# -ne $ntrack ]; then
 		echo "warning: number of files does not match number of tracks"
 	fi
 
-	for file in $@; do
+	for file in "$@"; do
 		case $file in
 		*.[Ff][Ll][Aa][Cc])
 			vorbis $trackno "$file"
-- 
1.6.3


0003-cuetag.sh-Correct-typo-in-error-output.patch:

--- NEW FILE 0003-cuetag.sh-Correct-typo-in-error-output.patch ---
>From c0623cb1fcc8a2c92ea9af364b780de265f3c8f2 Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz at pobox.com>
Date: Fri, 8 May 2009 16:20:09 -0400
Subject: [PATCH 3/3] cuetag.sh: Correct typo in error output

---
 src/tools/cuetag.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/tools/cuetag.sh b/src/tools/cuetag.sh
index 4d8be69..9b725b0 100755
--- a/src/tools/cuetag.sh
+++ b/src/tools/cuetag.sh
@@ -180,7 +180,7 @@ main()
 			vorbis $trackno "$file"
 			;;
 		*)
-			echo "$file: uknown file type"
+			echo "$file: unknown file type"
 			;;
 		esac
 		trackno=$(($trackno + 1))
-- 
1.6.3



Index: cuetools.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cuetools/F-9/cuetools.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cuetools.spec	5 May 2008 14:00:07 -0000	1.1
+++ cuetools.spec	4 Jul 2009 18:23:45 -0000	1.2
@@ -2,13 +2,16 @@
 
 Name: cuetools
 Version: 1.4.0
-Release: 0.2.svn305%{?dist}
+Release: 0.4.svn305%{?dist}
 Summary: Utilities to work with cue and TOC files
 Group: Applications/Multimedia
 License: GPLv2
 URL: http://developer.berlios.de/projects/cuetools/
-Source: http://download.berlios.de/cuetools/%{name}-%{basever}.tar.gz
-Patch: %{name}-%{basever}-svn305-fixes.patch.bz2
+Source0: http://download.berlios.de/cuetools/%{name}-%{basever}.tar.gz
+Patch0: %{name}-%{basever}-svn305-fixes.patch.bz2
+Patch1: 0001-cuetag.sh-Fix-metaflac-options-for-flac-1.1.3.patch
+Patch2: 0002-cuetag.sh-Fix-handling-of-files-with-spaces.patch
+Patch3: 0003-cuetag.sh-Correct-typo-in-error-output.patch
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 %description
@@ -18,7 +21,10 @@ on cue/TOC information, and track breakp
 
 %prep
 %setup -q -n %{name}-%{basever}
-%patch -p1
+%patch0 -p1
+%patch1 -p1 -b .metaflac
+%patch2 -p1 -b .spaces
+%patch3 -p1 -b .typo
 
 %build
 %configure
@@ -46,6 +52,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so.*
 
 %changelog
+* Fri May 08 2009 Todd Zullinger <tmz at pobox.com> - 1.4.0-0.4.svn305
+- cuetag.sh: Fix metaflac options for flac >= 1.1.3 (bug 488586)
+- cuetag.sh: Fix handling of files with spaces (bug 499910)
+- cuetag.sh: Correct typo in error output
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-0.3.svn305
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Mar 26 2008 Paul P. Komkoff Jr <i at stingr.net> - 1.4.0-0.2.svn305
 - add COPYING and doc/formats.txt
 - remove *.so




More information about the fedora-extras-commits mailing list