rpms/calibre/devel .cvsignore, 1.5, 1.6 calibre-no-update.patch, 1.1, 1.2 calibre.spec, 1.5, 1.6 sources, 1.5, 1.6

[Ionuț Arțăriși]

Author: mapleoin

Update of /cvs/pkgs/rpms/calibre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6245

Modified Files:
	.cvsignore calibre-no-update.patch calibre.spec sources 
Log Message:
- new upstream release: 0.6.25



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	18 Nov 2009 12:26:33 -0000	1.5
+++ .cvsignore	2 Dec 2009 09:42:17 -0000	1.6
@@ -1 +1 @@
-calibre-0.6.24-nofonts.tar.gz
+calibre-0.6.25-nofonts.tar.gz

calibre-no-update.patch:
 main.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.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- calibre-no-update.patch	18 Nov 2009 12:26:33 -0000	1.1
+++ calibre-no-update.patch	2 Dec 2009 09:42:17 -0000	1.2
@@ -1,20 +1,20 @@
 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
+--- calibre/src/calibre/gui2/main.py.no_update	2009-12-02 11:16:14.357372471 +0200
++++ calibre/src/calibre/gui2/main.py	2009-12-02 11:17:30.421373426 +0200
+@@ -220,11 +220,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()
+-            self.update_checker = CheckForUpdates(self)
 -            QObject.connect(self.update_checker,
 -                    SIGNAL('update_found(PyQt_PyObject)'), self.update_found)
--            self.update_checker.start()
+-            self.update_checker.start(2000)
 +        # if not opts.no_update_check:
-+        #     self.update_checker = CheckForUpdates()
++        #     self.update_checker = CheckForUpdates(self)
 +        #     QObject.connect(self.update_checker,
 +        #             SIGNAL('update_found(PyQt_PyObject)'), self.update_found)
-+        #     self.update_checker.start()
++        #     self.update_checker.start(2000)
          ####################### Status Bar #####################
          self.status_bar = StatusBar(self.jobs_dialog, self.system_tray_icon)
          self.setStatusBar(self.status_bar)


Index: calibre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/calibre.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- calibre.spec	24 Nov 2009 22:16:26 -0000	1.5
+++ calibre.spec	2 Dec 2009 09:42:17 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           calibre
-Version:        0.6.24
-Release:        2%{?dist}
+Version:        0.6.25
+Release:        1%{?dist}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
 License:        GPLv3
@@ -165,13 +165,16 @@ rm -rf %{buildroot}%{_libdir}/%{name}/ca
 rm -rf %{buildroot}%{_libdir}/%{name}/cal/trac
 
 # link to system fonts after we have deleted (see Source0) the non-free ones
+# http://bugs.calibre-ebook.com/ticket/3832
 ln -s %{_datadir}/fonts/liberation/LiberationSans-Regular.ttf \
       %{buildroot}%{_datadir}/%{name}/fonts/prs500/tt0003m_.ttf
 ln -s %{_datadir}/fonts/liberation/LiberationSerif-Regular.ttf \
       %{buildroot}%{_datadir}/%{name}/fonts/prs500/tt0011m_.ttf
 ln -s %{_datadir}/fonts/liberation/LiberationMono-Regular.ttf \
       %{buildroot}%{_datadir}/%{name}/fonts/prs500/tt0419m_.ttf
-      
+
+# http://bugs.calibre-ebook.com/ticket/3770#comment:7
+
 # man pages
 mv %{buildroot}%{_datadir}/%{name}/man %{buildroot}%{_mandir}
 
@@ -243,8 +246,8 @@ fi
 %{_mandir}/man1/*
 
 %changelog
-* Tue Nov 24 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.6.24-2
-- Rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI)
+* Wed Dec  2 2009 Ionuț C. Arțăriși <mapleoin at fedoraproject.org> - 0.6.25-1
+- New upstream release
 
 * 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	18 Nov 2009 12:26:33 -0000	1.5
+++ sources	2 Dec 2009 09:42:17 -0000	1.6
@@ -1 +1 @@
-54f25fb8062b9a119e217f816f7be4be  calibre-0.6.24-nofonts.tar.gz
+d0bcbe90ad50ca9dcafca6e28e9e568e  calibre-0.6.25-nofonts.tar.gz