From 5584bc913af30b007b00405f8dcf485b728b5896 Mon Sep 17 00:00:00 2001 From: Ville Skyttä Date: Jun 22 2015 08:44:45 +0000 Subject: Update to 2.7 - Use python3 in cue2discid - Soften some dependencies --- diff --git a/0001-Drop-EXTRAVERBOSE-debugging-noise.patch b/0001-Drop-EXTRAVERBOSE-debugging-noise.patch deleted file mode 100644 index d7e67f7..0000000 --- a/0001-Drop-EXTRAVERBOSE-debugging-noise.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 3a8aef3db1c8effa1dc9a5a770dcd38c96169b2a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Skytt=C3=A4?= -Date: Sun, 9 Nov 2014 20:00:40 +0200 -Subject: [PATCH] Drop EXTRAVERBOSE debugging noise - ---- - abcde | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/abcde b/abcde -index f6bf90d..2d1ecc4 100755 ---- a/abcde -+++ b/abcde -@@ -3447,7 +3447,6 @@ fi - # We used to use EXTRAVERBOSE=y to turn on more debug output. Now - # that's changed to a number to allow for more control. Deal with - # EXTRAVERBOSE=y/n, set it to 1/0 for backwards compatibility. --echo "Looking at EXTRAVERBOSE ($EXTRAVERBOSE)" - case "$EXTRAVERBOSE" in - *y*|*Y*) - EXTRAVERBOSE=1 --- -1.9.3 - diff --git a/abcde-2.4.0-config.patch b/abcde-2.4.0-config.patch deleted file mode 100644 index 037c9df..0000000 --- a/abcde-2.4.0-config.patch +++ /dev/null @@ -1,75 +0,0 @@ -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-2.7-normalize.patch b/abcde-2.7-normalize.patch new file mode 100644 index 0000000..5d0106b --- /dev/null +++ b/abcde-2.7-normalize.patch @@ -0,0 +1,75 @@ +diff -up abcde-2.7/abcde~ abcde-2.7/abcde +--- abcde-2.7/abcde~ 2015-06-18 15:26:40.000000000 +0300 ++++ abcde-2.7/abcde 2015-06-20 22:57:18.918621425 +0300 +@@ -3451,7 +3451,7 @@ MUSICBRAINZ=abcde-musicbrainz-tool + EJECT=eject + MD5SUM=md5sum + DISTMP3=distmp3 +-NORMALIZE=normalize-audio ++NORMALIZE=normalize + CDSPEED=eject + VORBISGAIN=vorbisgain + MP3GAIN=mp3gain +diff -up abcde-2.7/abcde.1~ abcde-2.7/abcde.1 +--- abcde-2.7/abcde.1~ 2015-06-18 15:26:40.000000000 +0300 ++++ abcde-2.7/abcde.1 2015-06-20 22:57:53.084714455 +0300 +@@ -345,7 +345,7 @@ Specifies the style of encoder to use fo + .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 +@@ -606,7 +606,7 @@ ImageMagick package should be installed. + (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, mpcgain, wvgain), +@@ -620,7 +620,7 @@ ImageMagick package should be installed. + .BR cdda2wav (1), + .BR pird (1), + .BR dagrab (1), +-.BR normalize-audio (1), ++.BR normalize (1), + .BR oggenc (1), + .BR vorbize (1), + .BR flac (1), +diff -up abcde-2.7/abcde.conf~ abcde-2.7/abcde.conf +--- abcde-2.7/abcde.conf~ 2015-06-18 15:26:40.000000000 +0300 ++++ abcde-2.7/abcde.conf 2015-06-20 22:57:25.573857690 +0300 +@@ -162,7 +162,7 @@ + #DISTMP3=distmp3 + #VORBISCOMMENT=vorbiscomment + #METAFLAC=metaflac +-#NORMALIZE=normalize-audio ++#NORMALIZE=normalize + #CDSPEED=eject + #VORBISGAIN=vorbisgain + #MKCUE=mkcue +diff -up abcde-2.7/README~ abcde-2.7/README +--- abcde-2.7/README~ 2015-06-18 15:26:40.000000000 +0300 ++++ abcde-2.7/README 2015-06-20 22:56:51.829662255 +0300 +@@ -176,7 +176,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. +@@ -225,7 +225,7 @@ abcde requires the following backend too + * An Opus encoder )opusenc) or: + * A Monkey's Ausio encoder (mac) or: + * A WavPack encoder (wavpack) +-* 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: + * cd-paranoia, an audio cd reading utility, courtesy of GNU libcdio or: diff --git a/abcde.spec b/abcde.spec index 550f7c0..64fcbbd 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,24 +1,27 @@ Name: abcde -Version: 2.6 -Release: 2%{?dist} +Version: 2.7 +Release: 1%{?dist} Summary: A Better CD Encoder -# Public domain after 2010-01-01, see comments in abcde and cddb-tool -License: Public Domain +# cddb-tool is Public Domain, otherwise GPLv2+ +License: GPLv2+ and Public Domain URL: http://abcde.einval.com/ Source0: http://abcde.einval.com/download/%{name}-%{version}.tar.gz -Patch0: %{name}-2.4.0-config.patch -# http://git.einval.com/cgi-bin/gitweb.cgi?p=abcde.git;a=patch;h=3a8aef3 -Patch1: 0001-Drop-EXTRAVERBOSE-debugging-noise.patch +Patch0: %{name}-2.7-normalize.patch BuildArch: noarch Requires: cd-discid -Requires: cdparanoia -Requires: flac -Requires: icedax -Requires: vorbis-tools Requires: wget Requires: which +# cdparanoia, vorbis-tools for defaults +Requires: cdparanoia +Requires: vorbis-tools +# icedax for cd-text +Recommends: icedax +Recommends: flac +Suggests: opus-tools +Suggests: speex-tools +Suggests: wavpack Conflicts: python-eyed3 < 0.7.0 %description @@ -30,9 +33,9 @@ tags them, all in one go. %prep %setup -q %patch0 -p1 -F2 -%patch1 -p1 mv examples/cue2discid . -chmod -c -x abcde-musicbrainz-tool +sed -i -e 's|bin/python\b|bin/python3|' cue2discid +chmod -c -x abcde-musicbrainz-tool examples/musicbrainz-get-tracks %build @@ -46,10 +49,8 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, some deps N/A %files -%{!?_licensedir:%global license %%doc} %license COPYING -%doc FAQ KNOWN.BUGS README TODO USEPIPES changelog examples/ -%doc abcde-musicbrainz-tool +%doc FAQ README abcde-musicbrainz-tool changelog examples/ %config(noreplace) %{_sysconfdir}/abcde.conf %{_bindir}/abcde %{_bindir}/cddb-tool @@ -59,6 +60,11 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, some deps N/A %changelog +* Sun Jun 21 2015 Ville Skyttä - 2.7-1 +- Update to 2.7 +- Use python3 in cue2discid +- Soften some dependencies + * Tue Jun 16 2015 Fedora Release Engineering - 2.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 26a7b44..e689791 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c8b91d5c53386cfc4345d9d49f67e1dd abcde-2.6.tar.gz +b947ec2b6baab8cf8388b1d6613664cb abcde-2.7.tar.gz