From 2a7df5704ae13903e4da413dd459f4703eaf71eca211f19262980be210a93a4c Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 8 Aug 2019 16:36:17 +0000 Subject: [PATCH 1/2] Accepting request 720078 from home:sbrabec:branches:X11:common:Factory - Remove BuildRequires: xz. Unpacking xz now works out of the box. - Mute %filetriggerpostun on uninstall. OBS-URL: https://build.opensuse.org/request/show/720078 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/desktop-file-utils?expand=0&rev=72 --- desktop-file-utils.changes | 6 ++++++ desktop-file-utils.spec | 10 +++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/desktop-file-utils.changes b/desktop-file-utils.changes index 4a32597..78b5863 100644 --- a/desktop-file-utils.changes +++ b/desktop-file-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 31 16:41:20 CEST 2019 - sbrabec@suse.com + +- Remove BuildRequires: xz. Unpacking xz now works out of the box. +- Mute %filetriggerpostun on uninstall. + ------------------------------------------------------------------- Fri Jul 19 22:06:36 CEST 2019 - sbrabec@suse.com diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 1702f8e..2893ed5 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -32,8 +32,10 @@ Patch0: desktop-file-utils-suse-keys.patch Patch1: desktop-file-utils-add-Pantheon.patch BuildRequires: glib2-devel BuildRequires: pkg-config -BuildRequires: xz #!BuildIgnore: dbus-1-x11 +# We need explicit requirement here, as these are required by +# %%filetriggerin that could be started early during the installation +# process. Requires: aaa_base Requires: awk Requires: coreutils @@ -75,8 +77,10 @@ touch %{buildroot}%{_datadir}/applications/mimeinfo.cache %{_bindir}/suse-update-mime-defaults || true %filetriggerpostun -- %{_datadir}/applications -%{_bindir}/update-desktop-database --quiet %{_datadir}/applications || true -%{_bindir}/suse-update-mime-defaults || true +if test -f %{_bindir}/update-desktop-database ; then + %{_bindir}/update-desktop-database --quiet %{_datadir}/applications || true + %{_bindir}/suse-update-mime-defaults || true +fi %files %defattr(-, root, root) From 4eb4de82d86b8255c1e0deb0aefe6879a1ca26b7e8d7c06af0cb56a4a95949ed Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 8 Aug 2019 16:37:10 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/desktop-file-utils?expand=0&rev=73 --- desktop-file-utils.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/desktop-file-utils.spec b/desktop-file-utils.spec index 2893ed5..eb3c3d0 100644 --- a/desktop-file-utils.spec +++ b/desktop-file-utils.spec @@ -77,9 +77,9 @@ touch %{buildroot}%{_datadir}/applications/mimeinfo.cache %{_bindir}/suse-update-mime-defaults || true %filetriggerpostun -- %{_datadir}/applications -if test -f %{_bindir}/update-desktop-database ; then - %{_bindir}/update-desktop-database --quiet %{_datadir}/applications || true - %{_bindir}/suse-update-mime-defaults || true +if test -x %{_bindir}/update-desktop-database ; then + %{_bindir}/update-desktop-database --quiet %{_datadir}/applications || true + %{_bindir}/suse-update-mime-defaults || true fi %files