From 6074d15a9639394dd94765c8be5f9b6eba58aa5a Mon Sep 17 00:00:00 2001
From: Christian Krause <chkr@fedoraproject.org>
Date: Jan 11 2011 22:14:20 +0000
Subject: - Fix crash on exit (BZ 559484, 642877, 651727)


---

diff --git a/calibre-no-update.patch b/calibre-no-update.patch
index 7f6cc97..5fe6e02 100644
--- a/calibre-no-update.patch
+++ b/calibre-no-update.patch
@@ -1,7 +1,19 @@
-diff -Nur calibre.orig/src/calibre/gui2/update.py calibre/src/calibre/gui2/update.py
---- calibre.orig/src/calibre/gui2/update.py	2010-06-21 19:38:04.000000000 -0600
-+++ calibre/src/calibre/gui2/update.py	2010-06-21 20:30:50.000000000 -0600
-@@ -39,12 +39,12 @@
+diff -uNr calibre.old/src/calibre/gui2/ui.py calibre/src/calibre/gui2/ui.py
+--- calibre.old/src/calibre/gui2/ui.py	2011-01-11 22:08:00.684511166 +0100
++++ calibre/src/calibre/gui2/ui.py	2011-01-11 22:11:34.522099663 +0100
+@@ -590,7 +590,7 @@
+         if write_settings:
+             self.write_settings()
+         self.check_messages_timer.stop()
+-        self.update_checker.terminate()
++        # self.update_checker.terminate()
+         self.listener.close()
+         self.job_manager.server.close()
+         while self.spare_servers:
+diff -uNr calibre.old/src/calibre/gui2/update.py calibre/src/calibre/gui2/update.py
+--- calibre.old/src/calibre/gui2/update.py	2011-01-11 22:08:00.684511166 +0100
++++ calibre/src/calibre/gui2/update.py	2011-01-11 22:11:16.678301138 +0100
+@@ -87,12 +87,12 @@
  
  class UpdateMixin(object):
  
diff --git a/calibre.spec b/calibre.spec
index 19c1ddb..9879552 100644
--- a/calibre.spec
+++ b/calibre.spec
@@ -2,7 +2,7 @@
 
 Name:           calibre
 Version:        0.7.38
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
 License:        GPLv3
@@ -271,6 +271,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man1/*
 
 %changelog
+* Tue Jan 11 2011 Christian Krause <chkr@fedoraproject.org> - 0.7.38-3
+- Fix crash on exit (BZ 559484, 642877, 651727)
+
 * Mon Jan 10 2011 Christian Krause <chkr@fedoraproject.org> - 0.7.38-2
 - Remove obsolete BuildRoot tag and %%clean section
 - Require font packages which contain files which are symlinked