added patch

- added patch from github which should be included in ver. 1.3.2
  "Fixed tags from filename dialog no opening on fresh install"
  fixes PICARD-681

diff --git a/e53fb11e61021b5dea33165842abb93b4da28af5.patch b/e53fb11e61021b5dea33165842abb93b4da28af5.patch
new file mode 100644 (file)
index 0000000..1eb0c09
--- /dev/null
+++ b/e53fb11e61021b5dea33165842abb93b4da28af5.patch
@@ -0,0 +1,34 @@
+From e53fb11e61021b5dea33165842abb93b4da28af5 Mon Sep 17 00:00:00 2001
+From: Philipp Wolfer <ph.wolfer@gmail.com>
+Date: Wed, 31 Dec 2014 13:33:01 +0100
+Subject: [PATCH] Fixed tags from filename dialog no opening on fresh install.
+
+An exception was thrown when tags_from_filenames_format was not set or empty.
+
+Fixes PICARD-681
+---
+ picard/ui/tagsfromfilenames.py | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/picard/ui/tagsfromfilenames.py b/picard/ui/tagsfromfilenames.py
+index 7d5ee4b..34bb3d4 100644
+--- a/picard/ui/tagsfromfilenames.py
++++ b/picard/ui/tagsfromfilenames.py
+@@ -49,10 +49,14 @@ def __init__(self, files, parent=None):
+             "%artist% - %album%/%tracknumber% - %title%",
+         ]
+         format = config.persist["tags_from_filenames_format"]
+-        if format and format not in items:
+-            items.insert(0, format)
++        if format not in items:
++            selected_index = 0
++            if format:
++                items.insert(0, format)
++        else:
++            selected_index = items.index(format)
+         self.ui.format.addItems(items)
+-        self.ui.format.setCurrentIndex(items.index(format))
++        self.ui.format.setCurrentIndex(selected_index)
+         self.ui.buttonbox.addButton(StandardButton(StandardButton.OK), QtGui.QDialogButtonBox.AcceptRole)
+         self.ui.buttonbox.addButton(StandardButton(StandardButton.CANCEL), QtGui.QDialogButtonBox.RejectRole)
+         self.ui.buttonbox.accepted.connect(self.accept)

diff --git a/picard.spec b/picard.spec
index 55c226f3b8df7360623127d14dcc623551e4c9b5..0c6707b218d47f4015e826d873f131bb15bf3677 100644 (file)
--- a/picard.spec
+++ b/picard.spec
@@ -8,6 +8,7 @@ Group:          Applications
 Source0:       ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/%{name}-%{version}.tar.gz
 # Source0-md5: 2c155a0c4a5589c18bac3016365d7fbd
 Patch0:                %{name}-desktop.patch
+Patch1:                e53fb11e61021b5dea33165842abb93b4da28af5.patch
 URL:           http://musicbrainz.org/doc/PicardTagger
 BuildRequires: gettext-tools
 BuildRequires: libstdc++-devel
@@ -41,6 +42,7 @@ pod Windows jak i Linuksem. Niedługo zostanie dodana obsługa Mac OS X.
 %prep
 %setup -q -n %{name}-release-%{version}
 %patch0 -p1
+%patch1 -p1
 
 find -type f | xargs sed -i -e 's|#!.*python.*|#!%{_bindir}/python|g'