Hello community, here is the log from the commit of package calibre for openSUSE:Factory checked in at 2015-01-08 23:02:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-01-07 09:39:14.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.calibre.new/calibre.changes 2015-01-08 23:02:30.000000000 +0100 @@ -1,0 +2,15 @@ +Wed Jan 7 11:33:55 UTC 2015 - [email protected] + +- Update no-update patch to actually inverse the logic and let + user override it: + * calibre-no-update.diff +- Do not use bundled beautifulsoup +- No need to build without strict aliasing + +------------------------------------------------------------------- +Wed Jan 7 10:25:49 UTC 2015 - [email protected] + +- Remove code that unpacks csselect directly as it was 12.2 only + which is obsolete for quite time already + +------------------------------------------------------------------- Old: ---- cssselect-0.7.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calibre.spec ++++++ --- /var/tmp/diff_new_pack.vgLkA5/_old 2015-01-08 23:02:31.000000000 +0100 +++ /var/tmp/diff_new_pack.vgLkA5/_new 2015-01-08 23:02:31.000000000 +0100 @@ -28,7 +28,6 @@ Source0: http://download.calibre-ebook.com/%{version}/calibre-%{version}.tar.xz Source2: %{name}.desktop Source3: %{name}.png -Source5: https://pypi.python.org/packages/source/c/cssselect/cssselect-%{intree_cssselect_version}.tar.gz Patch1: calibre-0.9.38-pillow.patch Patch2: calibre-setup.install.py.diff # PATCH-FIX-OPENSUSE: disabling Autoupdate Searcher @@ -148,17 +147,18 @@ find src/calibre -name "*.py" -type f | xargs chmod -x chmod -x recipes/* -cp -v %{SOURCE2} %{SOURCE3} . +# remove bundled beautifulsoup +rm -f src/calibre/ebooks/BeautifulSoup.py +find "." -type f -name \*.py -exec \ + sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + -# Add cssselect private code, only for opensuse 12.2 -%if 0%{?suse_version} == 1220 -tar xzf %{SOURCE5} -C $RPM_BUILD_DIR/%{name}/src/ --strip-components=1 cssselect-%{intree_cssselect_version}/cssselect/ -%endif +cp -v %{SOURCE2} %{SOURCE3} . %build LANG="en_US.UTF8" \ -CFLAGS="%{optflags} -fno-strict-aliasing" \ -CXXFLAGS="%{optflags} -fno-strict-aliasing" \ +CFLAGS="%{optflags}" \ +CXXFLAGS="%{optflags}" \ +OVERRIDE_CFLAGS="%{optflags}" \ python setup.py build %install ++++++ calibre-no-update.diff ++++++ --- /var/tmp/diff_new_pack.vgLkA5/_old 2015-01-08 23:02:31.000000000 +0100 +++ /var/tmp/diff_new_pack.vgLkA5/_new 2015-01-08 23:02:31.000000000 +0100 @@ -1,14 +1,27 @@ ---- calibre.orig/src/calibre/gui2/update.py 2014-11-07 04:28:47.000000000 +0100 -+++ calibre/src/calibre/gui2/update.py 2014-11-08 23:48:37.479019531 +0100 -@@ -149,11 +149,6 @@ - - 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.signal.update_found.connect(self.update_found, -- type=Qt.QueuedConnection) -- self.update_checker.start() +diff -burN calibre-2.9.0.orig/src/calibre/gui2/main.py calibre-2.9.0/src/calibre/gui2/main.py +--- calibre-2.9.0.orig/src/calibre/gui2/main.py 2014-11-09 20:09:54.081231882 +0800 ++++ calibre-2.9.0/src/calibre/gui2/main.py 2014-11-09 20:15:48.193033844 +0800 +@@ -37,8 +37,9 @@ + help=_('Start minimized to system tray.')) + parser.add_option('-v', '--verbose', default=0, action='count', + help=_('Ignored, do not use. Present only for legacy reasons')) +- parser.add_option('--no-update-check', default=False, action='store_true', +- help=_('Do not check for updates')) ++ parser.add_option('--update-check', dest='no_update_check', default=True, ++ action='store_false', ++ help=_('Check for updates')) + parser.add_option('--ignore-plugins', default=False, action='store_true', + help=_('Ignore custom plugins, useful if you installed a plugin' + ' that is preventing calibre from starting')) +diff -burN calibre-2.9.0.orig/src/calibre/gui2/update.py calibre-2.9.0/src/calibre/gui2/update.py +--- calibre-2.9.0.orig/src/calibre/gui2/update.py 2014-11-09 20:09:54.082231864 +0800 ++++ calibre-2.9.0/src/calibre/gui2/update.py 2014-11-09 20:17:49.954767115 +0800 +@@ -154,6 +154,8 @@ + self.update_checker.signal.update_found.connect(self.update_found, + type=Qt.QueuedConnection) + self.update_checker.start() ++ else: ++ self.update_checker = None 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: [email protected] For additional commands, e-mail: [email protected]
