[kdeutils/f16] kgpg: move some service menus here (from ark) kdf: fixup scriptlets

[Rex Dieter]

commit 0096f3674b9a3175a90dbaaeb42e34a5c632d0ec
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Nov 28 11:17:12 2011 -0600

    kgpg: move some service menus here (from ark)
    kdf: fixup scriptlets

 kdeutils.spec |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)
---
diff --git a/kdeutils.spec b/kdeutils.spec
index 35c7aa6..a97dd96 100644
--- a/kdeutils.spec
+++ b/kdeutils.spec
@@ -5,7 +5,7 @@
 Name: kdeutils
 Epoch: 6
 Version: 4.7.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE Utilities
 
 Group: Applications/System
@@ -293,9 +293,6 @@ fi
 %{_kde4_datadir}/kde4/servicetypes/kerfufflePlugin.desktop
 %{_kde4_libdir}/kde4/kerfuffle*.so
 %{_kde4_libdir}/kde4/libextracthere.so
-%{_kde4_datadir}/kde4/services/ServiceMenus/encryptfile.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/encryptfolder.desktop
-%{_kde4_datadir}/kde4/services/ServiceMenus/viewdecrypted.desktop
 %{_mandir}/man1/ark.1*
 
 %post ark-libs -p /sbin/ldconfig
@@ -341,12 +338,16 @@ fi
 %{_kde4_appsdir}/kconf_update/kcharselect.upd
 %{_kde4_datadir}/applications/kde4/KCharSelect.desktop
 
-%posttrans kfloppy 
-update-desktop-database -q &> /dev/null ||:
+%post kfloppy
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+
+%posttrans kfloppy
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 
-%postun kfloppy 
+%postun kfloppy
 if [ $1 -eq 0 ] ; then
-update-desktop-database -q &> /dev/null ||:
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 fi
 
 %files kfloppy -f kfloppy.lang
@@ -397,15 +398,15 @@ fi
 %files minimal
 # empty
 
-%post
+%post kdf
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
-%posttrans
+%posttrans kdf
 gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||:
 
-%postun
+%postun kdf
 if [ $1 -eq 0 ] ; then
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
 touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
@@ -448,6 +449,9 @@ fi
 %{_kde4_datadir}/autostart/kgpg.desktop
 %{_kde4_iconsdir}/hicolor/*/apps/kgpg.*
 %{_kde4_datadir}/applications/kde4/kgpg.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/encryptfile.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/encryptfolder.desktop
+%{_kde4_datadir}/kde4/services/ServiceMenus/viewdecrypted.desktop
 
 %post kremotecontrol
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
@@ -534,6 +538,10 @@ fi
 
 
 %changelog
+* Mon Nov 28 2011 Rex Dieter <rdieter at fedoraproject.org> 6:4.7.3-2
+- kgpg: move some service menus here (from ark)
+- kdf: fixup scriptlets
+
 * Mon Oct 31 2011 Rex Dieter <rdieter at fedoraproject.org> 6:4.7.3-1
 - 4.7.3
 - pkgconfig-style deps