[soundconverter] - Fix target folder for artist/album creation when the source files are stored in subdirectories (

[Michael Schwendt]

commit 1a6319c5dbcbfffb4dcdc5996370b814632c6256
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Wed Nov 17 09:15:28 2010 +0100

    - Fix target folder for artist/album creation when the source files are
      stored in subdirectories (#654045).

 soundconverter-1.5.3-artist-albums.patch |   17 +++++++++++++++++
 soundconverter.spec                      |    9 ++++++++-
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/soundconverter-1.5.3-artist-albums.patch b/soundconverter-1.5.3-artist-albums.patch
new file mode 100644
index 0000000..8469b48
--- /dev/null
+++ b/soundconverter-1.5.3-artist-albums.patch
@@ -0,0 +1,17 @@
+diff -Nur soundconverter-1.5.3-orig/src/soundconverter.py soundconverter-1.5.3/src/soundconverter.py
+--- soundconverter-1.5.3-orig/src/soundconverter.py	2010-06-16 22:49:49.000000000 +0200
++++ soundconverter-1.5.3/src/soundconverter.py	2010-11-17 09:07:29.232485414 +0100
+@@ -633,11 +633,11 @@
+ 			result = s
+ 
+ 		if self.folder is None:
+-			folder = root
++			folder = os.path.join(root, basefolder)
+ 		else:
+ 			folder = urllib.quote(self.folder, '/:')
+ 
+-		result = os.path.join(folder, basefolder, urllib.quote(result))
++		result = os.path.join(folder, urllib.quote(result))
+ 
+ 		return result
+ 
diff --git a/soundconverter.spec b/soundconverter.spec
index f786266..e8ed615 100644
--- a/soundconverter.spec
+++ b/soundconverter.spec
@@ -1,6 +1,6 @@
 Name:           soundconverter
 Version:        1.5.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Simple sound converter application for GNOME
 
 Group:          Applications/Multimedia
@@ -19,6 +19,8 @@ BuildRequires:  gnome-python2-gnome
 Patch0: soundconverter-1.5.3-bz647336.patch
 # reported upstream, #017426
 Patch1: soundconverter-1.5.3-target-folder-is-uri.patch
+# bz #654045
+Patch2: soundconverter-1.5.3-artist-albums.patch
 
 # version 2.10 is old enough not to need an explicit version here
 Requires:       pygtk2
@@ -39,6 +41,7 @@ writes anything the GStreamer library can.
 %setup -q
 %patch0 -p1 -b .bz647336
 %patch1 -p1 -b .target-folder-is-uri
+%patch2 -p1 -b .artist-albums
 
 
 %build
@@ -92,6 +95,10 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Wed Nov 17 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.3-4
+- Fix target folder for artist/album creation when the source files are
+  stored in subdirectories (#654045).
+
 * Tue Nov 16 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.3-3
 - Remove urllib.quote call for target folder URI, so e.g. space characters
   don't lead to creating a new unescaped target folder.