packages: calibre/calibre-no-update.patch, calibre/calibre.spec - up to 0.7...

[lisu]

Author: lisu                         Date: Wed Jun 23 10:39:11 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.7.4
- still problem with installation

---- Files affected:
packages/calibre:
   calibre-no-update.patch (1.3 -> 1.4) , calibre.spec (1.28 -> 1.29) 

---- Diffs:

================================================================
Index: packages/calibre/calibre-no-update.patch
diff -u packages/calibre/calibre-no-update.patch:1.3 packages/calibre/calibre-no-update.patch:1.4
--- packages/calibre/calibre-no-update.patch:1.3	Fri Jun 18 11:49:15 2010
+++ packages/calibre/calibre-no-update.patch	Wed Jun 23 12:39:05 2010
@@ -1,9 +1,9 @@
---- calibre/src/calibre/gui2/ui.py~	2010-06-12 00:28:24.000000000 +0200
-+++ calibre/src/calibre/gui2/ui.py	2010-06-18 11:35:45.509704767 +0200
-@@ -248,11 +248,11 @@
-         self.latest_version = ' '
-         self.vanity.setText(self.vanity_template%dict(version=' ', device=' '))
-         self.device_info = ' '
+--- calibre/src/calibre/gui2/update.py~	2010-06-20 02:32:33.000000000 +0200
++++ calibre/src/calibre/gui2/update.py	2010-06-23 12:36:15.515849515 +0200
+@@ -40,11 +40,11 @@
+ 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,
@@ -15,5 +15,5 @@
 +        #            type=Qt.QueuedConnection)
 +        #    self.update_checker.start()
  
-         ####################### Status Bar #####################
-         self.status_bar.initialize(self.system_tray_icon)
+     def update_found(self, version):
+         os = 'windows' if iswindows else 'osx' if isosx else 'linux'

================================================================
Index: packages/calibre/calibre.spec
diff -u packages/calibre/calibre.spec:1.28 packages/calibre/calibre.spec:1.29
--- packages/calibre/calibre.spec:1.28	Mon Jun 21 15:38:14 2010
+++ packages/calibre/calibre.spec	Wed Jun 23 12:39:05 2010
@@ -12,12 +12,12 @@
 Summary:	E-book converter and library management
 Summary(pl.UTF-8):	Konwerter oraz biblioteka dla e-booków
 Name:		calibre
-Version:	0.7.2
+Version:	0.7.4
 Release:	0.1
 License:	GPL v3+
 Group:		Applications/Multimedia
 Source0:	%{name}-%{version}-nofonts.tar.bz2
-# Source0-md5:	af8d4d574cb452952c0360bc9eb6c238
+# Source0-md5:	0536ec3969f5fd4b8e10b200ff0d7585
 Source1:	generate-tarball.sh
 Patch0:		%{name}-prefix.patch
 Patch1:		%{name}-manpages.patch
@@ -154,6 +154,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2010/06/23 10:39:05  lisu
+- up to 0.7.4
+- still problem with installation
+
 Revision 1.28  2010/06/21 13:38:14  lisu
 - more TODO
 - rel 0.1 (can't be installed properly)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/calibre/calibre-no-update.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/calibre/calibre.spec?r1=1.28&r2=1.29&f=u