Hello community, here is the log from the commit of package calibre for openSUSE:Factory checked in at 2017-02-06 15:22:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2017-02-03 17:33:55.848719632 +0100 +++ /work/SRC/openSUSE:Factory/.calibre.new/calibre.changes 2017-02-06 15:22:40.487764060 +0100 @@ -1,0 +2,12 @@ +Fri Feb 3 23:28:38 UTC 2017 - [email protected] + +- Add conditional liberation2-fonts BuildRequires and Recommends + for Tumbleweed, it is better suited for the version of freetype2 + we have available. + +------------------------------------------------------------------- +Tue Jan 31 12:31:15 UTC 2017 - [email protected] + +- Fix boo#1022710: upgrade from 13.2 to Leap error + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calibre.spec ++++++ --- /var/tmp/diff_new_pack.U4ZN8a/_old 2017-02-06 15:22:41.687592522 +0100 +++ /var/tmp/diff_new_pack.U4ZN8a/_new 2017-02-06 15:22:41.691591950 +0100 @@ -50,7 +50,11 @@ BuildRequires: libQt5Core-private-headers-devel >= 5.3.2 BuildRequires: libQt5Gui-private-headers-devel >= 5.3.2 BuildRequires: libQt5PlatformSupport-private-headers-devel >= 5.3.2 +%if 0%{?suse_version} >= 1330 +BuildRequires: liberation2-fonts +%else BuildRequires: liberation-fonts +%endif BuildRequires: libicu-devel >= 4.4.0 BuildRequires: libmtp-devel >= 1.1.5 BuildRequires: libopenssl-devel @@ -123,7 +127,11 @@ %requires_eq libQt5Gui5 %requires_eq python-qt5 %requires_eq python-sip +%if 0%{?suse_version} >= 1330 +Recommends: liberation2-fonts +%else Recommends: liberation-fonts +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %{py_requires} @@ -218,6 +226,14 @@ # Remove all appdata.xml files but the main one, we do not install the corresponding .desktop files rm %{buildroot}%{_datadir}/appdata/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 +%pretrans -p <lua> +st = posix.stat("%{_datadir}/%{name}/fonts/liberation") +if st and st.type == "directory" then + os.execute("rm -rf %{_datadir}/%{name}/fonts/liberation") +end + %post %desktop_database_post %icon_theme_cache_post
