rpms/calibre/devel sources, 1.20, 1.21 .cvsignore, 1.20, 1.21 calibre.spec, 1.24, 1.25 calibre-no-update.patch, 1.4, 1.5

[Kevin Fenzi]

Author: kevin

Update of /cvs/pkgs/rpms/calibre/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32767

Modified Files:
	sources .cvsignore calibre.spec calibre-no-update.patch 
Log Message:
Update to 0.7.4



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	7 Jun 2010 18:12:49 -0000	1.20
+++ sources	22 Jun 2010 03:04:04 -0000	1.21
@@ -1 +1 @@
-e15f9beccec5c8c7605bd6d7ba44f21a  calibre-0.7.1-nofonts.tar.bz2
+a4e4cd2d5dc3fb235d042195446f0d2c  calibre-0.7.4-nofonts.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	7 Jun 2010 18:12:49 -0000	1.20
+++ .cvsignore	22 Jun 2010 03:04:04 -0000	1.21
@@ -1 +1 @@
-calibre-0.7.1-nofonts.tar.bz2
+calibre-0.7.4-nofonts.tar.bz2


Index: calibre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/calibre.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- calibre.spec	8 Jun 2010 12:18:17 -0000	1.24
+++ calibre.spec	22 Jun 2010 03:04:05 -0000	1.25
@@ -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 at tummy.com> - 0.7.4-1
+- Update to 0.7.4
+
 * Tue Jun 08 2010 Dan Horák <dan at danny.cz> - 0.7.1-2
 - rebuilt with podofo 0.8.1
 

calibre-no-update.patch:
 update.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Index: calibre-no-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/calibre-no-update.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- calibre-no-update.patch	5 Jun 2010 06:22:39 -0000	1.4
+++ calibre-no-update.patch	22 Jun 2010 03:04:05 -0000	1.5
@@ -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'