Hello community, here is the log from the commit of package calibre for openSUSE:Factory checked in at 2014-10-08 22:13:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/calibre (Old) and /work/SRC/openSUSE:Factory/.calibre.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "calibre" Changes: -------- --- /work/SRC/openSUSE:Factory/calibre/calibre.changes 2014-10-06 12:06:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.calibre.new/calibre.changes 2014-10-08 22:14:00.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Oct 7 13:12:59 UTC 2014 - cornelis@solcon.nl + +- Update to 2.5.0: + * Switched to Qt 5 + * For details see http://calibre-ebook.com/whats-new +- Removed the obsolete Obsolete/Provides for calibre07 and calibre-icons-branding +- Updated BuildRequires for Qt 5 +- Changed Requires: liberation-fonts into Recommends + +------------------------------------------------------------------- Old: ---- calibre-1.48.0.tar.xz New: ---- calibre-2.5.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calibre.spec ++++++ --- /var/tmp/diff_new_pack.BbdhzL/_old 2014-10-08 22:14:01.000000000 +0200 +++ /var/tmp/diff_new_pack.BbdhzL/_new 2014-10-08 22:14:01.000000000 +0200 @@ -22,7 +22,7 @@ License: GPL-3.0 Group: Productivity/Other Name: calibre -Version: 1.48.0 +Version: 2.5.0 Release: 0 Url: http://calibre-ebook.com Source0: http://download.calibre-ebook.com/%{version}/calibre-%{version}.tar.xz @@ -33,21 +33,13 @@ Patch2: calibre-setup.install.py.diff # PATCH-FIX-OPENSUSE: disabling Autoupdate Searcher Patch3: calibre-no-update.diff - -#If a package is obsoleted by a compatible replacement, the obsoleted package -#should also be provided in order to not cause unnecessary dependency breakage. -#If the obsoleting package is not a compatible replacement for the old one, -#leave out the Provides. -Provides: calibre07 = %{version} -Obsoletes: calibre07 < %{version} -Provides: calibre-icons-branding = %{version} -Obsoletes: calibre-icons-branding < %{version} - BuildRequires: fdupes BuildRequires: help2man +BuildRequires: libQt5Core-private-headers-devel +BuildRequires: libQt5Gui-private-headers-devel +BuildRequires: libQt5PlatformSupport-private-headers-devel BuildRequires: libpodofo-devel -BuildRequires: libpoppler-qt4-devel >= 0.12.0 -BuildRequires: libqt4-private-headers-devel +BuildRequires: libpoppler-qt5-devel >= 0.20.0 BuildRequires: python-devel >= 2.7.1 BuildRequires: update-desktop-files @@ -87,7 +79,7 @@ BuildRequires: python-netifaces BuildRequires: python-odfpy BuildRequires: python-pypdf -BuildRequires: python-qt4-devel >= 4.9.1 +BuildRequires: python-qt5-devel >= 5.3.1 BuildRequires: python-setuptools BuildRequires: python-sip-devel >= 4.12.1 BuildRequires: sqlite3-devel @@ -103,7 +95,6 @@ Requires: libqt4 >= 4.6.0 Requires: libwmf >= 0.2.8 Requires: podofo >= 0.8.2 -Requires: poppler-qt4 >= 0.12.0 Requires: poppler-tools Requires: python >= 2.7.1 Requires: python-apsw @@ -120,11 +111,12 @@ Requires: python-netifaces Requires: python-odfpy Requires: python-pypdf -Requires: python-qt4 >= 4.9.1 +Requires: python-qt5 >= 5.3.1 Requires: python-setuptools Requires: python-sip >= 4.12.1 Requires: sqlite3 Requires: xdg-utils >= 1.0.2 +Recommends: liberation-fonts Suggests: python-Pillow BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -140,7 +132,7 @@ Linux, Windows and OS X. %prep -%setup -q -n %{name} +%setup -q %patch1 -p1 -b .no-update %patch2 -p1 %patch3 -p1 -b .no-update ++++++ calibre-1.48.0.tar.xz -> calibre-2.5.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/calibre/calibre-1.48.0.tar.xz /work/SRC/openSUSE:Factory/.calibre.new/calibre-2.5.0.tar.xz differ: char 25, line 1 ++++++ calibre-no-update.diff ++++++ --- /var/tmp/diff_new_pack.BbdhzL/_old 2014-10-08 22:14:01.000000000 +0200 +++ /var/tmp/diff_new_pack.BbdhzL/_new 2014-10-08 22:14:01.000000000 +0200 @@ -1,7 +1,8 @@ -diff -ur calibre.orig/src/calibre/gui2/ui.py calibre/src/calibre/gui2/ui.py ---- calibre.orig/src/calibre/gui2/ui.py 2014-08-08 05:21:35.000000000 +0200 -+++ calibre/src/calibre/gui2/ui.py 2014-09-21 16:21:18.382645834 +0200 -@@ -884,7 +884,8 @@ +Index: calibre/src/calibre/gui2/ui.py +=================================================================== +--- calibre.orig/src/calibre/gui2/ui.py 2012-06-08 07:17:56.000000000 +0200 ++++ calibre/src/calibre/gui2/ui.py 2012-06-12 20:44:24.116576257 +0200 +@@ -744,7 +744,8 @@ class Main(MainWindow, MainWindowMixin, if write_settings: self.write_settings() self.check_messages_timer.stop() @@ -11,23 +12,19 @@ self.listener.close() self.job_manager.server.close() self.job_manager.threaded_server.close() -diff -ur calibre.orig/src/calibre/gui2/update.py calibre/src/calibre/gui2/update.py ---- calibre.orig/src/calibre/gui2/update.py 2014-08-08 05:21:35.000000000 +0200 -+++ calibre/src/calibre/gui2/update.py 2014-09-21 16:22:17.724472880 +0200 -@@ -136,11 +136,11 @@ +Index: calibre/src/calibre/gui2/update.py +=================================================================== +--- calibre.orig/src/calibre/gui2/update.py.orig 2014-09-29 00:13:11.349486364 +0100 ++++ calibre/src/calibre/gui2/update.py 2014-09-29 00:14:00.137172990 +0100 +@@ -139,11 +139,6 @@ class UpdateMixin(object): - def __init__(self, opts): + def init_update_mixin(self, opts): self.last_newest_calibre_version = NO_CALIBRE_UPDATE - 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() -+# 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 recalc_update_label(self, number_of_plugin_updates): self.update_found(self.last_newest_calibre_version, number_of_plugin_updates) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org