From 3e00138cabba033c7031db578c5337ee726faf6c Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@fedoraproject.org>
Date: Jun 22 2010 03:04:05 +0000
Subject: Update to 0.7.4


---

diff --git a/.cvsignore b/.cvsignore
index 176e567..cb75466 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-calibre-0.7.1-nofonts.tar.bz2
+calibre-0.7.4-nofonts.tar.bz2
diff --git a/calibre-no-update.patch b/calibre-no-update.patch
index ed7836b..7f6cc97 100644
--- a/calibre-no-update.patch
+++ b/calibre-no-update.patch
@@ -1,20 +1,22 @@
-diff -Nur calibre.orig/src/calibre/gui2/ui.py calibre/src/calibre/gui2/ui.py
---- calibre.orig/src/calibre/gui2/ui.py	2010-06-04 22:57:49.000000000 -0600
-+++ calibre/src/calibre/gui2/ui.py	2010-06-04 22:59:59.000000000 -0600
-@@ -265,11 +265,11 @@
-         self.latest_version = ' '
-         self.vanity.setText(self.vanity_template%dict(version=' ', device=' '))
-         self.device_info = ' '
+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 @@
+ 
+ class UpdateMixin(object):
+ 
+-    def __init__(self, opts):
 -        if not opts.no_update_check:
 -            self.update_checker = CheckForUpdates(self)
 -            self.update_checker.update_found.connect(self.update_found,
 -                    type=Qt.QueuedConnection)
 -            self.update_checker.start()
++    #def __init__(self, opts):
 +        #if not opts.no_update_check:
 +        #    self.update_checker = CheckForUpdates(self)
 +        #    self.update_checker.update_found.connect(self.update_found,
 +        #            type=Qt.QueuedConnection)
 +        #    self.update_checker.start()
-         ####################### Status Bar #####################
-         self.status_bar.initialize(self.system_tray_icon)
-         self.status_bar.show_book_info.connect(self.show_book_info)
+ 
+     def update_found(self, version):
+         os = 'windows' if iswindows else 'osx' if isosx else 'linux'
diff --git a/calibre.spec b/calibre.spec
index a1eb93b..5ccac4d 100644
--- a/calibre.spec
+++ b/calibre.spec
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           calibre
-Version:        0.7.1
-Release:        2%{?dist}
+Version:        0.7.4
+Release:        1%{?dist}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
 License:        GPLv3
@@ -250,6 +250,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Sun Jun 20 2010 Kevin Fenzi <kevin@tummy.com> - 0.7.4-1
+- Update to 0.7.4
+
 * Tue Jun 08 2010 Dan Horák <dan@danny.cz> - 0.7.1-2
 - rebuilt with podofo 0.8.1
 
diff --git a/sources b/sources
index 4173e30..88c27c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e15f9beccec5c8c7605bd6d7ba44f21a  calibre-0.7.1-nofonts.tar.bz2
+a4e4cd2d5dc3fb235d042195446f0d2c  calibre-0.7.4-nofonts.tar.bz2