[soundconverter] Merge upstream fix for batch mode running into non-URI files

[Michael Schwendt]

commit cf36b9eb3709215b92df26bdb6fe6441ddddec41
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Fri Feb 22 19:54:49 2013 +0100

    Merge upstream fix for batch mode running into non-URI files
    
      (lp #1128080).

 soundconverter-2.0.4-fedora.patch |   29 +++++++++++++++++++++++------
 soundconverter.spec               |    9 +++++++--
 2 files changed, 30 insertions(+), 8 deletions(-)
---
diff --git a/soundconverter-2.0.4-fedora.patch b/soundconverter-2.0.4-fedora.patch
index a4983fc..8a973ad 100644
--- a/soundconverter-2.0.4-fedora.patch
+++ b/soundconverter-2.0.4-fedora.patch
@@ -1,6 +1,6 @@
-diff -Nur soundconverter-2.0.4-orig/soundconverter/error.py soundconverter-2.0.4-fedora/soundconverter/error.py
+diff -Nur soundconverter-2.0.4-orig/soundconverter/error.py soundconverter-2.0.4/soundconverter/error.py
 --- soundconverter-2.0.4-orig/soundconverter/error.py	2012-01-04 00:23:34.000000000 +0100
-+++ soundconverter-2.0.4-fedora/soundconverter/error.py	2013-02-18 08:01:37.000000000 +0100
++++ soundconverter-2.0.4/soundconverter/error.py	2013-02-22 19:48:49.519003871 +0100
 @@ -60,7 +60,10 @@
  class ErrorPrinter:
  
@@ -13,9 +13,26 @@ diff -Nur soundconverter-2.0.4-orig/soundconverter/error.py soundconverter-2.0.4
          sys.exit(1)
  
      def show_exception(self, e):
-diff -Nur soundconverter-2.0.4-orig/soundconverter/gstreamer.py soundconverter-2.0.4-fedora/soundconverter/gstreamer.py
+diff -Nur soundconverter-2.0.4-orig/soundconverter/fileoperations.py soundconverter-2.0.4/soundconverter/fileoperations.py
+--- soundconverter-2.0.4-orig/soundconverter/fileoperations.py	2012-01-04 00:23:34.000000000 +0100
++++ soundconverter-2.0.4/soundconverter/fileoperations.py	2013-02-22 19:50:33.632351950 +0100
+@@ -109,10 +109,10 @@
+     """Convert a filename to a valid uri.
+     Filename can be a relative or absolute path, or an uri.
+     """
+-    url = urlparse.urlparse(filename)
+-    if not url[0]:
++    if '://' not in filename:
++        # convert local filename to uri
+         filename = urllib.pathname2url(os.path.abspath(filename))
+-        filename = str(gnomevfs.URI(filename))
++    filename = str(gnomevfs.URI(filename))
+     return filename
+ 
+ 
+diff -Nur soundconverter-2.0.4-orig/soundconverter/gstreamer.py soundconverter-2.0.4/soundconverter/gstreamer.py
 --- soundconverter-2.0.4-orig/soundconverter/gstreamer.py	2012-10-04 13:56:26.000000000 +0200
-+++ soundconverter-2.0.4-fedora/soundconverter/gstreamer.py	2013-02-18 08:04:19.943404728 +0100
++++ soundconverter-2.0.4/soundconverter/gstreamer.py	2013-02-22 19:48:49.519003871 +0100
 @@ -181,13 +181,16 @@
              gst.update_registry()
              self.parsed = False
@@ -97,9 +114,9 @@ diff -Nur soundconverter-2.0.4-orig/soundconverter/gstreamer.py soundconverter-2
                  return
  
          self.add_command('%s location="%s"' % (
-diff -Nur soundconverter-2.0.4-orig/soundconverter/ui.py soundconverter-2.0.4-fedora/soundconverter/ui.py
+diff -Nur soundconverter-2.0.4-orig/soundconverter/ui.py soundconverter-2.0.4/soundconverter/ui.py
 --- soundconverter-2.0.4-orig/soundconverter/ui.py	2012-10-06 12:43:23.000000000 +0200
-+++ soundconverter-2.0.4-fedora/soundconverter/ui.py	2013-02-18 08:06:24.814656593 +0100
++++ soundconverter-2.0.4/soundconverter/ui.py	2013-02-22 19:48:49.521003732 +0100
 @@ -93,7 +93,10 @@
      def show_error(self, primary, secondary):
          self.primary.set_markup(primary)
diff --git a/soundconverter.spec b/soundconverter.spec
index a925508..bf2b00d 100644
--- a/soundconverter.spec
+++ b/soundconverter.spec
@@ -2,7 +2,7 @@
 
 Name:           soundconverter
 Version:        2.0.4
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        Simple sound converter application for GNOME
 
 Group:          Applications/Multimedia
@@ -36,6 +36,7 @@ BuildArch:      noarch
 #     soundconverter-2.0.4-drag-data-received-warning.patch
 # applied, lp #1123519
 #     soundconverter-2.0.4-remove-treesortedmodel.patch
+# lp 1128080 - 2.0.4 batch mode / TypeError: could not parse URI 
 Patch0: soundconverter-2.0.4-fedora.patch
 
 BuildRequires:  desktop-file-utils
@@ -129,9 +130,13 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Fri Feb 22 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 2.0.4-18
+- Merge upstream fix for batch mode running into non-URI files
+  (lp #1128080).
+
 * Mon Feb 18 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 2.0.4-17
 - Add more fixes for success/failure of GStreamer plug-in installation,
-  which makes it possible to fix the idle callback race betwen reading of
+  which makes it possible to fix the idle callback race between reading of
   tags and start of conversion.
 - Merge all applied patches into a single file to avoid incremental
   patching in places where 2.0.5-pre currently differs a lot but fails.