[setroubleshoot] optimize/update scriptlets don't own icons/hicolor drop %config tag on applications/*.desktop

Rex Dieter rdieter at fedoraproject.org
Fri Dec 23 15:44:00 UTC 2011


commit 28f2ad885c4e7f99c9886f9b8d34c01fbce34973
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Dec 23 09:43:57 2011 -0600

    optimize/update scriptlets
    don't own icons/hicolor
    drop %config tag on applications/*.desktop

 setroubleshoot.spec |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/setroubleshoot.spec b/setroubleshoot.spec
index 4e644c6..f39796a 100644
--- a/setroubleshoot.spec
+++ b/setroubleshoot.spec
@@ -1,7 +1,7 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
 Version: 3.0.45
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/setroubleshoot
@@ -58,24 +58,27 @@ to user preference. The same tools can be run on existing log files.
 %defattr(-,root,root,-)
 %{pkgguidir}
 %config(noreplace) %{_sysconfdir}/xdg/autostart/*
-%config %{_datadir}/applications/*.desktop
+%{_datadir}/applications/*.desktop
 %{_datadir}/dbus-1/services/sealert.service
-%{_datadir}/icons/hicolor
+%{_datadir}/icons/hicolor/*/*/*
 %dir %attr(0755,root,root) %{pkgpythondir}
 %{pkgpythondir}/browser.py*
 %{pkgpythondir}/gui_utils.py*
 %{_bindir}/seapplet
 
 %post
-/usr/bin/desktop-file-install %{_datadir}/applications 2> /dev/null
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 dbus-send --system /com/redhat/setroubleshootd com.redhat.SEtroubleshootdIface.restart string:'rpm install' >/dev/null 2>&1 || :
 
 %postun
-/usr/bin/update-desktop-database %{_datadir}/applications 2> /dev/null
-touch --no-create %{_datadir}/icons/hicolor
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%posttrans
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 
 %prep
 %setup -q
@@ -202,6 +205,11 @@ Setroubleshoot documentation package
 %{pkgdocdir}/setroubleshoot*
 
 %changelog
+* Fri Dec 23 2011 Rex Dieter <rdieter at fedoraproject.org> 3.0.45-2
+- optimize/update scriptlets
+- don't own icons/hicolor
+- drop %%config tag on applications/*.desktop
+
 * Tue Dec 19 2011  <dwalsh at redhat.com> - 3.0.45-1
 - Patch from Mgrepl to stop printable from crashing if None is passed in
 - Update to latest translations


More information about the scm-commits mailing list