rpms/calibre/devel sources, 1.18, 1.19 .cvsignore, 1.18, 1.19 calibre.spec, 1.21, 1.22 calibre-no-update.patch, 1.3, 1.4

[Kevin Fenzi]

Author: kevin

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

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



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	29 May 2010 01:38:40 -0000	1.18
+++ sources	5 Jun 2010 06:22:38 -0000	1.19
@@ -1 +1 @@
-2b6e86c62c36034226902060f0c3c57a  calibre-0.6.55-nofonts.tar.bz2
+8000c2e11a5bb03e5da453a4d8cc2366  calibre-0.7.0-nofonts.tar.bz2


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- .cvsignore	29 May 2010 01:38:41 -0000	1.18
+++ .cvsignore	5 Jun 2010 06:22:39 -0000	1.19
@@ -1 +1 @@
-calibre-0.6.55-nofonts.tar.bz2
+calibre-0.7.0-nofonts.tar.bz2


Index: calibre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/calibre.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- calibre.spec	29 May 2010 01:32:24 -0000	1.21
+++ calibre.spec	5 Jun 2010 06:22:39 -0000	1.22
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           calibre
-Version:        0.6.55
+Version:        0.7.0
 Release:        1%{?dist}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
@@ -240,7 +240,6 @@ fi
 %{_bindir}/*
 %config(noreplace) %{_sysconfdir}/bash_completion.d/
 %{_libdir}/%{name}
-%{_prefix}/lib/udev/rules.d/*
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*
@@ -251,6 +250,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Fri Jun 04 2010 Kevin Fenzi <kevin at tummy.com> - 0.7.0-1
+- Update to 0.7.0
+
 * Fri May 28 2010 Kevin Fenzi <kevin at tummy.com> - 0.6.55-1
 - Update to 0.6.55
 

calibre-no-update.patch:
 ui.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: calibre-no-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/calibre-no-update.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- calibre-no-update.patch	6 Dec 2009 21:29:40 -0000	1.3
+++ calibre-no-update.patch	5 Jun 2010 06:22:39 -0000	1.4
@@ -1,20 +1,20 @@
-diff -up calibre/src/calibre/gui2/ui.py.no_update calibre/src/calibre/gui2/ui.py
---- calibre/src/calibre/gui2/ui.py.no_update	2009-12-06 23:21:12.298917664 +0200
-+++ calibre/src/calibre/gui2/ui.py	2009-12-06 23:21:18.054898861 +0200
-@@ -226,11 +226,11 @@ class Main(MainWindow, Ui_MainWindow, De
+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 = ' '
 -        if not opts.no_update_check:
 -            self.update_checker = CheckForUpdates(self)
--            QObject.connect(self.update_checker,
--                    SIGNAL('update_found(PyQt_PyObject)'), self.update_found)
--            self.update_checker.start(2000)
-+        # if not opts.no_update_check:
-+        #     self.update_checker = CheckForUpdates(self)
-+        #     QObject.connect(self.update_checker,
-+        #             SIGNAL('update_found(PyQt_PyObject)'), self.update_found)
-+        #     self.update_checker.start(2000)
+-            self.update_checker.update_found.connect(self.update_found,
+-                    type=Qt.QueuedConnection)
+-            self.update_checker.start()
++        #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 = StatusBar(self.jobs_dialog, self.system_tray_icon)
-         self.setStatusBar(self.status_bar)
+         self.status_bar.initialize(self.system_tray_icon)
+         self.status_bar.show_book_info.connect(self.show_book_info)