From 675137bf6b40fed7e2c335949ab6ab67feb69aaa Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: May 10 2013 21:41:39 +0000 Subject: update scriptlets to follow current guidelines for updating icon cache --- diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index bcb2bea..8e0469a 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -644,10 +644,7 @@ alternatives \ update-desktop-database %{_datadir}/applications &> /dev/null || : -touch --no-create %{_datadir}/icons/hicolor -if [ -x %{_bindir}/gtk-update-icon-cache ] ; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor -fi +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : exit 0 @@ -661,13 +658,16 @@ fi update-desktop-database %{_datadir}/applications &> /dev/null || : -touch --no-create %{_datadir}/icons/hicolor -if [ -x %{_bindir}/gtk-update-icon-cache ] ; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor +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 || : fi exit 0 +%posttrans +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + %post devel ext=.gz alternatives \ @@ -900,6 +900,9 @@ exit 0 %doc %{buildoutputdir}/images/j2sdk-image/jre/LICENSE %changelog +* Fri May 10 2013 Adam Williamson +- update scriptlets to follow current guidelines for updating icon cache + * Tue Apr 30 2013 Omair Majid 1:1.8.0.0-0.5.b87 - Update to b87 - Remove all rhino support; use nashorn instead