rpms/audio-convert-mod/F-9 audio-convert-mod-3.45.4-lame.patch, NONE, 1.1 audio-convert-mod.spec, 1.7, 1.8

[Stewart Adam]

Author: firewing

Update of /cvs/extras/rpms/audio-convert-mod/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22055/F-9

Modified Files:
	audio-convert-mod.spec 
Added Files:
	audio-convert-mod-3.45.4-lame.patch 
Log Message:
Fix lame decoder


audio-convert-mod-3.45.4-lame.patch:

--- NEW FILE audio-convert-mod-3.45.4-lame.patch ---
--- src/audio_convert_mod/formats.py.orig	2008-12-13 15:10:19.000000000 -0500
+++ src/audio_convert_mod/formats.py	2008-12-13 15:10:53.000000000 -0500
@@ -121,9 +121,9 @@
     """ Decodes a MP3 file """
     newname = getNewExt('wav', filename)
     if MSWINDOWS:
-      command = 'lame.exe --decode --mp3input "%(a)s" "%(b)s" -- 2>&1 | awk.exe -vRS="\\r" -F"[ /]+" "(NR>2){print $2/$3;fflush();}"' % {'a': filename, 'b': newname}
+      command = 'lame.exe --decode --mp3input "%(a)s" "%(b)s" 2>&1 | awk.exe -vRS="\\r" -F"[ /]+" "(NR>2){print $2/$3;fflush();}"' % {'a': filename, 'b': newname}
     else:
-      command = "lame --decode --mp3input '%(a)s' '%(b)s' -- 2>&1 | awk -vRS='\\r' -F'[ /]+' '(NR>2){print $2/$3;fflush();}'" % {'a': filename, 'b': newname}
+      command = "lame --decode --mp3input '%(a)s' '%(b)s' 2>&1 | awk -vRS='\\r' -F'[ /]+' '(NR>2){print $2/$3;fflush();}'" % {'a': filename, 'b': newname}
     sub = subprocess.Popen(command, shell=True, env=environ, stderr=subprocess.PIPE, stdout=subprocess.PIPE, stdin=subprocess.PIPE)
     return sub, command
 


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/audio-convert-mod/F-9/audio-convert-mod.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- audio-convert-mod.spec	13 May 2008 21:00:15 -0000	1.7
+++ audio-convert-mod.spec	13 Dec 2008 20:34:44 -0000	1.8
@@ -5,7 +5,7 @@
 Name:              audio-convert-mod
 # can't use 3.45.3 for non-testing releases: 3.45.3beta > 3.45.3
 Version:           3.45.4
-Release:           1%{?dist}
+Release:           2%{?dist}
 #Release:           0.1.%{pretag}%{?dist}
 BuildArch:         noarch
 Summary:           A simple audio file converter supporting many formats
@@ -13,6 +13,7 @@
 License:           GPLv2+
 URL:               http://www.diffingo.com/content/view/13/47/lang,en/
 Source0:           http://www.diffingo.com/downloads/audio-convert-mod/audio-convert-mod-%{version}.tar.gz
+Patch0:            audio-convert-mod-3.45.4-lame.patch
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     desktop-file-utils
@@ -35,9 +36,7 @@
 %setup -q
 #setup -q -n %{name}-%{version}%{pretag}
 
-#pushd src
-#patch0 -p0 -b .patch0
-#popd
+%patch0 -b .lame
 
 %build
 %configure
@@ -61,14 +60,17 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS INSTALL README TODO
 %{_bindir}/*
 %{_datadir}/%{name}/
 %{_datadir}/applications/fedora-*.desktop
 %{python_sitelib}/%{pythonname}/
 
-%doc AUTHORS ChangeLog COPYING NEWS INSTALL README TODO
 
 %changelog
+* Sat Dec 13 2008 Steart Adam <s.adam at diffingo.com> 3.45.4-2
+- Add patch for fixing lame decode
+
 * Sun May 11 2008 Stewart Adam <s.adam at diffingo.com> 3.45.4-1
 - Update to 3.45.4 (see CHANGELOG file for details on version changes)