From 8c280f945e881451cab4c969b7694013b8587fb8 Mon Sep 17 00:00:00 2001
From: Ville Skyttä <scop@fedoraproject.org>
Date: Aug 24 2005 17:39:42 +0000
Subject: - 2.3.2, vi and genre patches applied upstream.

- Convert man page to UTF-8.

---

diff --git a/.cvsignore b/.cvsignore
index ec26570..c50b4cc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-abcde_2.2.3.orig.tar.gz
+abcde_2.3.2.orig.tar.gz
diff --git a/abcde-2.1.19-genre.patch b/abcde-2.1.19-genre.patch
deleted file mode 100644
index d04d286..0000000
--- a/abcde-2.1.19-genre.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- abcde-2.1.19/cddb-tool.genre	2003-12-06 22:28:53.000000000 +0100
-+++ abcde-2.1.19/cddb-tool	2004-04-14 13:08:37.901055971 +0200
-@@ -122,7 +122,7 @@
- 	DARTISTALBUM=$(grep ^DTITLE= "$CDDBFILE" | cut -f2- -d= | tr -d \\n | sed 's- / -~-g' | tr -d \[:cntrl:\])
- 	DARTIST=$(echo "$DARTISTALBUM" | cut -f1 -d~ | sed 's,\\,\\\\,g;s,\([\"\$\`]\),\\\1,g' | tr -d \[:cntrl:\])
- 	DALBUM=$(echo "$DARTISTALBUM" | cut -f2 -d~ | sed 's,\\,\\\\,g;s,\([\"\$\`]\),\\\1,g' | tr -d \[:cntrl:\])
--	CDDBGENRE=$(grep '^#CATEGORY=' "$CDDBFILE" | cut -f2- -d=)
-+	CDDBGENRE=$(grep '^#CATEGORY=' "$CDDBFILE" | cut -f2- -d= | tr -d \[:cntrl:\])
- 	if grep "^DYEAR" "$CDDBFILE" 2>&1 > /dev/null ; then
- 		CDYEAR=$(grep "^DYEAR" "$CDDBFILE" | cut -f2- -d= | tr -d \[:cntrl:\])
- 	elif grep YEAR "$CDDBFILE" 2>&1 > /dev/null ; then
-@@ -192,7 +192,7 @@
- 	FILE="$1"
- 	ADDRESS="$2"
- 	DISCID=$(grep ^DISCID= "$FILE" | cut -f2 -d= | tr -d \[:cntrl:\])
--	CDDBGENRE=$(grep '^#CATEGORY=' "$FILE" | cut -f2- -d=)
-+	CDDBGENRE=$(grep '^#CATEGORY=' "$FILE" | cut -f2- -d= | tr -d \[:cntrl:\])
- 	grep -v "^#CATEGORY=" "$FILE" | mail -s "cddb $CDDBGENRE $DISCID" "$ADDRESS"
- 	;;
- 
diff --git a/abcde-2.1.19-vi.patch b/abcde-2.1.19-vi.patch
deleted file mode 100644
index 2c5dabd..0000000
--- a/abcde-2.1.19-vi.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- abcde-2.1.19/abcde.vi	2004-04-09 20:12:15.000000000 +0200
-+++ abcde-2.1.19/abcde	2004-04-14 13:03:40.296108335 +0200
-@@ -1270,8 +1270,12 @@
- 				eval $(echo "$EDITOR") "$CDDBDATA"
- 			fi
- 		# If that fails, check for a vi
-+		elif [ -x /usr/bin/vim ]; then
-+			/usr/bin/vim "$CDDBDATA"
- 		elif [ -x /usr/bin/vi ]; then
- 			/usr/bin/vi "$CDDBDATA"
-+		elif [ -x /bin/vi ]; then
-+			/bin/vi "$CDDBDATA"
- 		# nano should be on all (modern, i.e., sarge) debian systems
- 		elif [ -x /usr/bin/nano ]; then
- 			/usr/bin/nano "$CDDBDATA"
diff --git a/abcde.spec b/abcde.spec
index f7b2b0c..0c1469d 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,14 +1,11 @@
 Summary: A Better CD Encoder
 Name: abcde
-Version: 2.2.3
-Release: 2
-
-License: GPL & Artistic
+Version: 2.3.2
+Release: 1%{?dist}
+License: GPL or Artistic
 Group: Applications/Multimedia
 Source: http://ftp.debian.org/debian/pool/main/a/abcde/%{name}_%{version}.orig.tar.gz
-Patch0: abcde-2.1.19-vi.patch
 Patch1: abcde-2.1.19-inst.patch
-Patch2: abcde-2.1.19-genre.patch
 URL: http://www.hispalinux.es/~data/abcde.php
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -21,10 +18,9 @@ all in one go.
 
 %prep
 %setup -q
-%patch0 -p1 -b .vi
 %patch1 -p1 -b .inst
-%patch2 -p1 -b .genre
 sed -i 's/normalize-audio/normalize/g' abcde*
+iconv -f iso-8859-1 -t utf-8 abcde.1 > abcde.1.utf8 ; mv abcde.1.utf8 abcde.1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -41,7 +37,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Sat Aug 20 2005 Ville Skyttä <ville.skytta at iki.fi> - 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 <mschwendt[AT]users.sf.net> - 2.2.3-2
 - rebuilt
 
 * Thu Feb 10 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.2.3-1
diff --git a/sources b/sources
index 176d4db..fd6dbd1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-576b9f41b05c3ea06f27fef15e5e47da  abcde_2.2.3.orig.tar.gz
+69172f041f20588888623dcbe8df708e  abcde_2.3.2.orig.tar.gz