From e93d752f06da0c51c9903835eda801696cbc3b04 Mon Sep 17 00:00:00 2001
From: Ville Skyttä <scop@fedoraproject.org>
Date: May 30 2010 17:26:48 +0000
Subject: - Update to 2.4.2 (#597723), track info patch applied upstream.


---

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ä <ville.skytta@iki.fi> - 2.4.2-1
+- Update to 2.4.2 (#597723), track info patch applied upstream.
+
 * Fri Apr  2 2010 Ville Skyttä <ville.skytta@iki.fi> - 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