From c2254d7fac160520863ee6735e498b34becb838fb16e46abe453da017c5fb7ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 25 Apr 2018 08:47:27 +0000 Subject: [PATCH] - Do not require update-desktop-files on 15+ bsc#1090737 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=652 --- libreoffice.changes | 5 +++++ libreoffice.spec | 12 ++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index b738710..06ed87e 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 25 08:46:16 UTC 2018 - tchvatal@suse.com + +- Do not require update-desktop-files on 15+ bsc#1090737 + ------------------------------------------------------------------- Wed Apr 25 06:27:49 UTC 2018 - guillaume.gardet@opensuse.org diff --git a/libreoffice.spec b/libreoffice.spec index 159c5a8..c6feb96 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -232,8 +232,6 @@ Requires: libreoffice-branding >= 6.0 Requires: libreoffice-icon-themes = %{version} Requires: libreoffice-l10n-en = %{version} Requires: python3 -Requires(post): update-desktop-files -Requires(postun): update-desktop-files Recommends: dejavu-fonts Recommends: google-carlito-fonts Provides: %{name}-draw-extensions = %{version} @@ -255,6 +253,10 @@ Obsoletes: %{name}-icon-theme-crystal < %{version} Provides: %{name}-icon-theme-oxygen = %{version} Obsoletes: %{name}-icon-theme-oxygen < %{version} ExclusiveArch: aarch64 %{ix86} x86_64 +%if 0%{?suse_version} < 1500 +Requires(post): update-desktop-files +Requires(postun): update-desktop-files +%endif %if %{with gtk3} BuildRequires: pkgconfig(glib-2.0) >= 2.40 BuildRequires: pkgconfig(gtk+-3.0) @@ -1284,9 +1286,11 @@ export SRCDIR="./" %post /sbin/ldconfig +%if 0%{?suse_version} < 1500 %mime_database_post %desktop_database_post %icon_theme_cache_post +%endif %preun uno_cache="%{_libdir}/%{name}/share/uno_packages/cache/uno_packages/" @@ -1297,10 +1301,13 @@ exit 0 %postun /sbin/ldconfig +%if 0%{?suse_version} < 1500 %icon_theme_cache_postun %desktop_database_postun %mime_database_postun +%endif +%if 0%{?suse_version} < 1500 %post base %desktop_database_post @@ -1336,6 +1343,7 @@ exit 0 %postun writer %desktop_database_postun +%endif %_link_noarch_files icon-themes