[SCM] morituri/master: * morituri.spec.in: Spec fix. * morituri/image/image.py: Log fix.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e617d40b47d58175c4a4205a3ed71bec4ebf8781
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Sat Jan 21 18:04:00 2012 +0000

    	* morituri.spec.in:
    	  Spec fix.
    	* morituri/image/image.py:
    	  Log fix.

diff --git a/ChangeLog b/ChangeLog
index 86de363..787a91e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-01-21  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* morituri.spec.in:
+	  Spec fix.
+	* morituri/image/image.py:
+	  Log fix.
+
 2011-10-29  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* morituri/rip/debug.py:
diff --git a/morituri.spec.in b/morituri.spec.in
index 45ed48c..45132a5 100644
--- a/morituri.spec.in
+++ b/morituri.spec.in
@@ -50,7 +50,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/rip
 %{_mandir}/man1/rip.1*
 %{python_sitelib}/morituri
-%{_sysconfdir}/bash_completion.d/rip
+%{_sysconfdir}/bash_completion.d/
 
 %changelog
 * Sun Jan 09 2011 Thomas Vander Stichele <thomas at apestaart dot org>
diff --git a/morituri/image/image.py b/morituri/image/image.py
index 55ee354..fa19c76 100644
--- a/morituri/image/image.py
+++ b/morituri/image/image.py
@@ -155,7 +155,7 @@ class AudioLengthTask(log.Loggable, gstreamer.GstPipelineTask):
         assert type(path) is unicode, "%r is not unicode" % path
 
         self._path = path
-        self.logName = os.path.basename(path)
+        self.logName = os.path.basename(path).encode('utf-8')
 
     def getPipelineDesc(self):
         return '''

-- 
morituri packaging