rpms/calibre/F-12 calibre-no-update.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 calibre.spec, 1.4, 1.5 sources, 1.5, 1.6

[Ionuț Arțăriși]

Author: mapleoin

Update of /cvs/pkgs/rpms/calibre/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18549

Modified Files:
	.cvsignore calibre.spec sources 
Added Files:
	calibre-no-update.patch 
Log Message:
* Wed Nov 18 2009 Ionuț C. Arțăriși <mapleoin at fedoraproject.org> - 0.6.24-1
- New upstream release: http://calibre.kovidgoyal.net/wiki/Changelog#Version0.6.2416Nov2009


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

--- NEW FILE calibre-no-update.patch ---
diff -up calibre/src/calibre/gui2/main.py.no_update calibre/src/calibre/gui2/main.py
--- calibre/src/calibre/gui2/main.py.no_update	2009-11-16 14:21:55.200387171 +0200
+++ calibre/src/calibre/gui2/main.py	2009-11-16 14:22:10.400510757 +0200
@@ -221,11 +221,11 @@ class Main(MainWindow, Ui_MainWindow, De
         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()
-            QObject.connect(self.update_checker,
-                    SIGNAL('update_found(PyQt_PyObject)'), self.update_found)
-            self.update_checker.start()
+        # if not opts.no_update_check:
+        #     self.update_checker = CheckForUpdates()
+        #     QObject.connect(self.update_checker,
+        #             SIGNAL('update_found(PyQt_PyObject)'), self.update_found)
+        #     self.update_checker.start()
         ####################### Status Bar #####################
         self.status_bar = StatusBar(self.jobs_dialog, self.system_tray_icon)
         self.setStatusBar(self.status_bar)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	7 Nov 2009 17:42:41 -0000	1.5
+++ .cvsignore	18 Nov 2009 13:03:41 -0000	1.6
@@ -1 +1 @@
-calibre-0.6.21-nofonts.tar.gz
+calibre-0.6.24-nofonts.tar.gz


Index: calibre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/F-12/calibre.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- calibre.spec	7 Nov 2009 17:47:32 -0000	1.4
+++ calibre.spec	18 Nov 2009 13:03:41 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           calibre
-Version:        0.6.21
-Release:        2%{?dist}
+Version:        0.6.24
+Release:        1%{?dist}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
 License:        GPLv3
@@ -18,6 +18,7 @@ Source0:        %{name}-%{version}-nofon
 Source1:        generate-tarball.sh
 Patch0:         %{name}-cssprofiles.patch
 Patch1:         %{name}-manpages.patch
+Patch2:         %{name}-no-update.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python >= 2.6
@@ -72,6 +73,9 @@ TXT, PDF and LRS.
 # don't append calibre1 to the name of the manpages. No need to compress either
 %patch1 -p1 -b .manpages
 
+# don't check for new upstream version (that's what packagers do)
+%patch2 -p1 -b .no-update
+
 # dos2unix newline conversion
 %{__sed} -i 's/\r//' src/calibre/web/feeds/recipes/*
 
@@ -239,8 +243,12 @@ fi
 %{_mandir}/man1/*
 
 %changelog
-* Sat Nov  7 2009 Ionuț C. Arțăriși <mapleoin at fedoraproject.org> - 0.6.21-2
-- fix a package tagging issue
+* Wed Nov 18 2009 Ionuț C. Arțăriși <mapleoin at fedoraproject.org> - 0.6.24-1
+- New upstream release: http://calibre.kovidgoyal.net/wiki/Changelog#Version0.6.2416Nov2009
+
+* Mon Nov 16 2009 Ionuț C. Arțăriși <mapleoin at fedoraproject.org> - 0.6.23-1
+- new upstream release: http://calibre.kovidgoyal.net/wiki/Changelog#Version0.6.2313Nov2009
+- patch to stop checking for new upstream version
 
 * Sat Nov  7 2009 Ionuț C. Arțăriși <mapleoin at fedoraproject.org> - 0.6.21-1
 - new upstream version: http://calibre.kovidgoyal.net/wiki/Changelog#Version0.6.2106Nov2009


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	7 Nov 2009 17:42:41 -0000	1.5
+++ sources	18 Nov 2009 13:03:41 -0000	1.6
@@ -1 +1 @@
-ecdd54dd92544dc417981b01b98b585f  calibre-0.6.21-nofonts.tar.gz
+54f25fb8062b9a119e217f816f7be4be  calibre-0.6.24-nofonts.tar.gz