From 77fc0d91e97a0233f58a9c34266f3fbcae8babfa Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 13 Apr 2019 10:49:53 -0500 Subject: [PATCH] simplify scriptlets (bug #1699280) --- breeze-icon-theme.spec | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/breeze-icon-theme.spec b/breeze-icon-theme.spec index d49c6c8..14f8e89 100644 --- a/breeze-icon-theme.spec +++ b/breeze-icon-theme.spec @@ -7,7 +7,7 @@ Name: breeze-icon-theme Summary: Breeze icon theme Version: 5.57.0 -Release: 1%{?dist} +Release: 2%{?dist} # http://techbase.kde.org/Policies/Licensing_Policy License: LGPLv3+ @@ -101,30 +101,17 @@ test "$(grep '^Inherits=' %{buildroot}%{_datadir}/icons/breeze-dark/index.theme) %if 0%{?fedora} > 25 || 0%{?rhel} > 7 ## trigger-based scriptlets -%filetriggerin -- %{_datadir}/icons/breeze -touch %{_datadir}/icons/breeze &> /dev/null || : +%transfiletriggerin -- %{_kf5_datadir}/icons/breeze +gtk-update-icon-cache --force %{_kf5_datadir}/icons/breeze &>/dev/null || : -%filetriggerin -- %{_datadir}/icons/breeze-dark -touch %{_datadir}/icons/breeze-dark &> /dev/null || : +transfiletriggerin -- %{_kf5_datadir}/icons/breeze-dark +gtk-update-icon-cache --force %{_kf5_datadir}/icons/breeze-dark &>/dev/null || : -%transfiletriggerin -- %{_datadir}/icons/breeze -gtk-update-icon-cache %{_datadir}/icons/breeze &>/dev/null || : +%transfiletriggerpostun -- %{_kf5_datadir}/icons/breeze +gtk-update-icon-cache --force %{_kf5_datadir}/icons/breeze &>/dev/null || : -%transfiletriggerin -- %{_datadir}/icons/breeze-dark -gtk-update-icon-cache %{_datadir}/icons/breeze-dark &>/dev/null || : - -# arg, looks like this case cannot be handled by triggers? -- rex -%postun -if [ $1 -eq 0 ] ; then -touch --no-create %{_datadir}/icons/breeze &> /dev/null || : -touch --no-create %{_datadir}/icons/breeze-dark &> /dev/null || : -fi - -%transfiletriggerpostun -- %{_datadir}/icons/breeze -gtk-update-icon-cache %{_datadir}/icons/breeze &>/dev/null || : - -%transfiletriggerpostun -- %{_datadir}/icons/breeze-dark -gtk-update-icon-cache %{_datadir}/icons/breeze-dark &>/dev/null || : +%transfiletriggerpostun -- %{_kf5_datadir}/icons/breeze-dark +gtk-update-icon-cache --force %{_kf5_datadir}/icons/breeze-dark &>/dev/null || : %else ## classic scriptlets @@ -161,6 +148,9 @@ fi %changelog +* Sat Apr 13 2019 Rex Dieter - 5.57.0-2 +- simplify scriptlets (bug #1699280) + * Mon Apr 08 2019 Rex Dieter - 5.57.0-1 - 5.57.0