From 653f10c855d86f6a24fe320a955f11dd253b7d27 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sep 27 2017 13:46:39 +0000 Subject: update %%files, skip scriplets where triggers are used instead --- diff --git a/kmail.spec b/kmail.spec index 22ea715..a2ab6b9 100644 --- a/kmail.spec +++ b/kmail.spec @@ -157,6 +157,7 @@ dbus-launch --exit-with-session \ make test ARGS="--output-on-failure --timeout 20" -C %{_target_platform} ||: %endif + # symlink replaced by dir in 16 -> 17 upgrade # https://fedoraproject.org/wiki/Packaging:Directory_Replacement %pretrans -p @@ -166,19 +167,25 @@ if st and st.type == "link" then os.remove(path) end +%if 0%{?fedora} < 26 %post +touch --no-create %{_kf5_datadir}/icons/breeze-dark &> /dev/null ||: touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null ||: %posttrans +gtk-update-icon-cache %{_kf5_datadir}/icons/breeze-dark &> /dev/null ||: gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null ||: update-desktop-database -q &> /dev/null ||: %postun if [ $1 -eq 0 ] ; then +touch --no-create %{_kf5_datadir}/icons/breeze-dark &> /dev/null ||: +gtk-update-icon-cache %{_kf5_datadir}/icons/breeze-dark &> /dev/null ||: touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null ||: gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor &> /dev/null ||: update-desktop-database -q &> /dev/null ||: fi +%endif %files -f %{name}.lang %license COPYING* @@ -194,6 +201,7 @@ fi %{_kf5_datadir}/kservices5/ServiceMenus/kmail_addattachmentservicemenu.desktop %{_datadir}/dbus-1/interfaces/org.kde.kmail.*.xml %{_kf5_datadir}/icons/hicolor/*/*/* +%{_kf5_datadir}/icons/breeze-dark/*/*/* %{_kf5_datadir}/kconf_update/kmail.upd %{_kf5_datadir}/applications/kmail_view.desktop %{_kf5_datadir}/knotifications5/kmail2.notifyrc