Hello community,
here is the log from the commit of package calibre for openSUSE:Factory checked
in at 2018-08-27 12:59:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/calibre (Old)
and /work/SRC/openSUSE:Factory/.calibre.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "calibre"
Mon Aug 27 12:59:18 2018 rev:198 rq:631515 version:3.30.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/calibre/calibre.changes 2018-08-12
20:52:47.733153440 +0200
+++ /work/SRC/openSUSE:Factory/.calibre.new/calibre.changes 2018-08-27
12:59:23.332818782 +0200
@@ -1,0 +2,50 @@
+Sat Aug 25 08:39:14 UTC 2018 - ec...@opensuse.org
+
+- update to 3.30.0
+ New Features
+ - ToC Editor: When generating ToCs using headings/XPath ignore
+ duplicate entries at the same level that have the same text.
+ - Windows: The default calibre library location is now not in
+ My Documents but instead in the user home folder, to avoid
+ issues with OneDrive auto-syncing calibre libraries
+ - Kobo driver: Support for new firmware version
+ - Add a tweak (in Preferences->Tweaks) to allow skipping network
+ check on news download
+ - Edit metadata dialog: Show a confirmation dialog on cancel if
+ some changes have been made.
+ Bug Fixes
+ - Downloaded metadata review dialog: Fix a regression in the last
+ release that broke the revert buttons
+ - E-book viewer: Fix clicking links in the footnote popup
+ ignoring the anchor part of the link.
+ - ToC editor: Fix generating toc entries from links not working
+ for links that start with #
+ - HTML Input: Collapse multiple spaces in filenames when
+ sanitizing them.
+ - Edit book: Remove matching tag: Fix incorrect removal if the
+ remove matching function is triggered in rapid succession
+ - Edit book: Fix some links in the file being split not being
+ adjusted when splitting HTML files.
+ - Fix a crash when using some third party plugins and enabling
+ the "two lines for text under icons" option
+ - Make the create catalog dialog freely resizable
+ - DOCX Input: Fix an error when converting some DOCX files with
+ inherited fonts.
+
+-------------------------------------------------------------------
+Tue Aug 14 14:24:46 UTC 2018 - toddrme2...@gmail.com
+
+- Remove unneeded Python dependencies.
+- Use bundled BeautifulSoup.
+ BeautifulSoup is unmaintained upstream, so using the internal
+ version is the safest option.
+- Add missing dependencies.
+- spec files cleanups
+
+-------------------------------------------------------------------
+Mon Aug 13 22:16:18 UTC 2018 - car...@carmenbianca.eu
+
+- Individually link to Liberation font files to speed up launch
+ time [bsc#1104597]
+
+-------------------------------------------------------------------
Old:
----
calibre-3.29.0.tar.xz
calibre-3.29.0.tar.xz.sig
New:
----
calibre-3.30.0.tar.xz
calibre-3.30.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ calibre.spec ++++++
--- /var/tmp/diff_new_pack.JiUZHx/_old 2018-08-27 12:59:24.552820113 +0200
+++ /var/tmp/diff_new_pack.JiUZHx/_new 2018-08-27 12:59:24.552820113 +0200
@@ -17,7 +17,7 @@
Name: calibre
-Version: 3.29.0
+Version: 3.30.0
Release: 0
Summary: EBook Management Application
License: GPL-3.0-only
@@ -63,23 +63,25 @@
BuildRequires: podofo >= 0.8.2
BuildRequires: poppler-tools >= 0.20.2
BuildRequires: python >= 2.7.9
+# upstream use for PIL: BuildRequires: python-imaging >= 1.1.6
+BuildRequires: python-Pillow
+BuildRequires: python-Pygments >= 2.1.3
BuildRequires: python-apsw >= 3.7.17
-BuildRequires: python-beautifulsoup >= 3.0.5
# upstream use python-chardet 3.0.3
BuildRequires: python-chardet
-BuildRequires: python-cherrypy
-BuildRequires: python-cssselect >= 0.7.1
BuildRequires: python-cssutils >= 0.9.9
BuildRequires: python-dateutil >= 1.4.1
BuildRequires: python-devel >= 2.7.9
# upstream use python-dnspython 0.14.0
BuildRequires: python-dnspython >= 1.12.0
-BuildRequires: python-genshi
+BuildRequires: python-dukpy-kovidgoyal
BuildRequires: python-html5-parser
+BuildRequires: python-html5lib
BuildRequires: python-lxml >= 3.8.0
BuildRequires: python-mechanize >= 0.1.11
# upstream use python-msgpack-python 0.4.8
BuildRequires: python-msgpack-python >= 0.4.6
+BuildRequires: python-netifaces
BuildRequires: python-odfpy
BuildRequires: python-psutil >= 0.6.1
BuildRequires: python-qt5-devel >= 5.3.1
@@ -91,11 +93,10 @@
# calibre no longer depends on ImageMagick
# but keept BuildRequires to convert icon to serveral sizes
BuildRequires: pkgconfig(ImageMagick) >= 6.5.9
-# upstream use for PIL: BuildRequires: python-imaging >= 1.1.6
-BuildRequires: python-Pillow
Requires: chmlib >= 0.40
Requires: dbus-1-python >= 1.2.0
+Requires: liberation-fonts
Requires: libicu >= 4.4
Requires: libmtp9 >= 1.1.5
Requires: libwmf >= 0.2.8
@@ -103,17 +104,16 @@
Requires: podofo >= 0.8.2
Requires: poppler-tools >= 0.20.2
Requires: python >= 2.7.9
+Requires: python-Pillow
Requires: python-Pygments >= 2.1.3
Requires: python-apsw >= 3.7.17
-Requires: python-beautifulsoup >= 3.0.5
Requires: python-chardet
-Requires: python-cherrypy
-Requires: python-cssselect >= 0.7.1
Requires: python-cssutils >= 0.9.9
Requires: python-dateutil >= 1.4.1
Requires: python-dnspython >= 1.12.0
-Requires: python-genshi
+Requires: python-dukpy-kovidgoyal
Requires: python-html5-parser
+Requires: python-html5lib
Requires: python-lxml >= 3.8.0
Requires: python-mechanize >= 0.1.11
Requires: python-msgpack-python >= 0.4.6
@@ -126,13 +126,11 @@
Requires: python-sip >= 4.12.1
Requires: sqlite3
Requires: xdg-utils >= 1.0.2
-# upstream use for PIL: Requires: python-imaging >= 1.1.6
-Requires: python-Pillow
%requires_eq libQt5Core5
%requires_eq libQt5Gui5
%requires_eq python-qt5
%requires_eq python-sip
-Recommends: liberation-fonts
+Requires(pretrans): findutils
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{py_requires}
@@ -169,11 +167,6 @@
find src/calibre -name "*.py" -type f -exec chmod -x {} +
chmod -x recipes/*.recipe
-# remove bundled beautifulsoup
-rm -f src/calibre/ebooks/BeautifulSoup.py
-find "." -type f -name \*.py -exec \
- sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} +
-
# rpmlint: wrong-script-interpreter /usr/bin/env python2
find setup -type f | xargs sed -i -e 's:#!/usr/bin/env
python2:#!/usr/bin/python2:g'
@@ -208,30 +201,40 @@
%fdupes %{buildroot}/%{_prefix}
-# packages aren't allowed to register mimetypes like this
-rm -f %{buildroot}%{_datadir}/applications/defaults.list
-
# these are provided as separate packages
-rm -rf %{buildroot}%{_libdir}/%{name}/{odf,cherrypy,pyPdf,encutils,cssutils}
-rm -rf %{buildroot}%{_libdir}/%{name}/cal/utils/genshi
-rm -rf %{buildroot}%{_libdir}/%{name}/cal/trac
-# Also the Liberation fonts are provided as separate package
-# but need symlink
-rm -rf %{buildroot}%{_datadir}/%{name}/fonts/liberation
-ln -s %{_datadir}/fonts/truetype/
%{buildroot}%{_datadir}/%{name}/fonts/liberation
+rm -r %{buildroot}%{_libdir}/%{name}/odf
+
+# Also the Liberation fonts are provided as separate
+# packages, but a symbolic link to each is needed.
+for font in %{buildroot}%{_datadir}/%{name}/fonts/liberation/*.ttf
+do
+ rm ${font}
+ ln -s %{_datadir}/fonts/truetype/$(basename ${font})
%{buildroot}%{_datadir}/%{name}/fonts/liberation/
+done
# appdata file references calibre-gui.desktop, and .appdata.xml file should
necessarily have matching name with .desktop file in order for the app to show
up in Software Centres
mv %{buildroot}%{_datadir}/applications/calibre.desktop
%{buildroot}%{_datadir}/applications/calibre-gui.desktop
+# We don't need this
+rm %{buildroot}%{_bindir}/calibre-uninstall
+
# Remove all appdata.xml files but the main one, we do not install the
corresponding .desktop files
rm %{buildroot}%{_datadir}/metainfo/calibre-ebook-{edit,viewer}.appdata.xml
-# boo#1022710: fix upgrade from 13.2 to Leap
-# liberation has become a symlink in Leap and RPM does not like to overwrite a
directory with a symlink
+# bsc#1022710, bsc#1104597: fix upgrade
+# liberation had become a symlink in Leap and RPM does not like to overwrite a
directory with a symlink (or vice versa).
+# Later, liberation became a directory again.
+# This scriptlet supports both upgrade scenarios. Sort of.
+# When converting from a link into a directory, it will complain about
conflicting files with liberation-fonts.
%pretrans -p <lua>
-st = posix.stat("%{_datadir}/%{name}/fonts/liberation")
+path = "%{_datadir}/%{name}/fonts/liberation"
+st = posix.stat(path)
+if st and st.type == "link" then
+ os.remove(path)
+end
+-- This depends on the assumption that the directory should only contain
symbolic links.
if st and st.type == "directory" then
- os.execute("rm -rf %{_datadir}/%{name}/fonts/liberation")
+ os.execute("find " .. path .. " -type f -delete")
end
%post
@@ -244,9 +247,8 @@
%files
# -f %%{name}.lang -f iso639.lang
-%defattr(-,root,root)
+%license COPYRIGHT LICENSE LICENSE.rtf
%{_bindir}/*
-%exclude %{_bindir}/calibre-uninstall
%{_datadir}/applications/%{name}-gui.desktop
%dir %{_datadir}/icons/hicolor/512x512
%dir %{_datadir}/icons/hicolor/512x512/apps
++++++ calibre-3.29.0.tar.xz -> calibre-3.30.0.tar.xz ++++++
/work/SRC/openSUSE:Factory/calibre/calibre-3.29.0.tar.xz
/work/SRC/openSUSE:Factory/.calibre.new/calibre-3.30.0.tar.xz differ: char 25,
line 1
