diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e32dfc9..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -abcde_2.3.99.6.orig.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..dafa321 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/*.tar.* diff --git a/587979573442684E.gpg b/587979573442684E.gpg new file mode 100644 index 0000000..6aba9c2 Binary files /dev/null and b/587979573442684E.gpg differ diff --git a/Makefile b/Makefile deleted file mode 100644 index 657f638..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: abcde -# $Id$ -NAME := abcde -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/abcde-2.1.19-inst.patch b/abcde-2.1.19-inst.patch deleted file mode 100644 index 0f39e39..0000000 --- a/abcde-2.1.19-inst.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- abcde-2.1.19/Makefile.inst 2004-04-09 20:12:15.000000000 +0200 -+++ abcde-2.1.19/Makefile 2004-04-14 13:06:31.680708323 +0200 -@@ -14,13 +14,13 @@ - - install: - $(INSTALL) -d -m 755 $(bindir) -- $(INSTALL) -m 755 -o 0 abcde $(bindir) -- $(INSTALL) -m 755 -o 0 cddb-tool $(bindir) -+ $(INSTALL) -m 755 abcde $(bindir) -+ $(INSTALL) -m 755 cddb-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 \ diff --git a/abcde-2.3.99.6-speex-comment.patch b/abcde-2.3.99.6-speex-comment.patch deleted file mode 100644 index e31c4cf..0000000 --- a/abcde-2.3.99.6-speex-comment.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up abcde-2.3.99.6/abcde~ abcde-2.3.99.6/abcde ---- abcde-2.3.99.6/abcde~ 2008-01-20 14:39:48.000000000 +0200 -+++ abcde-2.3.99.6/abcde 2008-01-20 14:39:56.000000000 +0200 -@@ -1068,11 +1068,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" "$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 diff --git a/abcde-2.3.99.6-usage.patch b/abcde-2.3.99.6-usage.patch deleted file mode 100644 index 6c5836d..0000000 --- a/abcde-2.3.99.6-usage.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up abcde-2.3.99.6/abcde~ abcde-2.3.99.6/abcde ---- abcde-2.3.99.6/abcde~ 2008-01-20 13:47:40.000000000 +0200 -+++ abcde-2.3.99.6/abcde 2008-01-20 13:51:15.000000000 +0200 -@@ -56,7 +56,7 @@ echo "-r " - echo " Also encode on these remote hosts" - echo "-R Use local CDDB in recursive mode" - echo "-s " --echo " Show dielfs from the CDDB info (year,genre)" -+echo " Show fields from the CDDB info (year,genre)" - echo "-S <#> Set the CD speed" - echo "-t <#> Start the track numbering at a given number" - echo "-T <#> Same as -t but modifies tag numbering" -@@ -66,7 +66,7 @@ echo "-V Be a bit more verbose about - echo "-x Eject CD after all tracks are read" - echo "-w " - echo " Add a comment to the CD tracks" --echo "-W <#> Contatenate CDs: -T #01 -w \"CD #\"" -+echo "-W <#> Concatenate CDs: -T #01 -w \"CD #\"" - echo "-z Use debug CDROMREADERSYNTAX option (needs cdparanoia)" - echo "" - echo "Tracks is a space-delimited list of tracks to grab." diff --git a/abcde-2.3.99.6-wget111-441862.patch b/abcde-2.3.99.6-wget111-441862.patch deleted file mode 100644 index 4652864..0000000 --- a/abcde-2.3.99.6-wget111-441862.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://savannah.gnu.org/bugs/?22896 - -diff -up abcde-2.3.99.6/abcde~ abcde-2.3.99.6/abcde ---- abcde-2.3.99.6/abcde~ 2006-08-05 22:14:00.000000000 +0300 -+++ abcde-2.3.99.6/abcde 2008-04-10 21:58:57.000000000 +0300 -@@ -3065,7 +3065,7 @@ fi - - if [ "$HTTPGETOPTS" = "" ] ; then - case $HTTPGET in -- wget) HTTPGETOPTS="-q -O -";; -+ wget) HTTPGETOPTS="-q -e timestamping=off -O -";; - curl) HTTPGETOPTS="-f -s";; - fetch)HTTPGETOPTS="-q -o -";; - ftp) HTTPGETOPTS="-a -V -o - ";; -diff -up abcde-2.3.99.6/cddb-tool~ abcde-2.3.99.6/cddb-tool ---- abcde-2.3.99.6/cddb-tool~ 2006-04-11 14:57:39.000000000 +0300 -+++ abcde-2.3.99.6/cddb-tool 2008-04-10 21:58:29.000000000 +0300 -@@ -44,7 +44,7 @@ if [ "$HTTPGET" = "" ]; then - HTTPGETOPTS=${HTTPGETOPTS:="-f -s"} - else - HTTPGET=wget -- HTTPGETOPTS=${HTTPGETOPTS:="-q -O -"} -+ HTTPGETOPTS=${HTTPGETOPTS:="-q -e timestamping=off -O -"} - fi - fi - diff --git a/abcde-gnudb.patch b/abcde-gnudb.patch new file mode 100644 index 0000000..dc00ee0 --- /dev/null +++ b/abcde-gnudb.patch @@ -0,0 +1,31 @@ +--- ./abcde.conf~ 2019-02-05 03:19:03.000000000 -0700 ++++ ./abcde.conf 2021-01-15 18:07:27.125346596 -0700 +@@ -15,19 +15,24 @@ + # If you wish to use a different CDDB server, edit this line. + # If you just wanted to use a proxy server, just set your http_proxy + # environment variable - wget will use it correctly. +-#CDDBURL="http://freedb.freedb.org/~cddb/cddb.cgi" ++# In the past freedb.org was a popular choice but this service ++# was acquired and discontinued. The following may serve as ++# a replacemet ++#CDDBURL="http://gnudb.gnudb.org/~cddb/cddb.cgi" + + # The CDDB protocol level. + # Right now 5 is latin1 output and 6 is UTF8 encoding. + #CDDBPROTO=6 + + # The CDDB protocol requires hello information, including a valid username +-# and hostname. If you feel paranoid about giving away such info, edit this +-# line - the format is username@hostname. ++# and hostname. If you feel paranoid about giving away such info, edit ++# "HELLOINFO" line - the format is username@hostname. ++# Submissions to cddb actually require a valid email address which may, or may ++# not be like the following: + #HELLOINFO="`whoami`@`hostname`" + + # This controls the email address CDDB changes are submitted to. +-#CDDBSUBMIT=freedb-submit@freedb.org ++#CDDBSUBMIT=submit@gnudb.org + + # The following options control whether or not fetched CDDB entries + # are cached locally in $CDDBLOCALDIR diff --git a/abcde-normalize.patch b/abcde-normalize.patch new file mode 100644 index 0000000..1df4384 --- /dev/null +++ b/abcde-normalize.patch @@ -0,0 +1,75 @@ +diff -up abcde-2.9/abcde.1.normalize abcde-2.9/abcde.1 +--- abcde-2.9/abcde.1.normalize 2018-03-08 01:22:48.000000000 +0100 ++++ abcde-2.9/abcde.1 2018-03-09 16:16:02.405903317 +0100 +@@ -385,7 +385,7 @@ At this point only \'ffmpeg\' is availab + .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 +@@ -669,7 +669,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), +@@ -685,7 +685,7 @@ ImageMagick package should be installed. + .BR mid3v2 (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.9/abcde.conf.normalize abcde-2.9/abcde.conf +--- abcde-2.9/abcde.conf.normalize 2018-03-08 01:22:48.000000000 +0100 ++++ abcde-2.9/abcde.conf 2018-03-09 16:16:02.405903317 +0100 +@@ -189,7 +189,7 @@ + #DISTMP3=distmp3 + #VORBISCOMMENT=vorbiscomment + #METAFLAC=metaflac +-#NORMALIZE=normalize-audio ++#NORMALIZE=normalize + #CDSPEED=eject + #VORBISGAIN=vorbisgain + #MKCUE=mkcue +diff -up abcde-2.9/abcde.normalize abcde-2.9/abcde +--- abcde-2.9/abcde.normalize 2018-03-09 16:16:02.404903308 +0100 ++++ abcde-2.9/abcde 2018-03-09 16:16:42.876271969 +0100 +@@ -3890,7 +3890,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.9/README.normalize abcde-2.9/README +--- abcde-2.9/README.normalize 2018-03-08 01:22:48.000000000 +0100 ++++ abcde-2.9/README 2018-03-09 16:16:02.405903317 +0100 +@@ -218,7 +218,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. +@@ -267,7 +267,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 67a4bfb..3716ca4 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,67 +1,80 @@ Name: abcde -Version: 2.3.99.6 -Release: 8 +Version: 2.9.3 +Release: 19%{?dist} Summary: A Better CD Encoder -Group: Applications/Multimedia -# Also "Larry Wall's Artistic" upstream, but the original Artistic is -# not accepted in Fedora -License: GPLv2+ -URL: http://www.hispalinux.es/~data/abcde.php -Source0: http://ftp.debian.org/debian/pool/main/a/abcde/%{name}_%{version}.orig.tar.gz -Patch0: %{name}-2.1.19-inst.patch -# Patch1: http://patches.ubuntu.com/a/abcde/abcde_2.3.99.6-1ubuntu2.patch -# with non-applicable parts removed. -Patch1: %{name}_2.3.99.6-1ubuntu2.patch -Patch2: %{name}-2.3.99.6-usage.patch -Patch3: %{name}-2.3.99.6-speex-comment.patch -Patch4: %{name}-2.3.99.6-wget111-441862.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# previously license field included Public Domain, but FOSSology scan of v2.9.3 did not +# turn up any public domain dedications other than a reference in an old changelog entry +# to a public domain mention that has since been removed upstream. +License: GPL-2.0-or-later +URL: https://abcde.einval.com/ +Source0: https://abcde.einval.com/download/%{name}-%{version}.tar.gz +Source1: https://abcde.einval.com/download/%{name}-%{version}.tar.gz.sign +# gpg2 --recv-key 0x587979573442684E +# gpg2 --export --export-options export-minimal 0x587979573442684E > 587979573442684E.gpg +Source2: 587979573442684E.gpg +Patch0: %{name}-normalize.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1916974 +Patch1: https://bugzilla.redhat.com/attachment.cgi?id=1748056#/abcde-gnudb.patch BuildArch: noarch +BuildRequires: %{_bindir}/gpgv2 +BuildRequires: make +BuildRequires: perl-generators Requires: cd-discid -Requires: cdparanoia +Requires: %{_bindir}/hostname Requires: wget Requires: which -Requires(hint): vorbis-tools -Requires(hint): flac +# cdparanoia, vorbis-tools for defaults +Requires: cdparanoia +Requires: vorbis-tools +# icedax for cd-text +Recommends: icedax +Recommends: flac +Suggests: cd-discid +Suggests: cdrdao +Suggests: ImageMagick +Suggests: lame +Suggests: libcdio-paranoia +Suggests: normalize +Suggests: opus-tools +Suggests: speex-tools +Suggests: twolame +Suggests: wavpack +Suggests: vorbisgain +# eyeD3 is smaller than id3v2 +Suggests: %{_bindir}/eyeD3 +Conflicts: python-eyed3 < 0.7.0 %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. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -sed -i -e 's/normalize-audio/normalize/g' abcde* -sed -i -e 's/^#NOGAP$/#NOGAP=y/' abcde.conf +%{gpgverify} --keyring='%{S:2}' --signature='%{S:1}' --data='%{S:0}' +%autosetup mv examples/cue2discid . +sed -i -e 's|bin/python\b|bin/python3|' cue2discid +chmod -c -x examples/musicbrainz-get-tracks %build %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +%make_install prefix=%{_prefix} sysconfdir=%{_sysconfdir} +rm -r $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version} # handled separately install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir} -%clean -rm -rf $RPM_BUILD_ROOT - - %files -%defattr(-,root,root,-) -%doc COPYING FAQ README TODO USEPIPES changelog examples/ +%license COPYING +%doc FAQ README changelog examples/ %config(noreplace) %{_sysconfdir}/abcde.conf %{_bindir}/abcde +%{_bindir}/abcde-musicbrainz-tool %{_bindir}/cddb-tool %{_bindir}/cue2discid %{_mandir}/man1/abcde.1* @@ -69,60 +82,246 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 2.9.3-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Wed Jul 23 2025 Fedora Release Engineering - 2.9.3-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Thu Jan 16 2025 Fedora Release Engineering - 2.9.3-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Jul 17 2024 Fedora Release Engineering - 2.9.3-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 2.9.3-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 2.9.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 2.9.3-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Mar 16 2023 Jilayne Lovejoy - 2.9.3-12 +- migrated to SPDX license + +* Wed Jan 18 2023 Fedora Release Engineering - 2.9.3-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 2.9.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jan 19 2022 Fedora Release Engineering - 2.9.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 2.9.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sat May 22 2021 Dominik Mierzejewski - 2.9.3-7 +- point to gnudb.org instead of the discontinued freedb.org (#1916974) + +* Mon Jan 25 2021 Fedora Release Engineering - 2.9.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 2.9.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Oct 29 2019 Dominik Mierzejewski - 2.9.3-3 +- MusicBrainz lookup support for abcde (#1758816) +- use gpgverify macro +- add missing BR: perl-generators to generate perl dependencies +- add Requires: hostname which might be missing on minimal installs + +* Wed Jul 24 2019 Fedora Release Engineering - 2.9.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Feb 05 2019 Dominik Mierzejewski - 2.9.3-1 +- update to 2.9.3 (#1672604) + +* Thu Jan 31 2019 Fedora Release Engineering - 2.9.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Aug 04 2018 Dominik Mierzejewski - 2.9.2-1 +- update to 2.9.2 (#1611854) +- fix version typo in Makefile + +* Thu Jul 12 2018 Fedora Release Engineering - 2.9.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Mar 15 2018 Dominik Mierzejewski - 2.9.1-1 +- update to 2.9.1 (#1553948) + +* Fri Mar 09 2018 Dominik Mierzejewski - 2.9-1 +- update to 2.9 (#1553139) +- rebase patches +- use autosetup macro + +* Wed Feb 21 2018 Dominik Mierzejewski - 2.8.1-6 +- add Suggests for twolame, now that's included in Fedora 27+ (#1534297) +- verify GPG signature for the source tarball + +* Wed Feb 07 2018 Fedora Release Engineering - 2.8.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2.8.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sun Jul 02 2017 Dominik Mierzejewski - 2.8.1-3 +- set the default CDDBMETHOD to cddb, as perl MusicBrainz modules are + not packaged +- add a weak dependency on lame, since mp3 encoding is now in Fedora 25+ + +* Fri Feb 10 2017 Fedora Release Engineering - 2.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Jan 19 2017 Dominik Mierzejewski - 2.8.1-1 +- Update to 2.8.1 + +* Wed Jan 18 2017 Dominik Mierzejewski - 2.8-1 +- Update to 2.8 +- Add the supported additional tools packaged in Fedora to Suggests: + +* Mon Dec 19 2016 Miro Hrončok - 2.7.2-2 +- Rebuild for Python 3.6 + +* Sun Apr 10 2016 Dominik Mierzejewski - 2.7.2-1 +- Update to 2.7.2 +- Use HTTPS for URLs + +* Wed Feb 03 2016 Fedora Release Engineering - 2.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Sun Oct 4 2015 Ville Skyttä - 2.7.1-1 +- Update to 2.7.1 + +* 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 + +* Sun Nov 9 2014 Ville Skyttä - 2.6-1 +- Update to 2.6 +- Mark COPYING as %%license where applicable + +* Fri Jun 06 2014 Fedora Release Engineering - 2.5.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Apr 17 2014 Ville Skyttä - 2.5.4-4 +- Fix eyeD3 tagging of entries without year info +- Fix bogus date in %%changelog + +* Thu Aug 1 2013 Ville Skyttä - 2.5.4-3 +- Apply upstream + --comment fixes for eyeD3 >= 0.7.0 (#991163). + +* Wed Feb 13 2013 Fedora Release Engineering - 2.5.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Sep 19 2012 Ville Skyttä - 2.5.4-1 +- Update to 2.5.4. + +* Wed Jul 18 2012 Fedora Release Engineering - 2.5.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sun Jun 17 2012 Ville Skyttä - 2.5.3-1 +- Update to 2.5.3. + +* Sun Apr 29 2012 Ville Skyttä - 2.5.2-1 +- Update to 2.5.2. + +* Sun Apr 15 2012 Ville Skyttä - 2.5.0-1 +- Update to 2.5.0. +- Clean up specfile constructs no longer needed in Fedora or EL6+. + +* Thu Jan 12 2012 Fedora Release Engineering - 2.4.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Feb 09 2011 Dennis Gilmore -2.4.2-3 +- remove unsupported Requires(hint) from spec + +* Mon Feb 07 2011 Fedora Release Engineering -2.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sun May 30 2010 Ville Skyttä - 2.4.2-1 +- Update to 2.4.2 (#597723), track info patch applied upstream. + +* Fri Apr 2 2010 Ville Skyttä - 2.4.1-1 +- Update to 2.4.1. + +* 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 +- Update to 2.3.99.7 (#513795); wget and usage patches applied upstream. +- Patch to improve CDDB track info handling. +- Update URL. + +* Fri Jul 24 2009 Fedora Release Engineering - 2.3.99.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * 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 +* Wed Apr 6 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/abcde_2.3.99.6-1ubuntu2.patch b/abcde_2.3.99.6-1ubuntu2.patch deleted file mode 100644 index a2830ac..0000000 --- a/abcde_2.3.99.6-1ubuntu2.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -pruN 2.3.99.6-1/abcde 2.3.99.6-1ubuntu2/abcde ---- 2.3.99.6-1/abcde 2006-08-05 20:14:00.000000000 +0100 -+++ 2.3.99.6-1ubuntu2/abcde 2007-10-18 16:24:45.000000000 +0100 -@@ -1070,8 +1070,8 @@ do_encode () - 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 -+ # 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" "$IN" "$OUT" - else - $RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS "$IN" "$OUT" -@@ -1087,8 +1087,8 @@ do_encode () - $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 -@@ -3221,14 +3221,17 @@ if [ "$ONETRACK" = "y" ]; then - else - while [ $# -gt 0 ]; do - # Range parsing code courtesy of Vincent Ho -- RSTART=$(echo $1 | cut -f1 -d-) -- REND=$(echo $1 | cut -f2 -d-) -- if [ "$RSTART" = "$REND" ]; then -- NEWTRACKS="$RSTART" -+ # Cleaned up to use shell built-ins by Charles Steinkuehler -+ if [ "${1#*[^0-9-]}" != "$1" ]; then -+ log error "syntax error while processing track numbers" - else -- NEWTRACKS=$(f_seq_line $RSTART $REND) -+ RSTART=${1%%-*} -+ REND=${1##*-} -+ while [ ${RSTART:=1} -le ${REND:=0} ] ; do -+ TRACKQUEUE="$TRACKQUEUE $RSTART" -+ RSTART=$(( $RSTART + 1 )) -+ done - fi -- TRACKQUEUE=$(echo "$TRACKQUEUE" "$NEWTRACKS") - shift - done - fi -@@ -3249,7 +3252,11 @@ DOMOVE=n - DOREPLAYGAIN=n - DOPLAYLIST=n - DOCLEAN=n --DOCUE=n -+ -+# Don't clobber the -M command-line flag. -+if [ -z "$DOCUE" ]; then -+ DOCUE=n -+fi - - for ACTION in $(echo $ACTIONS | tr , \ ) - do diff --git a/sources b/sources index 271bdb9..579479b 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -ac9be20f3098b0943212168171d33ffa abcde_2.3.99.6.orig.tar.gz +SHA512 (abcde-2.9.3.tar.gz) = 51a1dfa1f1d2dab6b8dad7d9f70d0139938151bc2dae0e9fc80da5385b4bba4d71c89a4d1b2dec5bd24787a542cb0caeacbef423cf32b8014cf6320c391b4236 +SHA512 (abcde-2.9.3.tar.gz.sign) = b3fe879beee77d21d5e97968345e9a267241e6e9f52b195eb39f325acbfd82bf7eee6c156168fb673f8011cc38c69d69900ce4d66959eb995ed64bca6dc79928