[caja] optimize/update scriptlets

[Rex Dieter]

commit a7e2a0c0af33758e65803262a80eff99ca22567d
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Tue Jul 8 13:36:12 2014 -0500

    optimize/update scriptlets

 caja.spec |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/caja.spec b/caja.spec
index d50ac01..ce257e0 100644
--- a/caja.spec
+++ b/caja.spec
@@ -15,7 +15,7 @@
 Name:        caja
 Summary:     File manager for MATE
 Version:     %{branch}.1
-Release:     2%{?dist}
+Release:     3%{?dist}
 #Release:     0.1%{?git_rel}%{?dist}
 License:     GPLv2+ and LGPLv2+
 Group:       User Interface/Desktops
@@ -162,24 +162,22 @@ rm -f  $RPM_BUILD_ROOT%{_datadir}/MateConf/gsettings/caja.convert
 
 
 %post
-/sbin/ldconfig
-/bin/touch --no-create %{_datadir}/icons/hicolor >& /dev/null || :
-/usr/bin/update-desktop-database &> /dev/null || :
-/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+/bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || :
 
 %postun
-/sbin/ldconfig
-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 || :
+if [ $1 -eq 0 ] ; then
+  /bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+  /bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+  /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
   /usr/bin/update-desktop-database &> /dev/null || :
-  /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
+  /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 fi
 
-
 %posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor >& /dev/null || :
-/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+/usr/bin/update-desktop-database &> /dev/null || :
+/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 %post extensions -p /sbin/ldconfig
 
@@ -201,8 +199,7 @@ fi
 %{_libdir}/caja/
 %{_datadir}/pixmaps/caja/
 %{_datadir}/applications/*.desktop
-%{_datadir}/icons/hicolor/*/apps/caja.png
-%{_datadir}/icons/hicolor/scalable/apps/caja.svg
+%{_datadir}/icons/hicolor/*/apps/caja.*
 %{_datadir}/icons/hicolor/*/emblems/emblem-note.png
 %{_mandir}/man1/*
 %{_libexecdir}/caja-convert-metadata
@@ -225,6 +222,9 @@ fi
 
 
 %changelog
+* Tue Jul 08 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.1-3
+- optimize/update scriptlets
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild