mirror of
https://abf.rosa.ru/djam/calibre.git
synced 2025-02-24 16:12:47 +00:00
LOG: update to 1.3.0 for mrb
This commit is contained in:
symbianflo
parent
7767beff8c
commit
c6051d6610
4 changed files with 64 additions and 129 deletions
4
.abf.yml
4
.abf.yml
|
|
@ -1,3 +1,3 @@
|
||||||
sources:
|
sources:
|
||||||
calibre-1.0.0.tar.xz: ea5829e2d763afb3e2abfa675f6cb2bffbdbe4ce
|
|
||||||
calibre-1.2.0.tar.xz: 833db1a75ed0e012962dfdbbe86d29be745b0ac9
|
calibre-1.3.0.tar.xz: c6acea5a8c9b045d01ba690ac8755de0028852d6
|
||||||
|
|
|
||||||
|
|
@ -1,35 +0,0 @@
|
||||||
--- calibre/src/calibre/linux.py~ 2011-09-09 10:46:16.000000000 -0600
|
|
||||||
+++ calibre/src/calibre/linux.py 2011-09-13 12:41:50.307253773 -0600
|
|
||||||
@@ -318,7 +318,7 @@
|
|
||||||
continue
|
|
||||||
parser = parser()
|
|
||||||
raw = create_man_page(prog, parser)
|
|
||||||
- if isbsd:
|
|
||||||
+ if isbsd or islinux:
|
|
||||||
manfile = os.path.join(manpath, prog+'.1')
|
|
||||||
else:
|
|
||||||
manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2')
|
|
||||||
--- calibre/src/calibre/utils/help2man.py~ 2011-09-09 10:46:16.000000000 -0600
|
|
||||||
+++ calibre/src/calibre/utils/help2man.py 2011-09-13 12:45:17.056503626 -0600
|
|
||||||
@@ -4,7 +4,7 @@
|
|
||||||
__docformat__ = 'restructuredtext en'
|
|
||||||
|
|
||||||
import time, bz2
|
|
||||||
-from calibre.constants import isbsd
|
|
||||||
+from calibre.constants import isbsd, islinux
|
|
||||||
|
|
||||||
from calibre.constants import __version__, __appname__, __author__
|
|
||||||
|
|
||||||
@@ -58,9 +58,9 @@
|
|
||||||
lines = [x if isinstance(x, unicode) else unicode(x, 'utf-8', 'replace') for
|
|
||||||
x in lines]
|
|
||||||
|
|
||||||
- if not isbsd:
|
|
||||||
- return bz2.compress((u'\n'.join(lines)).encode('utf-8'))
|
|
||||||
- else:
|
|
||||||
+ if isbsd or islinux:
|
|
||||||
return (u'\n'.join(lines)).encode('utf-8')
|
|
||||||
+ else:
|
|
||||||
+ return bz2.compress((u'\n'.join(lines)).encode('utf-8'))
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
--- calibre/src/calibre/gui2/update.py~ 2011-09-09 10:46:16.000000000 -0600
|
|
||||||
+++ calibre/src/calibre/gui2/update.py 2011-09-13 13:39:52.629503202 -0600
|
|
||||||
@@ -120,13 +120,13 @@
|
|
||||||
|
|
||||||
class UpdateMixin(object):
|
|
||||||
|
|
||||||
- def __init__(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()
|
|
||||||
+ #def __init__(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()
|
|
||||||
|
|
||||||
def recalc_update_label(self, number_of_plugin_updates):
|
|
||||||
self.update_found('%s%s%d'%(self.last_newest_calibre_version, VSEP,
|
|
||||||
131
calibre.spec
131
calibre.spec
|
|
@ -1,76 +1,72 @@
|
||||||
Summary: E-book converter and library management
|
%define debug_package %{nil}
|
||||||
Name: calibre
|
%define distsuffix mrb
|
||||||
Version: 1.2.0
|
|
||||||
Release: 1
|
|
||||||
License: GPLv3+
|
|
||||||
Group: Office
|
|
||||||
URL: http://calibre-ebook.com/
|
|
||||||
Source0: http://freefr.dl.sourceforge.net/project/%{name}/%{version}/%{name}-%{version}.tar.xz
|
|
||||||
Source2: calibre-mount-helper
|
|
||||||
Patch1: calibre-no-update-0.8.6.patch
|
|
||||||
Patch3: calibre-0.7.27-python-fix.patch
|
|
||||||
Patch4: calibre-python2-env-fix.patch
|
|
||||||
Patch5: calibre-web-control.patch
|
|
||||||
|
|
||||||
# see http://calibre-ebook.com/download_linux
|
Name: calibre
|
||||||
# for mininal requires
|
Version: 1.3.0
|
||||||
BuildRequires: chrpath
|
Release: 1
|
||||||
BuildRequires: desktop-file-utils
|
Summary: E-book converter and library management
|
||||||
BuildRequires: python >= 2.7
|
Group: Office
|
||||||
BuildRequires: python-apsw
|
License: GPLv3
|
||||||
BuildRequires: python-beautifulsoup >= 3.0.5
|
URL: http://calibre-ebook.com/
|
||||||
BuildRequires: python-cherrypy >= 3.2.2
|
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.xz
|
||||||
BuildRequires: python-cssutils >= 0.9.9
|
Source2: %{name}-mount-helper
|
||||||
BuildRequires: python-dateutil >= 1.4.1
|
Patch1: %{name}-no-update-0.8.6.patch
|
||||||
BuildRequires: python-imaging >= 1.1.6
|
Patch3: %{name}-0.7.27-python-fix.patch
|
||||||
BuildRequires: python-lxml
|
Patch4: %{name}-python2-env-fix.patch
|
||||||
BuildRequires: python-mechanize >= 0.1.11
|
Patch5: %{name}-web-control.patch
|
||||||
|
BuildRequires: chrpath
|
||||||
|
BuildRequires: python >= 2.6
|
||||||
|
BuildRequires: python-devel >= 2.6
|
||||||
|
BuildRequires: imagemagick-devel
|
||||||
BuildRequires: python-setuptools
|
BuildRequires: python-setuptools
|
||||||
BuildRequires: unzip
|
|
||||||
BuildRequires: xdg-utils >= 1.0.3
|
|
||||||
BuildRequires: chmlib-devel >= 0.40
|
|
||||||
BuildRequires: libwmf-devel >= 0.2.8
|
|
||||||
BuildRequires: podofo-devel >= 0.8.2
|
|
||||||
BuildRequires: python-qt4-devel >= 4.9.6
|
|
||||||
BuildRequires: qt4-devel
|
BuildRequires: qt4-devel
|
||||||
BuildRequires: qt4-devel-private
|
BuildRequires: qt4-devel-private
|
||||||
BuildRequires: pkgconfig(icu-i18n)
|
BuildRequires: python-qt4-devel
|
||||||
BuildRequires: pkgconfig(ImageMagick)
|
|
||||||
BuildRequires: pkgconfig(libmtp) >= 1.1.5
|
|
||||||
BuildRequires: pkgconfig(poppler-qt4) >= 0.12
|
BuildRequires: pkgconfig(poppler-qt4) >= 0.12
|
||||||
BuildRequires: pkgconfig(poppler-glib)
|
BuildRequires: pkgconfig(poppler-glib)
|
||||||
BuildRequires: pkgconfig(python) >= 2.7
|
BuildRequires: podofo-devel
|
||||||
BuildRequires: pkgconfig(sqlite3)
|
BuildRequires: desktop-file-utils
|
||||||
|
BuildRequires: python-mechanize
|
||||||
Requires: imagemagick >= 6.5.9
|
BuildRequires: python-lxml
|
||||||
Requires: python-apsw
|
BuildRequires: python-dateutil
|
||||||
Requires: python-beautifulsoup >= 3.0.5
|
BuildRequires: python-six
|
||||||
Requires: python-cherrypy >= 3.2.2
|
BuildRequires: python-imaging
|
||||||
Requires: python-cssselect >= 0.6.1
|
BuildRequires: python-apsw
|
||||||
Requires: python-cssutils >= 0.9.9
|
BuildRequires: xdg-utils
|
||||||
Requires: python-dateutil >= 1.4.1
|
BuildRequires: python-beautifulsoup
|
||||||
Requires: python-django-tagging
|
BuildRequires: chmlib-devel
|
||||||
Requires: python-genshi
|
BuildRequires: python-cssutils >= 0.9.9
|
||||||
Requires: python-imaging >= 1.1.6
|
BuildRequires: sqlite3-devel
|
||||||
Requires: python-lxml
|
BuildRequires: icu-devel
|
||||||
Requires: python-mechanize >= 0.1.11
|
BuildRequires: unzip
|
||||||
Requires: python-netifaces
|
BuildRequires: libwmf-devel
|
||||||
Requires: python-odf
|
BuildRequires: libmtp-devel
|
||||||
Requires: python-pypdf
|
|
||||||
Requires: python-qt4
|
Requires: python-qt4
|
||||||
|
Requires: python-pypdf
|
||||||
|
Requires: python-cherrypy
|
||||||
|
Requires: python-cssutils
|
||||||
|
Requires: python-cssselect
|
||||||
|
Requires: imagemagick
|
||||||
|
Requires: python-odf
|
||||||
|
Requires: python-django-tagging
|
||||||
|
Requires: python-lxml
|
||||||
|
Requires: python-imaging
|
||||||
|
Requires: python-mechanize
|
||||||
|
Requires: python-dateutil
|
||||||
|
Requires: python-genshi
|
||||||
|
Requires: python-beautifulsoup
|
||||||
|
Requires: python-netifaces
|
||||||
Requires: poppler
|
Requires: poppler
|
||||||
# Require the packages of the files which are symlinked by calibre
|
|
||||||
Requires: fonts-ttf-liberation
|
Requires: fonts-ttf-liberation
|
||||||
# E-mail functionality requires this package
|
Requires: python-dnspython
|
||||||
# see https://bugs.launchpad.net/calibre/+bug/739073
|
Requires: python-qt4-help
|
||||||
Requires: python-dnspython >= 1.6.0
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Calibre is meant to be a complete e-library solution. It includes library
|
Calibre is meant to be a complete e-library solution. It includes library
|
||||||
management, format conversion, news feeds to ebook conversion as well as
|
management, format conversion, news feeds to ebook conversion as well as
|
||||||
e-book reader sync features.
|
e-book reader sync features.
|
||||||
|
|
||||||
Calibre is primarily a ebook cataloging program. It manages your ebook
|
Calibre is primarily a ebook cataloging program. It manages your e-book
|
||||||
collection for you. It is designed around the concept of the logical book,
|
collection for you. It is designed around the concept of the logical book,
|
||||||
i.e. a single entry in the database that may correspond to ebooks in several
|
i.e. a single entry in the database that may correspond to ebooks in several
|
||||||
formats. It also supports conversion to and from a dozen different ebook
|
formats. It also supports conversion to and from a dozen different ebook
|
||||||
|
|
@ -80,7 +76,6 @@ Supported input formats are: MOBI, LIT, PRC, EPUB, CHM, ODT, HTML, CBR, CBZ,
|
||||||
RTF, TXT, PDF and LRS.
|
RTF, TXT, PDF and LRS.
|
||||||
|
|
||||||
%files
|
%files
|
||||||
#-f %{name}.lang
|
|
||||||
%doc COPYRIGHT LICENSE Changelog.yaml
|
%doc COPYRIGHT LICENSE Changelog.yaml
|
||||||
%{_bindir}/calibre
|
%{_bindir}/calibre
|
||||||
%{_bindir}/calibre-complete
|
%{_bindir}/calibre-complete
|
||||||
|
|
@ -95,7 +90,6 @@ RTF, TXT, PDF and LRS.
|
||||||
%{_bindir}/ebook-device
|
%{_bindir}/ebook-device
|
||||||
%{_bindir}/ebook-meta
|
%{_bindir}/ebook-meta
|
||||||
%{_bindir}/ebook-viewer
|
%{_bindir}/ebook-viewer
|
||||||
#{_bindir}/epub-fix
|
|
||||||
%{_bindir}/ebook-polish
|
%{_bindir}/ebook-polish
|
||||||
%{_bindir}/fetch-ebook-metadata
|
%{_bindir}/fetch-ebook-metadata
|
||||||
%{_bindir}/lrf2lrs
|
%{_bindir}/lrf2lrs
|
||||||
|
|
@ -249,15 +243,10 @@ ln -s %{_datadir}/fonts/TTF/liberation/LiberationSerif-Regular.ttf \
|
||||||
%{buildroot}%{_datadir}/%{name}/fonts/prs500/tt0011m_.ttf
|
%{buildroot}%{_datadir}/%{name}/fonts/prs500/tt0011m_.ttf
|
||||||
ln -s %{_datadir}/fonts/TTF/liberation/LiberationMono-Regular.ttf \
|
ln -s %{_datadir}/fonts/TTF/liberation/LiberationMono-Regular.ttf \
|
||||||
%{buildroot}%{_datadir}/%{name}/fonts/prs500/tt0419m_.ttf
|
%{buildroot}%{_datadir}/%{name}/fonts/prs500/tt0419m_.ttf
|
||||||
|
|
||||||
|
|
||||||
# localization has changed since calibre-0.8.5
|
# delete locales, calibre stores them in a zip file now
|
||||||
# locale.zip is treated internally at runtime
|
rm -rf %{buildroot}%{_datadir}/%{name}/localization/locales/
|
||||||
# so the traditional locale fixes are moot.
|
|
||||||
# locales should still be looked for in the proper place
|
|
||||||
# but under the new localization zip-based schema
|
|
||||||
sed -i -e 's:localization/locale.zip:%{_datadir}/%{name}/localization/locales.zip:' %{buildroot}%{_libdir}/%{name}/%{name}/utils/localization.py
|
|
||||||
|
|
||||||
#% find_lang %{name} --with-kde --all-name
|
|
||||||
|
|
||||||
rm -f %{buildroot}%{_bindir}/%{name}-uninstall
|
rm -f %{buildroot}%{_bindir}/%{name}-uninstall
|
||||||
|
|
||||||
|
|
@ -265,6 +254,10 @@ install -m 0755 %{SOURCE2} %{buildroot}%{_bindir}/
|
||||||
|
|
||||||
# script-without-shebang
|
# script-without-shebang
|
||||||
find %{buildroot}%{_libdir}/%{name}/chardet -name '*.py' -exec sed -i -e '1i#!/usr/bin/python' {} \;
|
find %{buildroot}%{_libdir}/%{name}/chardet -name '*.py' -exec sed -i -e '1i#!/usr/bin/python' {} \;
|
||||||
|
# wrong-script-interpreter
|
||||||
|
find %{buildroot}%{_libdir}/%{name}/calibre/ebooks/markdown/extensions/meta.py -exec sed -i -e '1i#!/usr/bin/python' {} \;
|
||||||
|
#perl -pi -e "s|#!/usr/bin/python|#!/usr/bin/env python|" %{buildroot}%{_libdir}/calibre/calibre/ebooks/markdown/extensions/meta.py
|
||||||
|
|
||||||
|
|
||||||
# non-executable-script
|
# non-executable-script
|
||||||
chmod a+x %{buildroot}%{_libdir}/%{name}/qtcurve/test_rendering.py
|
chmod a+x %{buildroot}%{_libdir}/%{name}/qtcurve/test_rendering.py
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue