kevin pushed to calibre (f21). "Update to 2.22.0"

[notifications at fedoraproject.org]

>From e0ff4e1aedba97eee836e68d3fa056cb16799e12 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin at scrye.com>
Date: Sat, 21 Mar 2015 11:38:35 -0600
Subject: Update to 2.22.0


diff --git a/.gitignore b/.gitignore
index 50603a4..f3c0e11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -196,3 +196,4 @@ calibre-0.7.14-nofonts.tar.xz
 /calibre-2.16.0-nofonts.tar.xz
 /calibre-2.17.0-nofonts.tar.xz
 /calibre-2.20.0-nofonts.tar.xz
+/calibre-2.22.0-nofonts.tar.xz
diff --git a/calibre-2.20.0-cover-metadata-edit.patch b/calibre-2.20.0-cover-metadata-edit.patch
deleted file mode 100644
index e2f44e1..0000000
--- a/calibre-2.20.0-cover-metadata-edit.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 72d47ba9377d70e786bf3d93b323544188c894bd Mon Sep 17 00:00:00 2001
-From: Kovid Goyal <kovid at 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 1d5052e..6513063 100644
--- a/calibre.spec
+++ b/calibre.spec
@@ -5,8 +5,8 @@
 %global __provides_exclude_from ^%{_libdir}/%{name}/%{name}/plugins/.*\.so$
 
 Name:           calibre
-Version:        2.20.0
-Release:        2%{?dist}
+Version:        2.22.0
+Release:        1%{?dist}
 Summary:        E-book converter and library manager
 Group:          Applications/Multimedia
 License:        GPLv3
@@ -29,11 +29,6 @@ Source3:        calibre-gui.appdata.xml
 #
 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. 
 # 
@@ -122,8 +117,6 @@ 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
@@ -333,6 +326,9 @@ ln -s %{_jsdir}/mathjax %{_datadir}/%{name}/viewer/
 %{_datadir}/appdata/calibre*.appdata.xml
 
 %changelog
+* Sat Mar 21 2015 Kevin Fenzi <kevin at scrye.com> 2.22.0-1
+- Update to 2.22.0
+
 * Fri Mar 13 2015 Kevin Fenzi <kevin at scrye.com> 2.20.0-2
 - Apply upstream patch to fix metadata cover editing. Fixes bug #1199836
 
diff --git a/sources b/sources
index 6b8a5e2..696e01f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9e47486100cc339f8e11f665192761e8  calibre-2.20.0-nofonts.tar.xz
+b69546f1bb4eaaa6d55eaa1001b00d42  calibre-2.22.0-nofonts.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/calibre.git/commit/?h=f21&id=e0ff4e1aedba97eee836e68d3fa056cb16799e12