diff --git a/.cvsignore b/.cvsignore index f3fd931..09c8106 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -abcde_2.3.99.8.orig.tar.gz +abcde_2.4.0.orig.tar.gz diff --git a/abcde-2.3.99.8-config.patch b/abcde-2.3.99.8-config.patch deleted file mode 100644 index 24346f9..0000000 --- a/abcde-2.3.99.8-config.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -up abcde-2.3.99.8/abcde~ abcde-2.3.99.8/abcde ---- abcde-2.3.99.8/abcde~ 2009-07-26 20:28:29.000000000 +0300 -+++ abcde-2.3.99.8/abcde 2009-08-12 00:47:00.000000000 +0300 -@@ -3008,7 +3008,7 @@ MUSICBRAINZ=musicbrainz-get-tracks - EJECT=eject - MD5SUM=md5sum - DISTMP3=distmp3 --NORMALIZE=normalize-audio -+NORMALIZE=normalize - CDSPEED=eject - VORBISGAIN=vorbisgain - MP3GAIN=mp3gain -diff -up abcde-2.3.99.8/abcde.1~ abcde-2.3.99.8/abcde.1 ---- abcde-2.3.99.8/abcde.1~ 2009-07-26 14:36:02.000000000 +0300 -+++ abcde-2.3.99.8/abcde.1 2009-08-12 00:47:02.000000000 +0300 -@@ -325,7 +325,7 @@ only support \'faac\', so \'default\' po - .TP - .B NORMALIZERSYNTAX - Specifies the style of normalizer to use. Valid options are \'default\' --and \'normalize'\ (and both run \'normalize-audio\'), since we only support it, -+and \'normalize'\ (and both run \'normalize\'), since we only support it, - ATM. - .TP - .B CDROMREADERSYNTAX -@@ -563,7 +563,7 @@ An HTTP retrieval program: wget, fetch ( - (optional) distmp3, a client/server for distributed mp3 encoding. - .TP - .B * --(optional) normalize-audio, a WAV file volume normalizer. -+(optional) normalize, a WAV file volume normalizer. - .TP - .B * - (optional) a replaygain file volume modifier (vorbisgain, metaflac, mp3gain, replaygain), -@@ -574,7 +574,7 @@ An HTTP retrieval program: wget, fetch ( - .BR cdparanoia (1), - .BR cdda2wav (1), - .BR dagrab (1), --.BR normalize-audio (1), -+.BR normalize (1), - .BR oggenc (1), - .BR vorbize (1), - .BR flac (1), -diff -up abcde-2.3.99.8/abcde.conf~ abcde-2.3.99.8/abcde.conf ---- abcde-2.3.99.8/abcde.conf~ 2009-07-26 14:46:44.000000000 +0300 -+++ abcde-2.3.99.8/abcde.conf 2009-08-12 00:47:04.000000000 +0300 -@@ -139,7 +139,7 @@ - #DISTMP3=distmp3 - #VORBISCOMMENT=vorbiscomment - #METAFLAC=metaflac --#NORMALIZE=normalize-audio -+#NORMALIZE=normalize - #CDSPEED=eject - #VORBISGAIN=vorbisgain - #MKCUE=mkcue -diff -up abcde-2.3.99.8/README~ abcde-2.3.99.8/README ---- abcde-2.3.99.8/README~ 2009-07-26 14:46:44.000000000 +0300 -+++ abcde-2.3.99.8/README 2009-08-12 00:46:53.000000000 +0300 -@@ -152,7 +152,7 @@ Options added/modified from 2.1.1 to 2.1 - - Options added/modified from 2.0.3 to 2.1.x: - --* -b use batch processing. It uses normalize-audio to adjust the volume of -+* -b use batch processing. It uses normalize to adjust the volume of - the songs, and a -g gapless option from lame to remove gaps. Only available - for mp3+lame combination. - * a new "normalize" option has been added to -a, to normalize the volume. -@@ -205,7 +205,7 @@ abcde requires the following backend too - * Ogg/Speex encoder (speexenc) or: - * MPP/MP+(Musepack) encoder (mppenc) or: - * AAC encoder (faac) --* normalize-audio for volume normalization. -+* normalize for volume normalization. - * CD Paranoia, an audio CD reading utility or: - * cdda2wav, the audio CD reading utility cdparanoia was born from or: - * dagrab, another audio CD reading utility. diff --git a/abcde-2.4.0-config.patch b/abcde-2.4.0-config.patch new file mode 100644 index 0000000..037c9df --- /dev/null +++ b/abcde-2.4.0-config.patch @@ -0,0 +1,75 @@ +diff -up abcde-2.4.0/abcde~ abcde-2.4.0/abcde +--- abcde-2.4.0/abcde~ 2009-10-17 11:51:57.000000000 +0300 ++++ abcde-2.4.0/abcde 2009-10-18 12:07:31.000000000 +0300 +@@ -3035,7 +3035,7 @@ MUSICBRAINZ=musicbrainz-get-tracks + EJECT=eject + MD5SUM=md5sum + DISTMP3=distmp3 +-NORMALIZE=normalize-audio ++NORMALIZE=normalize + CDSPEED=eject + VORBISGAIN=vorbisgain + MP3GAIN=mp3gain +diff -up abcde-2.4.0/abcde.1~ abcde-2.4.0/abcde.1 +--- abcde-2.4.0/abcde.1~ 2009-10-16 22:02:54.000000000 +0300 ++++ abcde-2.4.0/abcde.1 2009-10-18 12:07:32.000000000 +0300 +@@ -325,7 +325,7 @@ only support \'faac\', so \'default\' po + .TP + .B NORMALIZERSYNTAX + Specifies the style of normalizer to use. Valid options are \'default\' +-and \'normalize'\ (and both run \'normalize-audio\'), since we only support it, ++and \'normalize'\ (and both run \'normalize\'), since we only support it, + ATM. + .TP + .B CDROMREADERSYNTAX +@@ -563,7 +563,7 @@ An HTTP retrieval program: wget, fetch ( + (optional) distmp3, a client/server for distributed mp3 encoding. + .TP + .B * +-(optional) normalize-audio, a WAV file volume normalizer. ++(optional) normalize, a WAV file volume normalizer. + .TP + .B * + (optional) a replaygain file volume modifier (vorbisgain, metaflac, mp3gain, replaygain), +@@ -575,7 +575,7 @@ An HTTP retrieval program: wget, fetch ( + .BR icedax (1), + .BR cdda2wav (1), + .BR dagrab (1), +-.BR normalize-audio (1), ++.BR normalize (1), + .BR oggenc (1), + .BR vorbize (1), + .BR flac (1), +diff -up abcde-2.4.0/abcde.conf~ abcde-2.4.0/abcde.conf +--- abcde-2.4.0/abcde.conf~ 2009-10-16 22:02:54.000000000 +0300 ++++ abcde-2.4.0/abcde.conf 2009-10-18 12:07:34.000000000 +0300 +@@ -139,7 +139,7 @@ + #DISTMP3=distmp3 + #VORBISCOMMENT=vorbiscomment + #METAFLAC=metaflac +-#NORMALIZE=normalize-audio ++#NORMALIZE=normalize + #CDSPEED=eject + #VORBISGAIN=vorbisgain + #MKCUE=mkcue +diff -up abcde-2.4.0/README~ abcde-2.4.0/README +--- abcde-2.4.0/README~ 2009-10-16 22:02:54.000000000 +0300 ++++ abcde-2.4.0/README 2009-10-18 12:07:27.000000000 +0300 +@@ -152,7 +152,7 @@ Options added/modified from 2.1.1 to 2.1 + + Options added/modified from 2.0.3 to 2.1.x: + +-* -b use batch processing. It uses normalize-audio to adjust the volume of ++* -b use batch processing. It uses normalize to adjust the volume of + the songs, and a -g gapless option from lame to remove gaps. Only available + for mp3+lame combination. + * a new "normalize" option has been added to -a, to normalize the volume. +@@ -205,7 +205,7 @@ abcde requires the following backend too + * Ogg/Speex encoder (speexenc) or: + * MPP/MP+(Musepack) encoder (mppenc) or: + * AAC encoder (faac) +-* normalize-audio for volume normalization. ++* normalize for volume normalization. + * CD Paranoia, an audio CD reading utility or: + * icedax/cdda2wav, the audio CD reading utility cdparanoia was born from or: + * dagrab, another audio CD reading utility. diff --git a/abcde.spec b/abcde.spec index 6204c83..7c12355 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,5 +1,5 @@ Name: abcde -Version: 2.3.99.8 +Version: 2.4.0 Release: 1%{?dist} Summary: A Better CD Encoder @@ -10,7 +10,7 @@ Group: Applications/Multimedia License: GPLv2+ 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.3.99.8-config.patch +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 @@ -70,10 +70,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Oct 18 2009 Ville Skyttä - 2.4.0-1 +- Update to 2.4.0 (#529509). + * Wed Aug 12 2009 Ville Skyttä - 2.3.99.8-1 - Update to 2.3.99.8 (#516886). -* Mon Jul 27 2009 Ville Skyttä - 2.3.99.7-1 +* Mon Jul 27 2009 Ville Skyttä - 2.3.99.7-1 - Update to 2.3.99.7 (#513795); wget and usage patches applied upstream. - Patch to improve CDDB track info handling. - Update URL. @@ -84,57 +87,57 @@ rm -rf $RPM_BUILD_ROOT * Mon Feb 23 2009 Fedora Release Engineering - 2.3.99.6-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -* Thu Apr 10 2008 Ville Skyttä - 2.3.99.6-7 +* Thu Apr 10 2008 Ville Skyttä - 2.3.99.6-7 - Patch to work around wget 1.11 regression (#441862). -* Sat Jan 19 2008 Ville Skyttä - 2.3.99.6-6 +* Sat Jan 19 2008 Ville Skyttä - 2.3.99.6-6 - Include fixes from Ubuntu's 2.3.99.6-1ubuntu2: enables M4A and Speex tagging, fixes range code, and the -M option. - Fix Speex comment tagging. - Fix some usage message spelling errors. - Drop disttag. -* Sat Sep 29 2007 Ville Skyttä - 2.3.99.6-4 +* Sat Sep 29 2007 Ville Skyttä - 2.3.99.6-4 - Requires: which -* Mon Aug 13 2007 Ville Skyttä - 2.3.99.6-3 +* Mon Aug 13 2007 Ville Skyttä - 2.3.99.6-3 - License: GPLv2+ - Add (empty) %%build section. -* Tue Aug 29 2006 Ville Skyttä - 2.3.99.6-2 +* Tue Aug 29 2006 Ville Skyttä - 2.3.99.6-2 - Change vorbis-tools and flac dependencies to Requires(hint), drop speex dependency. -* Mon Aug 7 2006 Ville Skyttä - 2.3.99.6-1 +* Mon Aug 7 2006 Ville Skyttä - 2.3.99.6-1 - 2.3.99.6. -* Wed Mar 1 2006 Ville Skyttä - 2.3.99.5-1 +* Wed Mar 1 2006 Ville Skyttä - 2.3.99.5-1 - 2.3.99.5. -* Wed Dec 14 2005 Ville Skyttä - 2.3.99.2-1 +* Wed Dec 14 2005 Ville Skyttä - 2.3.99.2-1 - 2.3.99.2, config file fixes mostly applied upstream. -* Sat Dec 10 2005 Ville Skyttä - 2.3.99-1 +* Sat Dec 10 2005 Ville Skyttä - 2.3.99-1 - 2.3.99, minor config file fixes. -* Mon Sep 5 2005 Ville Skyttä - 2.3.4-1 +* Mon Sep 5 2005 Ville Skyttä - 2.3.4-1 - 2.3.4. -* Fri Aug 26 2005 Ville Skyttä - 2.3.3-1 +* Fri Aug 26 2005 Ville Skyttä - 2.3.3-1 - 2.3.3. - Reformat specfile. -* Sat Aug 20 2005 Ville Skyttä - 2.3.2-1 +* Sat Aug 20 2005 Ville Skyttä - 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 - 2.2.3-2 - rebuilt -* Thu Feb 10 2005 Ville Skyttä - 2.2.3-1 +* Thu Feb 10 2005 Ville Skyttä - 2.2.3-1 - Update to 2.2.3. -* Mon Jan 17 2005 Ville Skyttä - 2.2.0-2 +* Mon Jan 17 2005 Ville Skyttä - 2.2.0-2 - Add vorbis-tools, flac, cdparanoia, wget, and speex dependencies. - Weed out some Debianisms from default external tool names. - Include more docs. diff --git a/sources b/sources index 108723b..8588586 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -981fd4bfd6938bb6a1130f6193bffb00 abcde_2.3.99.8.orig.tar.gz +621abafbfc4eecbbc887dc400d697c2f abcde_2.4.0.orig.tar.gz