- Update to 2.4.1.

.cvsignore

@@ -1 +1 @@
-abcde_2.4.0.orig.tar.gz
+abcde_2.4.1.orig.tar.gz

abcde-2.3.99.7-speex-comment.patch

@@ -1,16 +0,0 @@
-diff -up abcde-2.3.99.7/abcde~ abcde-2.3.99.7/abcde
---- abcde-2.3.99.7/abcde~	2009-07-27 23:06:31.000000000 +0300
-+++ abcde-2.3.99.7/abcde	2009-07-27 23:07:55.000000000 +0300
-@@ -1114,11 +1114,10 @@ do_encode ()
- 						*=*) ;;
- 						*)   COMMENT="COMMENT=$COMMENT" ;;
- 					esac	
--					COMMENT="--comment \"$COMMENT\""
- 				fi
- 				# 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" "$IN" "$OUT"
-+					$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"

abcde-2.4.1-tagging.patch

@@ -1,20 +1,23 @@
---- abcde-2.3.99.7.orig/abcde
-+++ abcde-2.3.99.7/abcde
-@@ -1116,9 +1116,10 @@
+Index: abcde
+===================================================================
+--- abcde	(revision 290)
++++ abcde	(working copy)
+@@ -1121,11 +1121,10 @@
+ 						*=*) ;;
+ 						*)   COMMENT="COMMENT=$COMMENT" ;;
  					esac	
- 					COMMENT="--comment \"$COMMENT\""
+-					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" "$IN" "$OUT"
+-					$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" "$IN" "$OUT"
-+
++					$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
-@@ -1133,8 +1134,8 @@
+@@ -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)

abcde.spec

@@ -1,24 +1,20 @@
 Name:           abcde
-Version:        2.4.0
+Version:        2.4.1
 Release:        1%{?dist}
 Summary:        A Better CD Encoder
 
 Group:          Applications/Multimedia
-# Also "Larry Wall's Artistic" upstream, but the original Artistic is
-# not accepted in Fedora.  Note that the license will be public domain as of
-# 2010-01-01 (see comments in abcde, cddb-tool).
-License:        GPLv2+
+# Public domain after 2010-01-01, see comments in abcde and cddb-tool
+License:        Public Domain
 URL:            http://code.google.com/p/abcde/
 Source0:        http://ftp.debian.org/debian/pool/main/a/abcde/%{name}_%{version}.orig.tar.gz
 Patch0:         %{name}-2.4.0-config.patch
 # http://code.google.com/p/abcde/issues/detail?id=17
 Patch1:         %{name}-2.1.19-inst.patch
-# Cherry-picked bits from Ubuntu's 2.3.99.7-1ubuntu1
-Patch2:         %{name}_2.3.99.7-1ubuntu1.diff
+# 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
-# http://code.google.com/p/abcde/issues/detail?id=19
-Patch4:         %{name}-2.3.99.7-speex-comment.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -30,7 +26,7 @@ Requires(hint): vorbis-tools
 Requires(hint): flac
 
 %description
-abcde is a frontend command-line utility (actually, a shell script)
+abcde is a front end 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.
 
@@ -39,9 +35,8 @@ tags them, all in one go.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+%patch2 -p0
 %patch3 -p0
-%patch4 -p1
 mv examples/cue2discid .
 
 
@@ -70,6 +65,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Apr  2 2010 Ville Skyttä <ville.skytta@iki.fi> - 2.4.1-1
+- Update to 2.4.1.
+
 * Sun Oct 18 2009 Ville Skyttä <ville.skytta@iki.fi> - 2.4.0-1
 - Update to 2.4.0 (#529509).
 

sources

@@ -1 +1 @@
-621abafbfc4eecbbc887dc400d697c2f  abcde_2.4.0.orig.tar.gz
+1f663da556060354626354b4dc5ce5cf  abcde_2.4.1.orig.tar.gz