Update to 2.5.2.

abcde-2.4.1-tagging.patch

@@ -1,30 +0,0 @@
-Index: abcde
-===================================================================
---- abcde	(revision 290)
-+++ abcde	(working copy)
-@@ -1121,11 +1121,10 @@
- 						*=*) ;;
- 						*)   COMMENT="COMMENT=$COMMENT" ;;
- 					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
--					$RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS --author "$TRACKARTIST" --title "$TRACKNAME" --comment "$COMMENT" "$IN" "$OUT"
-+				# 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:+--comment "$COMMENT"} "$IN" "$OUT"
- 				else
- 					$RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS "$IN" "$OUT"
- 				fi
-@@ -1140,8 +1139,8 @@
- 				$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

abcde-2.5.0-install.patch

@@ -1,24 +0,0 @@
-diff -up abcde-2.5.0/Makefile~ abcde-2.5.0/Makefile
---- abcde-2.5.0/Makefile~	2012-04-13 23:56:01.000000000 +0300
-+++ abcde-2.5.0/Makefile	2012-04-15 20:56:47.544597621 +0300
-@@ -14,14 +14,14 @@ clean:
- 
- install:
- 	$(INSTALL) -d -m 755 $(bindir)
--	$(INSTALL) -m 755 -o 0 abcde $(bindir)
--	$(INSTALL) -m 755 -o 0 cddb-tool $(bindir)
--	$(INSTALL) -m 755 -o 0 abcde-musicbrainz-tool $(bindir)
-+	$(INSTALL) -m 755 abcde $(bindir)
-+	$(INSTALL) -m 755 cddb-tool $(bindir)
-+	$(INSTALL) -m 755 abcde-musicbrainz-tool $(bindir)
- 	$(INSTALL) -d -m 755 $(mandir)
--	$(INSTALL) -m 644 -o 0 abcde.1 $(mandir)
--	$(INSTALL) -m 644 -o 0 cddb-tool.1 $(mandir)
-+	$(INSTALL) -m 644 abcde.1 $(mandir)
-+	$(INSTALL) -m 644 cddb-tool.1 $(mandir)
- 	$(INSTALL) -d -m 755 $(etcdir)
--	$(INSTALL) -m 644 -o 0 abcde.conf $(etcdir)
-+	$(INSTALL) -m 644 abcde.conf $(etcdir)
- 
- tarball:
- 	@cd .. && tar czvf abcde_$(VERSION).orig.tar.gz \

abcde.spec

@@ -1,5 +1,5 @@
 Name:           abcde
-Version:        2.5.0
+Version:        2.5.2
 Release:        1%{?dist}
 Summary:        A Better CD Encoder
 
@@ -8,18 +8,15 @@ License:        Public Domain
 URL:            http://code.google.com/p/abcde/
 Source0:        http://abcde.googlecode.com/files/%{name}-%{version}.tar.gz
 Patch0:         %{name}-2.4.0-config.patch
-# http://code.google.com/p/abcde/issues/detail?id=17
-Patch1:         %{name}-2.5.0-install.patch
-# http://code.google.com/p/abcde/issues/detail?id=19
-Patch2:         %{name}-2.4.1-tagging.patch
 
 BuildArch:      noarch
 Requires:       cd-discid
 Requires:       cdparanoia
+Requires:       flac
+Requires:       icedax
+Requires:       vorbis-tools
 Requires:       wget
 Requires:       which
-Requires:       vorbis-tools
-Requires:       flac
 
 %description
 abcde is a front end command line utility (actually, a shell script)
@@ -30,8 +27,6 @@ tags them, all in one go.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p0
 mv examples/cue2discid .
 
 
@@ -57,6 +52,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, some deps N/A
 
 
 %changelog
+* Sun Apr 29 2012 Ville Skyttä <ville.skytta@iki.fi> - 2.5.2-1
+- Update to 2.5.2.
+
 * Sun Apr 15 2012 Ville Skyttä <ville.skytta@iki.fi> - 2.5.0-1
 - Update to 2.5.0.
 - Clean up specfile constructs no longer needed in Fedora or EL6+.

sources

@@ -1 +1 @@
-4792184ae0a1711b23006d4333a79837  abcde-2.5.0.tar.gz
+6ab225f808822d0a1956efa18f7cabc5  abcde-2.5.2.tar.gz