commit ad58ec42a706000c629a706486945a35cbf0e4dd
Author: Lukasz Masko <[email protected]>
Date: Thu Dec 31 17:24:07 2015 +0100
- Some cleanups.
calibre-no-update.patch | 35 -----------------------------------
calibre.spec | 14 ++++++--------
2 files changed, 6 insertions(+), 43 deletions(-)
---
diff --git a/calibre.spec b/calibre.spec
index 2e7760b..288062e 100644
--- a/calibre.spec
+++ b/calibre.spec
@@ -20,11 +20,10 @@ Source0: %{name}-%{version}-nofonts.tar.xz
Source1: generate-tarball.sh
Source2: %{name}-mount-helper
Patch0: %{name}-prefix.patch
-Patch1: %{name}-no-update.patch
-Patch2: %{name}-env_module.patch
-Patch3: %{name}-locales.patch
-Patch4: shebang-python-fix.patch
-Patch5: desktop-integration.patch
+Patch1: %{name}-env_module.patch
+Patch2: %{name}-locales.patch
+Patch3: shebang-python-fix.patch
+Patch4: desktop-integration.patch
URL: http://www.calibre-ebook.com/
%define baeutifulsoup_ver 3.0.5
%define pil_ver 1.1.6
@@ -165,11 +164,10 @@ Pakiet ten dostarcza uzupełnianie nazw dla calibre w
powłoce zsh.
%prep
%setup -q
%patch0 -p1
-#%patch1 -p1 Patch does not apply, not removed completly since spec update is
in progress
+%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
# 64bit target build fix
%{__sed} -i -e "s!'/usr/lib'!'%{_libdir}'!g" setup/build_environment.py
@@ -201,7 +199,7 @@ LIBPATH="%{_libdir}" \
--no-compile \
--prefix=%{_prefix} \
--root=$RPM_BUILD_ROOT \
- --libdir="%{_libdir}"
+ --libdir=%{_libdir}
cp -p resources/images/library.png
$RPM_BUILD_ROOT%{_pixmapsdir}/%{name}-gui.png
cp -p resources/images/viewer.png
$RPM_BUILD_ROOT%{_pixmapsdir}/calibre-viewer.png
diff --git a/calibre-no-update.patch b/calibre-no-update.patch
deleted file mode 100644
index 84fb17d..0000000
--- a/calibre-no-update.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -uNr calibre.old/src/calibre/gui2/ui.py calibre/src/calibre/gui2/ui.py
---- calibre.old/src/calibre/gui2/ui.py 2011-06-26 19:51:17.912975862 +0200
-+++ calibre/src/calibre/gui2/ui.py 2011-06-26 19:52:21.156346644 +0200
-@@ -647,7 +647,7 @@
- if write_settings:
- self.write_settings()
- self.check_messages_timer.stop()
-- self.update_checker.terminate()
-+ # self.update_checker.terminate()
- self.listener.close()
- self.job_manager.server.close()
- self.job_manager.threaded_server.close()
-diff -uNr calibre.old/src/calibre/gui2/update.py
calibre/src/calibre/gui2/update.py
---- calibre.old/src/calibre/gui2/update.py 2011-06-26 19:51:17.913975852
+0200
-+++ calibre/src/calibre/gui2/update.py 2011-06-26 19:56:50.608665533 +0200
-@@ -121,12 +121,13 @@
- pass
-
- 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()
-+ #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()
-+ return
-
- def recalc_update_label(self, number_of_plugin_updates):
- self.update_found('%s%s%d'%(self.last_newest_calibre_version, VSEP,
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/calibre.git/commitdiff/ad58ec42a706000c629a706486945a35cbf0e4dd
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
