Compare commits

...

23 Commits

Author SHA1 Message Date
b52f5e19c9 automatic version update by autodist [release 5.18.0-1mamba;Fri May 21 2021] 2024-01-05 21:05:19 +01:00
99393d394d automatic version update by autodist [release 5.17.0-1mamba;Fri Apr 30 2021] 2024-01-05 21:05:19 +01:00
f2ce99ca48 automatic version update by autodist [release 5.16.1-1mamba;Mon Apr 19 2021] 2024-01-05 21:05:19 +01:00
dbe222f8bc automatic version update by autodist [release 5.16.0-1mamba;Sun Apr 18 2021] 2024-01-05 21:05:18 +01:00
4e4d2694d8 automatic version update by autodist [release 5.14.0-1mamba;Sat Mar 27 2021] 2024-01-05 21:05:18 +01:00
e692b825dd automatic version update by autodist [release 5.13.0-1mamba;Sat Mar 13 2021] 2024-01-05 21:05:18 +01:00
5ef91eca7e automatic version update by autodist [release 5.12.0-1mamba;Sat Mar 06 2021] 2024-01-05 21:05:18 +01:00
7e64161b3f automatic version update by autodist [release 4.23.0-1mamba;Fri Aug 21 2020] 2024-01-05 21:05:18 +01:00
a81249d603 automatic version update by autodist [release 4.22.0-1mamba;Fri Jul 31 2020] 2024-01-05 21:05:18 +01:00
22c8721aef automatic version update by autodist [release 4.21.0-1mamba;Fri Jul 17 2020] 2024-01-05 21:05:18 +01:00
9e9d2e087f automatic version update by autodist [release 4.20.0-1mamba;Fri Jul 03 2020] 2024-01-05 21:05:18 +01:00
5d6b412949 automatic version update by autodist [release 4.19.0-1mamba;Fri Jun 19 2020] 2024-01-05 21:05:17 +01:00
f169a87a9c automatic version update by autodist [release 4.18.0-1mamba;Fri Jun 05 2020] 2024-01-05 21:05:17 +01:00
2e35e54509 automatic version update by autodist [release 4.17.0-1mamba;Sat May 23 2020] 2024-01-05 21:05:17 +01:00
6c6fd5f6ea automatic version update by autodist [release 4.16.0-1mamba;Fri May 15 2020] 2024-01-05 21:05:17 +01:00
aa85c240b1 automatic version update by autodist [release 4.15.0-1mamba;Sun May 03 2020] 2024-01-05 21:05:17 +01:00
2ebe82171b fix python3 build [release 4.13.0-3mamba;Mon Apr 13 2020] 2024-01-05 21:05:17 +01:00
d3e4909f58 automatic version update by autodist [release 4.13.0-1mamba;Mon Mar 30 2020] 2024-01-05 21:05:17 +01:00
1689263b45 automatic version update by autodist [release 4.11.2-1mamba;Sat Feb 22 2020] 2024-01-05 21:05:17 +01:00
35a44d6cd2 automatic version update by autodist [release 4.10.1-1mamba;Tue Feb 11 2020] 2024-01-05 21:05:17 +01:00
dac14ca3ea automatic version update by autodist [release 4.10.0-1mamba;Fri Feb 07 2020] 2024-01-05 21:05:17 +01:00
9b6fd5e5ed automatic version update by autodist [release 4.9.1-1mamba;Thu Jan 23 2020] 2024-01-05 21:05:17 +01:00
2aef040ad6 automatic version update by autodist [release 4.8.0-1mamba;Fri Jan 03 2020] 2024-01-05 21:05:17 +01:00
3 changed files with 211 additions and 76 deletions

View File

@@ -0,0 +1,11 @@
--- calibre-5.10.1/setup/translations.py.orig 2021-02-10 10:29:11.518360983 +0100
+++ calibre-5.10.1/setup/translations.py 2021-02-10 10:37:37.017022669 +0100
@@ -159,7 +159,7 @@
f.seek(0), f.truncate(), f.write('\n'.join(lines).encode('utf-8'))
break
else:
- raise SystemExit(f'Failed to add file_filter for {slug=} to config file')
+ raise SystemExit(f'Failed to add file_filter for slug= to config file')
self.git('add .tx/config')
self.upload_pot(resource=slug)
self.git(['add', dest])

View File

@@ -0,0 +1,12 @@
--- calibre-5.16.0/src/calibre/utils/formatter.py.orig 2021-04-18 14:10:24.085338098 +0200
+++ calibre-5.16.0/src/calibre/utils/formatter.py 2021-04-18 14:11:43.765791414 +0200
@@ -888,7 +888,8 @@
def do_node_first_non_empty(self, prog):
for expr in prog.expression_list:
- if v := self.expr(expr):
+ v = self.expr(expr)
+ if v:
if (self.break_reporter):
self.break_reporter(prog.node_name, v, prog.line_number)
return v

View File

@@ -1,92 +1,98 @@
Name: calibre Name: calibre
Version: 4.7.0 Version: 5.18.0
Release: 1mamba Release: 1mamba
Summary: A free and open source e-book library management application Summary: A free and open source e-book library management application
Group: Graphical Desktop/Applications/Multimedia Group: Graphical Desktop/Applications/Multimedia
Vendor: openmamba Vendor: openmamba
Distribution: openmamba Distribution: openmamba
Packager: Ercole 'ercolinux' Carpanetto <ercole69@gmail.com> Packager: Ercole 'ercolinux' Carpanetto <ercole69@gmail.com>
URL: http://calibre-ebook.com URL: https://calibre-ebook.com
Source: https://github.com/kovidgoyal/calibre.git/v%{version}/calibre-%{version}.tar.bz2 Source: https://github.com/kovidgoyal/calibre.git/v%{version}/calibre-%{version}.tar.bz2
#Source: http://downloads.sourceforge.net/project/calibre/%{version}/calibre-%{version}.tar.xz
#Source: http://calibre-ebook.googlecode.com/files/calibre-%{version}.tar.gz
Source1: calibre.desktop Source1: calibre.desktop
Patch0: calibre-0.8.33-libpoppler-0.20.patch Patch0: calibre-0.8.33-libpoppler-0.20.patch
Patch1: calibre-0.7.59-libpoppler-0.18.patch Patch1: calibre-0.7.59-libpoppler-0.18.patch
Patch2: calibre-0.7.59-libpng-1.5.patch Patch2: calibre-0.7.59-libpng-1.5.patch
Patch3: calibre-0.7.50-python-lxml.patch Patch3: calibre-0.7.50-python-lxml.patch
Patch4: calibre-5.10.1-slug-build-fix.patch
Patch5: calibre-5.16.0-python-3.7.patch
License: GPL License: GPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
BuildRequires: libGL-devel
BuildRequires: libchm-devel
BuildRequires: libfontconfig-devel BuildRequires: libfontconfig-devel
BuildRequires: libfreetype-devel BuildRequires: libfreetype-devel
BuildRequires: libgcc BuildRequires: libgcc
BuildRequires: libglib-devel BuildRequires: libglib-devel
BuildRequires: libglvnd-devel
BuildRequires: libhunspell-devel
BuildRequires: libhyphen-devel
BuildRequires: libicu-devel BuildRequires: libicu-devel
BuildRequires: libmtp-devel BuildRequires: libmtp-devel
BuildRequires: libopenssl-devel BuildRequires: libopenssl-devel
BuildRequires: libpodofo-devel BuildRequires: libpodofo-devel
BuildRequires: libpython-devel BuildRequires: libpython3-devel
BuildRequires: libpython27-devel
BuildRequires: libqt5-devel BuildRequires: libqt5-devel
BuildRequires: libstdc++6-devel BuildRequires: libstdc++6-devel
BuildRequires: libusb-devel BuildRequires: libusb-devel
BuildRequires: libz-devel BuildRequires: libz-devel
## AUTOBUILDREQ-END ## AUTOBUILDREQ-END
BuildRequires: BeautifulSoup BuildRequires: libpython3-devel
BuildRequires: dnspython
BuildRequires: libwmf
BuildRequires: python-mechanize
BuildRequires: python-cssutils
BuildRequires: python-lxml
BuildRequires: libpython-devel
BuildRequires: python-sip-devel
BuildRequires: python-ordereddict
BuildRequires: python-cssselect
BuildRequires: libmtp-devel
BuildRequires: python-dateutil
BuildRequires: libpodofo-devel >= 0.9.3 BuildRequires: libpodofo-devel >= 0.9.3
BuildRequires: python-dukpy BuildRequires: libwmf-devel
BuildRequires: python-html5-parser #BuildRequires: BeautifulSoup
BuildRequires: pyicu #BuildRequires: dnspython
BuildRequires: python-apsw-py3
BuildRequires: python-beautifulsoup4-py3
#BuildRequires: python-cssutils
BuildRequires: python-cssselect-py3
BuildRequires: python-css-parser-py3
BuildRequires: python-dateutil-py3
#BuildRequires: python-dukpy
BuildRequires: python-feedparser-py3
BuildRequires: python-html5lib-py3
BuildRequires: python-html5-parser-py3
BuildRequires: python-lxml-py3
BuildRequires: python-mechanize-py3
BuildRequires: python-msgpack-py3
BuildRequires: python-ordereddict-py3
BuildRequires: python-regex-py3
BuildRequires: python-sip-py3
BuildRequires: python-six-py3
BuildRequires: python-soupsieve-py3
BuildRequires: python-webencodings-py3
#BuildRequires: pyicu
BuildRequires: PyQt5-devel BuildRequires: PyQt5-devel
BuildRequires: pyqtwebengine BuildRequires: PyQt5-py3
BuildRequires: python-webencodings BuildRequires: pyqtwebengine-py3
BuildRequires: python-regex BuildRequires: PyQt-builder-py3
BuildRequires: python-msgpack BuildRequires: python-zeroconf-py3
BuildRequires: python-feedparser BuildRequires: python-ifaddr-py3
BuildRequires: python-css-parser Requires: PyQt5-py3 >= 5.15.2
BuildRequires: python-beautifulsoup4 Requires: pyqtwebengine-py3 >= 5.13.0
BuildRequires: python-apsw Requires: python3 >= %python3_version
BuildRequires: python-soupsieve #Requires: BeautifulSoup
Requires: PyQt5 >= 5.13.0 #Requires: pyicu
Requires: pyqtwebengine >= 5.13.0 Requires: python-apsw-py3
Requires: python-lxml Requires: python-beautifulsoup4-py3
Requires: python-six #Requires: python-chardet
Requires: python-apsw Requires: python-cssselect-py3
Requires: cssutils #Requires: python-cssutils-py3
Requires: mechanize Requires: python-css-parser-py3
Requires: python27 >= %python27_version Requires: python-dateutil-py3
Requires: python-cssselect #Requires: python-dukpy
Requires: python-dateutil Requires: python-feedparser-py3
Requires: BeautifulSoup Requires: python-html5lib-py3
Requires: python-netifaces Requires: python-html5-parser-py3
Requires: pyicu Requires: python-ifaddr-py3
Requires: python-dukpy Requires: python-lxml-py3
Requires: python-html5-parser Requires: python-mechanize-py3
Requires: python-webencodings Requires: python-msgpack-py3
Requires: python-regex Requires: python-netifaces-py3
Requires: python-chardet Requires: python-regex-py3
Requires: python-html5lib Requires: python-six-py3
Requires: python-msgpack Requires: python-soupsieve-py3
Requires: python-feedparser Requires: python-webencodings-py3
Requires: python-css-parser Requires: python-zeroconf-py3
Requires: python-beautifulsoup4 Requires: liberation-fonts-ttf
Requires: python-apsw
Requires: python-soupsieve
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description %description
calibre is a free and open source e-book library management application developed by users of e-books for users of e-books. calibre is a free and open source e-book library management application developed by users of e-books for users of e-books.
@@ -94,25 +100,38 @@ calibre is a free and open source e-book library management application develope
%prep %prep
%setup -q %setup -q
#-D -T #-D -T
#:<< _EOF
#%patch4 -p1
%patch5 -p1
# Use uppercase naming scheme, don't delete config files under fakeroot.
sed -e "/import config_dir/,/os.rmdir(config_dir)/d" \
-e "s/'ctc-posml'/'text' not in mt and 'pdf' not in mt and 'xhtml'/" \
-e "s/^Name=calibre/Name=Calibre/g" \
-i src/calibre/linux.py
%build %build
#:<< _EOF #:<< _EOF
CFLAGS="%{optflags}" %{__python27} setup.py bootstrap %ifarch %{ix86}
CFLAGS="%{optflags}" %{__python27} setup.py build export QTWEBENGINE_DISABLE_SANDBOX=1
CFLAGS="%{optflags}" %{__python27} setup.py resources %endif
CFLAGS="%{optflags}" %{__python3} setup.py bootstrap
LANG='en_US.UTF-8' %{__python3} setup.py build
LANG='en_US.UTF-8' %{__python3} setup.py gui
%{__python3} setup.py liberation_fonts --path-to-liberation_fonts /usr/share/fonts/liberation --system-liberation_fonts
LANG='en_US.UTF-8' %{__python3} setup.py resources
LANG='en_US.UTF-8' %{__python3} setup.py rapydscript
%install %install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}" [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%{__python27} setup.py install \ # If this directory doesn't exist, zsh completion won't install.
install -d %{buildroot}%{_datadir}/zsh/site-functions
%{__python3} setup.py install \
--root=%{buildroot}/usr \ --root=%{buildroot}/usr \
--staging-libdir=%{buildroot}%{_libdir} \ --staging-libdir=%{buildroot}%{_libdir} \
--libdir=%{_libdir} --libdir=%{_libdir}
#mkdir %{buildroot}%{_datadir}/applications
#cp %SOURCE1 %{buildroot}%{_datadir}/applications/calibre.desktop
#install -D -m0644 %{buildroot}%{_datadir}/calibre/content-server/calibre.png \
# %{buildroot}%{_datadir}/pixmaps/calibre.png
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/calibre %{_bindir}/calibre
@@ -130,9 +149,11 @@ CFLAGS="%{optflags}" %{__python27} setup.py resources
%{_datadir}/mime/packages/calibre-mimetypes.xml %{_datadir}/mime/packages/calibre-mimetypes.xml
%{_datadir}/bash-completion/completions/* %{_datadir}/bash-completion/completions/*
%dir %{_libdir}/calibre %dir %{_libdir}/calibre
#%dir %{_libdir}/calibre/backports
#%{_libdir}/calibre/backports/*
#%dir %{_libdir}/calibre/biplist
#%{_libdir}/calibre/biplist/*
%dir %{_libdir}/calibre/calibre %dir %{_libdir}/calibre/calibre
%dir %{_libdir}/calibre/backports
%{_libdir}/calibre/backports/*
%{_libdir}/calibre/calibre/*.py %{_libdir}/calibre/calibre/*.py
%dir %{_libdir}/calibre/calibre/db %dir %{_libdir}/calibre/calibre/db
%{_libdir}/calibre/calibre/db/* %{_libdir}/calibre/calibre/db/*
@@ -146,8 +167,15 @@ CFLAGS="%{optflags}" %{__python27} setup.py resources
%{_libdir}/calibre/calibre/gui2/* %{_libdir}/calibre/calibre/gui2/*
%dir %{_libdir}/calibre/calibre/library %dir %{_libdir}/calibre/calibre/library
%{_libdir}/calibre/calibre/library/* %{_libdir}/calibre/calibre/library/*
%dir %{_libdir}/calibre/calibre_lzma %dir %{_libdir}/calibre/calibre/plugins
%{_libdir}/calibre/calibre_lzma/* #%dir %{_libdir}/calibre/calibre/plugins/3
#%{_libdir}/calibre/calibre/plugins/3/*
%dir %{_libdir}/calibre/calibre/srv
%{_libdir}/calibre/calibre/srv/*.py
%dir %{_libdir}/calibre/calibre/srv/tests
%{_libdir}/calibre/calibre/srv/tests/*.py
#%dir %{_libdir}/calibre/calibre_lzma
#%{_libdir}/calibre/calibre_lzma/*
%dir %{_libdir}/calibre/calibre/plugins %dir %{_libdir}/calibre/calibre/plugins
%{_libdir}/calibre/calibre/plugins/*.so %{_libdir}/calibre/calibre/plugins/*.so
%dir %{_libdir}/calibre/calibre/spell %dir %{_libdir}/calibre/calibre/spell
@@ -166,25 +194,109 @@ CFLAGS="%{optflags}" %{__python27} setup.py resources
%{_libdir}/calibre/odf/*.py %{_libdir}/calibre/odf/*.py
%dir %{_libdir}/calibre/polyglot %dir %{_libdir}/calibre/polyglot
%{_libdir}/calibre/polyglot/* %{_libdir}/calibre/polyglot/*
%dir %{_libdir}/calibre/calibre/srv %dir %{_libdir}/calibre/qt
%{_libdir}/calibre/calibre/srv/*.py %{_libdir}/calibre/qt/*
%dir %{_libdir}/calibre/calibre/srv/tests
%{_libdir}/calibre/calibre/srv/tests/*.py
%dir %{_libdir}/calibre/templite %dir %{_libdir}/calibre/templite
%{_libdir}/calibre/templite/*.py %{_libdir}/calibre/templite/*.py
%dir %{_libdir}/calibre/tinycss/ %dir %{_libdir}/calibre/tinycss/
%{_libdir}/calibre/tinycss/*.py %{_libdir}/calibre/tinycss/*.py
%dir %{_libdir}/calibre/tinycss/tests %dir %{_libdir}/calibre/tinycss/tests
%{_libdir}/calibre/tinycss/tests/*.py %{_libdir}/calibre/tinycss/tests/*.py
%{_libdir}/calibre/sgmllib.py
%dir %{_datadir}/calibre %dir %{_datadir}/calibre
%{_datadir}/calibre/* %{_datadir}/calibre/*
%{_datadir}/zsh/site-functions/_calibre
%{_datadir}/icons/hicolor/*/apps/calibre-*.png %{_datadir}/icons/hicolor/*/apps/calibre-*.png
%{_datadir}/icons/hicolor/*/mimetypes/application-*.png %{_datadir}/icons/hicolor/*/mimetypes/application-*.png
%{_datadir}/icons/hicolor/*/mimetypes/gnome-mime-*.png %{_datadir}/icons/hicolor/*/mimetypes/gnome-mime-*.png
%{_datadir}/icons/hicolor/*/mimetypes/text-lrs.png %{_datadir}/icons/hicolor/*/mimetypes/text-lrs.png
%{python27_sitelib}/init_calibre.py %{python3_sitelib}/init_calibre.py
%changelog %changelog
* Fri May 21 2021 Automatic Build System <autodist@mambasoft.it> 5.18.0-1mamba
- automatic version update by autodist
* Fri Apr 30 2021 Automatic Build System <autodist@mambasoft.it> 5.17.0-1mamba
- automatic version update by autodist
* Mon Apr 19 2021 Automatic Build System <autodist@mambasoft.it> 5.16.1-1mamba
- automatic version update by autodist
* Sun Apr 18 2021 Automatic Build System <autodist@mambasoft.it> 5.16.0-1mamba
- automatic version update by autodist
* Sat Mar 27 2021 Automatic Build System <autodist@mambasoft.it> 5.14.0-1mamba
- automatic version update by autodist
* Sat Mar 13 2021 Automatic Build System <autodist@mambasoft.it> 5.13.0-1mamba
- automatic version update by autodist
* Sat Mar 06 2021 Automatic Build System <autodist@mambasoft.it> 5.12.0-1mamba
- automatic version update by autodist
* Fri Aug 21 2020 Automatic Build System <autodist@mambasoft.it> 4.23.0-1mamba
- automatic version update by autodist
* Fri Jul 31 2020 Automatic Build System <autodist@mambasoft.it> 4.22.0-1mamba
- automatic version update by autodist
* Fri Jul 17 2020 Automatic Build System <autodist@mambasoft.it> 4.21.0-1mamba
- automatic version update by autodist
* Fri Jul 03 2020 Automatic Build System <autodist@mambasoft.it> 4.20.0-1mamba
- automatic version update by autodist
* Fri Jun 19 2020 Automatic Build System <autodist@mambasoft.it> 4.19.0-1mamba
- automatic version update by autodist
* Fri Jun 05 2020 Automatic Build System <autodist@mambasoft.it> 4.18.0-1mamba
- automatic version update by autodist
* Sat May 23 2020 Automatic Build System <autodist@mambasoft.it> 4.17.0-1mamba
- automatic version update by autodist
* Fri May 15 2020 Automatic Build System <autodist@mambasoft.it> 4.16.0-1mamba
- automatic version update by autodist
* Sun May 03 2020 Automatic Build System <autodist@mambasoft.it> 4.15.0-1mamba
- automatic version update by autodist
* Mon Apr 13 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 4.13.0-3mamba
- fix python3 build
* Sat Apr 11 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 4.13.0-2mamba
- python3 rebuild
* Mon Mar 30 2020 Automatic Build System <autodist@mambasoft.it> 4.13.0-1mamba
- automatic version update by autodist
* Fri Mar 06 2020 Automatic Build System <autodist@mambasoft.it> 4.12.0-1mamba
- automatic version update by autodist
* Sat Feb 22 2020 Automatic Build System <autodist@mambasoft.it> 4.11.2-1mamba
- automatic version update by autodist
* Fri Feb 21 2020 Automatic Build System <autodist@mambasoft.it> 4.11.1-1mamba
- automatic version update by autodist
* Fri Feb 21 2020 Automatic Build System <autodist@mambasoft.it> 4.11.0-1mamba
- automatic version update by autodist
* Tue Feb 11 2020 Automatic Build System <autodist@mambasoft.it> 4.10.1-1mamba
- automatic version update by autodist
* Fri Feb 07 2020 Automatic Build System <autodist@mambasoft.it> 4.10.0-1mamba
- automatic version update by autodist
* Thu Jan 23 2020 Automatic Build System <autodist@mambasoft.it> 4.9.1-1mamba
- automatic version update by autodist
* Thu Jan 23 2020 Automatic Build System <autodist@mambasoft.it> 4.9.0-1mamba
- automatic version update by autodist
* Fri Jan 03 2020 Automatic Build System <autodist@mambasoft.it> 4.8.0-1mamba
- automatic version update by autodist
* Fri Dec 27 2019 Automatic Build System <autodist@mambasoft.it> 4.7.0-1mamba * Fri Dec 27 2019 Automatic Build System <autodist@mambasoft.it> 4.7.0-1mamba
- automatic version update by autodist - automatic version update by autodist