rpms/abcde/devel abcde-2.3.99.7-config.patch, NONE, 1.1 abcde-2.3.99.7-speex-comment.patch, NONE, 1.1 abcde-2.3.99.7-trackinfo.patch, NONE, 1.1 abcde_2.3.99.7-1ubuntu1.diff, NONE, 1.1 .cvsignore, 1.10, 1.11 abcde.spec, 1.20, 1.21 sources, 1.10, 1.11 abcde-2.3.99.6-speex-comment.patch, 1.1, NONE abcde-2.3.99.6-usage.patch, 1.1, NONE abcde-2.3.99.6-wget111-441862.patch, 1.1, NONE abcde_2.3.99.6-1ubuntu2.patch, 1.1, NONE
Ville Skyttä
scop at fedoraproject.org
Mon Jul 27 20:54:00 UTC 2009
- Previous message (by thread): rpms/sylpheed/devel import.log,1.1,1.2 sylpheed.spec,1.100,1.101
- Next message (by thread): rpms/perl-Class-MOP/devel .cvsignore, 1.32, 1.33 perl-Class-MOP.spec, 1.38, 1.39 sources, 1.30, 1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/pkgs/rpms/abcde/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10295
Modified Files:
.cvsignore abcde.spec sources
Added Files:
abcde-2.3.99.7-config.patch abcde-2.3.99.7-speex-comment.patch
abcde-2.3.99.7-trackinfo.patch abcde_2.3.99.7-1ubuntu1.diff
Removed Files:
abcde-2.3.99.6-speex-comment.patch abcde-2.3.99.6-usage.patch
abcde-2.3.99.6-wget111-441862.patch
abcde_2.3.99.6-1ubuntu2.patch
Log Message:
* Mon Jul 27 2009 Ville Skyttä <ville.skytta at iki.fi> - 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.
abcde-2.3.99.7-config.patch:
README | 4 ++--
abcde | 2 +-
abcde.1 | 6 +++---
abcde.conf | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
--- NEW FILE abcde-2.3.99.7-config.patch ---
diff -up abcde-2.3.99.7/abcde~ abcde-2.3.99.7/abcde
--- abcde-2.3.99.7/abcde~ 2008-06-10 13:39:05.000000000 +0300
+++ abcde-2.3.99.7/abcde 2009-07-27 23:46:34.000000000 +0300
@@ -2998,7 +2998,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.7/abcde.1~ abcde-2.3.99.7/abcde.1
--- abcde-2.3.99.7/abcde.1~ 2007-06-07 10:31:34.000000000 +0300
+++ abcde-2.3.99.7/abcde.1 2009-07-27 23:46:34.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.7/abcde.conf~ abcde-2.3.99.7/abcde.conf
--- abcde-2.3.99.7/abcde.conf~ 2008-06-10 13:32:24.000000000 +0300
+++ abcde-2.3.99.7/abcde.conf 2009-07-27 23:46:45.000000000 +0300
@@ -139,7 +139,7 @@
#DISTMP3=distmp3
#VORBISCOMMENT=vorbiscomment
#METAFLAC=metaflac
-#NORMALIZE=normalize-audio
+#NORMALIZE=normalize
#CDSPEED=eject
#VORBISGAIN=vorbisgain
#MKCUE=mkcue
@@ -271,7 +271,7 @@
#BATCHNORM=n
# Enables nogap encoding when using the 'lame' encoder.
-#NOGAP=n
+#NOGAP=y
# Set the playlist file location format. Uses the same variables and format
# as OUTPUTFORMAT. If the playlist is specified to be in a subdirectory, it
diff -up abcde-2.3.99.7/README~ abcde-2.3.99.7/README
--- abcde-2.3.99.7/README~ 2006-08-05 05:23:25.000000000 +0300
+++ abcde-2.3.99.7/README 2009-07-27 23:46:34.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.
abcde-2.3.99.7-speex-comment.patch:
abcde | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE abcde-2.3.99.7-speex-comment.patch ---
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.3.99.7-trackinfo.patch:
abcde | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE abcde-2.3.99.7-trackinfo.patch ---
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
}
abcde_2.3.99.7-1ubuntu1.diff:
abcde | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
--- NEW FILE abcde_2.3.99.7-1ubuntu1.diff ---
--- 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
@@ -3291,14 +3292,17 @@
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
@@ -3594,6 +3598,7 @@
FLACENCODER="$FLAC"
if [ "$DOREPLAYGAIN" = "y" ]; then
FLACENCODEROPTS="${FLACENCODEROPTS} --replay-gain"
+ fi
# FLAC streams can be encapsulated on a Ogg transport layer
if echo "$FLACENCODEROPTS" | egrep -- "(^| )--ogg($| )" > /dev/null 2>&1 ;then
log error "FLAC on an Ogg container is not yet supported"
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/abcde/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore 7 Aug 2006 21:10:25 -0000 1.10
+++ .cvsignore 27 Jul 2009 20:53:59 -0000 1.11
@@ -1 +1 @@
-abcde_2.3.99.6.orig.tar.gz
+abcde_2.3.99.7.orig.tar.gz
Index: abcde.spec
===================================================================
RCS file: /cvs/pkgs/rpms/abcde/devel/abcde.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- abcde.spec 24 Jul 2009 16:29:25 -0000 1.20
+++ abcde.spec 27 Jul 2009 20:53:59 -0000 1.21
@@ -1,21 +1,24 @@
Name: abcde
-Version: 2.3.99.6
-Release: 9
+Version: 2.3.99.7
+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
+# 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://www.hispalinux.es/~data/abcde.php
+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.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
+Patch0: %{name}-2.3.99.7-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
@@ -37,10 +40,8 @@ tags them, all in one go.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
+%patch3 -p0
%patch4 -p1
-sed -i -e 's/normalize-audio/normalize/g' abcde*
-sed -i -e 's/^#NOGAP$/#NOGAP=y/' abcde.conf
mv examples/cue2discid .
@@ -59,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc COPYING FAQ README TODO USEPIPES changelog examples/
+%doc COPYING FAQ KNOWN.BUGS README TODO USEPIPES changelog examples/
%config(noreplace) %{_sysconfdir}/abcde.conf
%{_bindir}/abcde
%{_bindir}/cddb-tool
@@ -69,6 +70,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Jul 27 2009 Ville Skyttä <ville.skytta at iki.fi> - 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 <rel-eng at lists.fedoraproject.org> - 2.3.99.6-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/abcde/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources 7 Aug 2006 21:10:25 -0000 1.10
+++ sources 27 Jul 2009 20:53:59 -0000 1.11
@@ -1 +1 @@
-ac9be20f3098b0943212168171d33ffa abcde_2.3.99.6.orig.tar.gz
+a0baa57edecf40c8423eac7e36d06882 abcde_2.3.99.7.orig.tar.gz
--- abcde-2.3.99.6-speex-comment.patch DELETED ---
--- abcde-2.3.99.6-usage.patch DELETED ---
--- abcde-2.3.99.6-wget111-441862.patch DELETED ---
--- abcde_2.3.99.6-1ubuntu2.patch DELETED ---
- Previous message (by thread): rpms/sylpheed/devel import.log,1.1,1.2 sylpheed.spec,1.100,1.101
- Next message (by thread): rpms/perl-Class-MOP/devel .cvsignore, 1.32, 1.33 perl-Class-MOP.spec, 1.38, 1.39 sources, 1.30, 1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list