diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..09c8106 --- /dev/null +++ b/.cvsignore @@ -0,0 +1 @@ +abcde_2.4.0.orig.tar.gz diff --git a/.gitignore b/.gitignore deleted file mode 100644 index dafa321..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/*.tar.* diff --git a/587979573442684E.gpg b/587979573442684E.gpg deleted file mode 100644 index 6aba9c2..0000000 Binary files a/587979573442684E.gpg and /dev/null differ diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..c25dc0b --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# 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 $$d/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 new file mode 100644 index 0000000..0f39e39 --- /dev/null +++ b/abcde-2.1.19-inst.patch @@ -0,0 +1,21 @@ +--- 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.7-speex-comment.patch b/abcde-2.3.99.7-speex-comment.patch new file mode 100644 index 0000000..cd788b7 --- /dev/null +++ b/abcde-2.3.99.7-speex-comment.patch @@ -0,0 +1,16 @@ +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" diff --git a/abcde-2.3.99.7-trackinfo.patch b/abcde-2.3.99.7-trackinfo.patch new file mode 100644 index 0000000..51e5c5e --- /dev/null +++ b/abcde-2.3.99.7-trackinfo.patch @@ -0,0 +1,13 @@ +Index: abcde +=================================================================== +--- abcde (revision 256) ++++ abcde (working copy) +@@ -421,7 +421,7 @@ + TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')" + ;; + TRACK-INFO) +- grep ^EXTT$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | perl -p -e 's/\\n/\n/;' ++ grep ^EXTT$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | sed -e 's/\\n/\n/g' + ;; + esac + } diff --git a/abcde-normalize.patch b/abcde-2.4.0-config.patch similarity index 51% rename from abcde-normalize.patch rename to abcde-2.4.0-config.patch index 1df4384..037c9df 100644 --- a/abcde-normalize.patch +++ b/abcde-2.4.0-config.patch @@ -1,7 +1,19 @@ -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 +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\' @@ -10,7 +22,7 @@ diff -up abcde-2.9/abcde.1.normalize abcde-2.9/abcde.1 ATM. .TP .B CDROMREADERSYNTAX -@@ -669,7 +669,7 @@ ImageMagick package should be installed. +@@ -563,7 +563,7 @@ An HTTP retrieval program: wget, fetch ( (optional) distmp3, a client/server for distributed mp3 encoding. .TP .B * @@ -18,20 +30,20 @@ diff -up abcde-2.9/abcde.1.normalize abcde-2.9/abcde.1 +(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), + (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.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 @@ +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 @@ -40,36 +52,24 @@ diff -up abcde-2.9/abcde.conf.normalize abcde-2.9/abcde.conf #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 +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 +-* -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) +@@ -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: - * cd-paranoia, an audio cd reading utility, courtesy of GNU libcdio or: + * dagrab, another audio CD reading utility. diff --git a/abcde-gnudb.patch b/abcde-gnudb.patch deleted file mode 100644 index dc00ee0..0000000 --- a/abcde-gnudb.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- ./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.spec b/abcde.spec index 3716ca4..7c12355 100644 --- a/abcde.spec +++ b/abcde.spec @@ -1,80 +1,68 @@ Name: abcde -Version: 2.9.3 -Release: 19%{?dist} +Version: 2.4.0 +Release: 1%{?dist} Summary: A Better CD Encoder -# 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 +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+ +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=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 -BuildRequires: %{_bindir}/gpgv2 -BuildRequires: make -BuildRequires: perl-generators Requires: cd-discid -Requires: %{_bindir}/hostname +Requires: cdparanoia Requires: wget Requires: which -# 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 +Requires(hint): vorbis-tools +Requires(hint): flac %description -abcde is a front end command line utility (actually, a shell script) +abcde is a frontend 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 -%{gpgverify} --keyring='%{S:2}' --signature='%{S:1}' --data='%{S:0}' -%autosetup +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p0 +%patch4 -p1 mv examples/cue2discid . -sed -i -e 's|bin/python\b|bin/python3|' cue2discid -chmod -c -x examples/musicbrainz-get-tracks %build %install -%make_install prefix=%{_prefix} sysconfdir=%{_sysconfdir} -rm -r $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version} # handled separately +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir} +%clean +rm -rf $RPM_BUILD_ROOT + + %files -%license COPYING -%doc FAQ README changelog examples/ +%defattr(-,root,root,-) +%doc COPYING FAQ KNOWN.BUGS README TODO USEPIPES changelog examples/ %config(noreplace) %{_sysconfdir}/abcde.conf %{_bindir}/abcde -%{_bindir}/abcde-musicbrainz-tool %{_bindir}/cddb-tool %{_bindir}/cue2discid %{_mandir}/man1/abcde.1* @@ -82,178 +70,6 @@ install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir} %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). @@ -315,7 +131,7 @@ install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir} - 2.3.2, vi and genre patches applied upstream. - Convert man page to UTF-8. -* Wed Apr 6 2005 Michael Schwendt - 2.2.3-2 +* Fri Apr 7 2005 Michael Schwendt - 2.2.3-2 - rebuilt * Thu Feb 10 2005 Ville Skyttä - 2.2.3-1 diff --git a/abcde_2.3.99.7-1ubuntu1.diff b/abcde_2.3.99.7-1ubuntu1.diff new file mode 100644 index 0000000..2e08719 --- /dev/null +++ b/abcde_2.3.99.7-1ubuntu1.diff @@ -0,0 +1,27 @@ +--- abcde-2.3.99.7.orig/abcde ++++ abcde-2.3.99.7/abcde +@@ -1116,9 +1116,10 @@ + 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" "$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" ++ + else + $RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS "$IN" "$OUT" + fi +@@ -1133,8 +1134,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 diff --git a/sources b/sources index 579479b..8588586 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (abcde-2.9.3.tar.gz) = 51a1dfa1f1d2dab6b8dad7d9f70d0139938151bc2dae0e9fc80da5385b4bba4d71c89a4d1b2dec5bd24787a542cb0caeacbef423cf32b8014cf6320c391b4236 -SHA512 (abcde-2.9.3.tar.gz.sign) = b3fe879beee77d21d5e97968345e9a267241e6e9f52b195eb39f325acbfd82bf7eee6c156168fb673f8011cc38c69d69900ce4d66959eb995ed64bca6dc79928 +621abafbfc4eecbbc887dc400d697c2f abcde_2.4.0.orig.tar.gz