From c40093d2fc83a06e4a9da39895f66d21503b9acd Mon Sep 17 00:00:00 2001
From: Ville Skyttä <scop@fedoraproject.org>
Date: Aug 28 2005 20:03:09 +0000
Subject: - 2.3.3.

- Reformat specfile.

---

diff --git a/.cvsignore b/.cvsignore
index c50b4cc..68686c8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-abcde_2.3.2.orig.tar.gz
+abcde_2.3.3.orig.tar.gz
diff --git a/abcde.spec b/abcde.spec
index 0c1469d..a8dad00 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,42 +1,62 @@
-Summary: A Better CD Encoder
-Name: abcde
-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
-Patch1: abcde-2.1.19-inst.patch
-URL: http://www.hispalinux.es/~data/abcde.php
-BuildArch: noarch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: cd-discid vorbis-tools flac cdparanoia wget speex
+Name:           abcde
+Version:        2.3.3
+Release:        1%{?dist}
+Summary:        A Better CD Encoder
+
+Group:          Applications/Multimedia
+License:        GPL or Artistic
+URL:            http://www.hispalinux.es/~data/abcde.php
+Source0:        http://ftp.debian.org/debian/pool/main/a/abcde/%{name}_%{version}.orig.tar.gz
+Patch0:         abcde-2.1.19-inst.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildArch:      noarch
+Requires:       cd-discid
+Requires:       vorbis-tools
+Requires:       flac
+Requires:       cdparanoia
+Requires:       wget
+Requires:       speex
 
 %description
-abcde is a frontend command-line utility (actually, a shell script) that
-grabs tracks off a CD, encodes them to ogg or mp3 format, and tags them,
-all in one go.
+abcde is a frontend command-line utility (actually, a shell script)
+that grabs audio tracks off a CD, encodes them to various formats, and
+tags them, all in one go.
+
 
 %prep
 %setup -q
-%patch1 -p1 -b .inst
+%patch0 -p1
 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
-%makeinstall etcdir=$RPM_BUILD_ROOT%{_sysconfdir} mandir=$RPM_BUILD_ROOT%{_mandir}/man1
+%makeinstall \
+  etcdir=$RPM_BUILD_ROOT%{_sysconfdir} \
+  mandir=$RPM_BUILD_ROOT%{_mandir}/man1
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
-%defattr (-, root, root, -)
-%doc changelog COPYING README TODO FAQ examples
+%defattr(-,root,root,-)
+%doc changelog COPYING README TODO FAQ examples/
 %config(noreplace) %{_sysconfdir}/abcde.conf
-%{_bindir}/*
-%{_mandir}/man1/*
+%{_bindir}/abcde
+%{_bindir}/cddb-tool
+%{_mandir}/man1/abcde.1*
+%{_mandir}/man1/cddb-tool.1*
+
 
 %changelog
+* Fri Aug 26 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.3.3-1
+- 2.3.3.
+- Reformat specfile.
+
 * 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.
diff --git a/sources b/sources
index fd6dbd1..b6bb343 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-69172f041f20588888623dcbe8df708e  abcde_2.3.2.orig.tar.gz
+94877d1e410ae420630b1048e82907d3  abcde_2.3.3.orig.tar.gz