rpms/audio-convert-mod/F-11 acm-ape-notags.patch, NONE, 1.1 audio-convert-mod.spec, 1.14, 1.15

[Stewart Adam]

Author: firewing

Update of /cvs/pkgs/rpms/audio-convert-mod/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21809/F-11

Modified Files:
	audio-convert-mod.spec 
Added Files:
	acm-ape-notags.patch 
Log Message:
* Sat Jan 30 2010 Stewart Adam <s.adam at diffingo.com> 3.46.0b-2
- Add patch to fix traceback when APE file has no metadata
- Fix release portion of previous changelog entry


acm-ape-notags.patch:
 formats.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE acm-ape-notags.patch ---
--- formats.py
+++ formats.py
@@ -430,7 +430,10 @@ class ape:
 
   def getTags(self, filename):
     """Retrieves the metadata from filename"""
-    audiotags = APEv2(filename)
+    try:
+      audiotags = APEv2(filename)
+    except:
+      audiotags = {}
     return getTrackInfo(audiotags)
     
   def setTags(self, filename, tags):


Index: audio-convert-mod.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audio-convert-mod/F-11/audio-convert-mod.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- audio-convert-mod.spec	14 Dec 2009 15:49:08 -0000	1.14
+++ audio-convert-mod.spec	31 Jan 2010 00:39:12 -0000	1.15
@@ -1,12 +1,13 @@
 Name:              audio-convert-mod
 Version:           3.46.0b
-Release:           1%{?dist}
+Release:           2%{?dist}
 BuildArch:         noarch
 Summary:           A simple audio file converter that supports many formats
 Group:             Applications/Multimedia
 License:           GPLv2+
 URL:               http://www.diffingo.com/oss/audio-convert-mod
 Source0:           http://downloads.diffingo.com/audio-convert-mod/audio-convert-mod-%{version}.tar.bz2
+Patch0:            acm-ape-notags.patch
 BuildRoot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:     desktop-file-utils
@@ -34,8 +35,12 @@ conversion is also supported. File tags/
 
 %prep
 %setup -q
+pushd src/audio_convert_mod
+%patch0 -p0 -b .apetag
+popd
 
 %build
+
 %configure
 make
 
@@ -65,7 +70,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sun Dec 13 2009 Stewart Adam <s.adam at diffingo.com> 3.46.0b
+* Sat Jan 30 2010 Stewart Adam <s.adam at diffingo.com> 3.46.0b-2
+- Add patch to fix traceback when APE file has no metadata
+- Fix release portion of previous changelog entry
+
+* Sun Dec 13 2009 Stewart Adam <s.adam at diffingo.com> 3.46.0b-1
 - Update to 3.46.0b (see ChangeLog for details on version changes)
 
 * Fri Aug 14 2009 Stewart Adam <s.adam at diffingo.com> - 3.46.0a-1