From 02c6480717986abe9326423097a3cf9febe9802e Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Nov 29 2015 10:10:33 +0000 Subject: F24 only: rely on file triggers instead of update-desktop-database calls --- diff --git a/audacious.spec b/audacious.spec index 5304d26..9384904 100644 --- a/audacious.spec +++ b/audacious.spec @@ -1,5 +1,9 @@ ### Fedora >= 23 package +# removed scriptlet sections are >= F24 only so far, +# because desktop-file-utils package for F23 is not new enough +# https://lists.fedoraproject.org/archives/list/desktop%40lists.fedoraproject.org/thread/NTBNI7GVCM4MAEKFWNHDJXHPVMYQQSCS/ + # if without gtk2, build with gtk3 (requires a different source tarball) %bcond_without gtk2 # build with Qt @@ -7,7 +11,7 @@ Name: audacious Version: 3.7 -Release: 2%{?dist} +Release: 3%{?dist} %if %{with gtk2} %global tar_ver %{version} @@ -161,7 +165,9 @@ appstream-util validate-relax --nonet ${RPM_BUILD_ROOT}%{_datadir}/appdata/%{nam %post +%if 0%{?fedora} < 24 /usr/bin/update-desktop-database &> /dev/null || : +%fi /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun @@ -169,7 +175,9 @@ if [ $1 -eq 0 ] ; then /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi +%if 0%{?fedora} < 24 /usr/bin/update-desktop-database &> /dev/null || : +%fi %post libs -p /sbin/ldconfig @@ -207,6 +215,9 @@ fi %changelog +* Sun Nov 29 2015 Michael Schwendt - 3.7-3 +- F24 only: rely on file triggers instead of update-desktop-database calls + * Sun Nov 22 2015 Michael Schwendt - 3.7-2 - merge John Lindgren's commit to "Gracefully handle unexpected calls to exit()."