From 808130bd3630be3cd8eec5a0a49bfbc7d22f3ab9 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Mar 13 2015 21:39:22 +0000
Subject: Apply upstream patch to fix metadata cover editing. Fixes bug #1199836


---

diff --git a/calibre-2.20.0-cover-metadata-edit.patch b/calibre-2.20.0-cover-metadata-edit.patch
new file mode 100644
index 0000000..e2f44e1
--- /dev/null
+++ b/calibre-2.20.0-cover-metadata-edit.patch
@@ -0,0 +1,28 @@
+From 72d47ba9377d70e786bf3d93b323544188c894bd Mon Sep 17 00:00:00 2001
+From: Kovid Goyal <kovid@kovidgoyal.net>
+Date: Thu, 5 Mar 2015 07:50:28 +0530
+Subject: [PATCH] =?UTF-8?q?Fix=20incompatibility=20with=20PyQt=205.4.1.=20?=
+ =?UTF-8?q?Fixes=20#1427684=20["TypeError:=20QPixmap():=20argument=201=20h?=
+ =?UTF-8?q?as=20unexpected=20type"=20=E2=80=93=20incompatibility=20with=20?=
+ =?UTF-8?q?Qt=205.4.1=3F](https://bugs.launchpad.net/calibre/+bug/1427684)?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ src/calibre/gui2/widgets.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/calibre/gui2/widgets.py b/src/calibre/gui2/widgets.py
+index 0e84267..ed40a97 100644
+--- a/src/calibre/gui2/widgets.py
++++ b/src/calibre/gui2/widgets.py
+@@ -295,7 +295,7 @@ class ImageView(QWidget, ImageDropMixin):  # {{{
+     def __init__(self, parent=None, show_size_pref_name=None, default_show_size=False):
+         QWidget.__init__(self, parent)
+         self.show_size_pref_name = ('show_size_on_cover_' + show_size_pref_name) if show_size_pref_name else None
+-        self._pixmap = QPixmap(self)
++        self._pixmap = QPixmap()
+         self.setMinimumSize(QSize(150, 200))
+         ImageDropMixin.__init__(self)
+         self.draw_border = True
diff --git a/calibre.spec b/calibre.spec
index 9d3e2c5..1d5052e 100644
--- a/calibre.spec
+++ b/calibre.spec
@@ -6,7 +6,7 @@
 
 Name:           calibre
 Version:        2.20.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        E-book converter and library manager
 Group:          Applications/Multimedia
 License:        GPLv3
@@ -24,7 +24,19 @@ Source0:        %{name}-%{version}-nofonts.tar.xz
 Source1:        generate-tarball.sh
 Source2:        calibre-mount-helper
 Source3:        calibre-gui.appdata.xml
+#
+# Disable auto update from inside the app
+#
 Patch1:         %{name}-no-update.patch
+#
+# 
+# Already upstream: fix cover metadata generation
+# https://github.com/kovidgoyal/calibre/commit/72d47ba9377d70e786bf3d93b323544188c894bd.patch
+Patch2:         calibre-2.20.0-cover-metadata-edit.patch
+#
+# Do not display multiple apps in desktop files, only the main app
+# This is so gnome-software only 'sees' calibre once. 
+# 
 Patch3:         calibre-nodisplay.patch
 
 BuildRequires:  python >= 2.6
@@ -110,6 +122,8 @@ RTF, TXT, PDF and LRS.
 
 # don't check for new upstream version (that's what packagers do)
 %patch1 -p1 -b .no-update
+# fix cover metadata editing
+%patch2 -p1
 # Hide individual launchers for ebook-edit, ebook-viewer and lrfviewer as they
 # are all accessible in the main calibre GUI.
 %patch3 -p1 -b .nodisplay
@@ -319,6 +333,9 @@ ln -s %{_jsdir}/mathjax %{_datadir}/%{name}/viewer/
 %{_datadir}/appdata/calibre*.appdata.xml
 
 %changelog
+* Fri Mar 13 2015 Kevin Fenzi <kevin@scrye.com> 2.20.0-2
+- Apply upstream patch to fix metadata cover editing. Fixes bug #1199836
+
 * Fri Feb 20 2015 Kevin Fenzi <kevin@scrye.com> 2.20.0-1
 - Update to 2.20.0