CWS-TOOLING: integrate CWS sysui31_DEV300

1 files changed, 25 insertions, 54 deletions

diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 517c1d39ee3c..a1007ca7fe53 100644
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -101,40 +101,24 @@ if [ "$1" = "1" ] ; then  # first install
   if (which update-mime-database); then
     update-mime-database /usr/share/mime
   fi
-
+fi
 
 
 #run always
-  for theme in gnome hicolor locolor; do
+for theme in gnome hicolor locolor; do
     if [ -e /usr/share/icons/$theme/icon-theme.cache ] ; then
-      # touch it, just in case we cannot find the binary...
-      touch /usr/share/icons/$theme
-      if [ -x /opt/gnome/bin/gtk-update-icon-cache ]; then
-        /opt/gnome/bin/gtk-update-icon-cache --ignore-theme-index -f /usr/share/icons/$theme
-      elif (which gtk-update-icon-cache); then
-        gtk-update-icon-cache -f /usr/share/icons/$theme
-      fi
-      # ignore errors (e.g. when there is a cache, but no index.theme)
-      #true
+        # touch it, just in case we cannot find the binary...
+        touch /usr/share/icons/$theme
+        if [ -x /opt/gnome/bin/gtk-update-icon-cache ]; then
+            /opt/gnome/bin/gtk-update-icon-cache -q /usr/share/icons/$theme 
+        elif (which gtk-update-icon-cache); then
+            gtk-update-icon-cache -q /usr/share/icons/$theme
+        fi
+        # ignore errors (e.g. when there is a cache, but no index.theme)
+        true
     fi
-  done
-fi
+done
 
-  
-#  for theme in gnome hicolor locolor; do
-#    if [ -e /usr/share/icons/$theme/icon-theme.cache ] ; then
-      # touch it, just in case we cannot find the binary...
-#      touch /usr/share/icons/$theme
-#      if [ -x /opt/gnome/bin/gtk-update-icon-cache ]; then
-#        /opt/gnome/bin/gtk-update-icon-cache -q /usr/share/icons/$theme 
-#      elif (which gtk-update-icon-cache); then
-#        gtk-update-icon-cache -q /usr/share/icons/$theme
-#      fi
-#      # ignore errors (e.g. when there is a cache, but no index.theme)
-#      true
-#    fi
-#  done
-#fi
 
 # update /etc/mime.types
 # backing out existing entries to avoid duplicates
@@ -310,36 +294,23 @@ if [ "$1" = 0 ] ; then # only run when erasing the package - other cases handled
   if (which update-mime-database); then
     update-mime-database /usr/share/mime
   fi
+fi
 
 #run always
-  for theme in gnome hicolor locolor; do
-    if [ -e /usr/share/icons/$theme/icon-theme.cache ] ; then
-      # touch it, just in case we cannot find the binary...
-      touch /usr/share/icons/$theme
-      if [ -x /opt/gnome/bin/gtk-update-icon-cache ]; then
-        /opt/gnome/bin/gtk-update-icon-cache --ignore-theme-index -f /usr/share/icons/$theme
-      elif (which gtk-update-icon-cache); then
-        gtk-update-icon-cache -f /usr/share/icons/$theme
-      fi
-      #true
+for theme in gnome hicolor locolor; do
+  if [ -e /usr/share/icons/$theme/icon-theme.cache ] ; then
+   # touch it, just in case we cannot find the binary...
+    touch /usr/share/icons/$theme
+    if [ -x /opt/gnome/bin/gtk-update-icon-cache ]; then
+      /opt/gnome/bin/gtk-update-icon-cache -q /usr/share/icons/$theme
+    elif (which gtk-update-icon-cache); then
+      gtk-update-icon-cache -q /usr/share/icons/$theme
     fi
-  done
-fi
-
-#for theme in gnome hicolor locolor; do
-#  if [ -e /usr/share/icons/$theme/icon-theme.cache ] ; then
-    # touch it, just in case we cannot find the binary...
-#    touch /usr/share/icons/$theme
-#    if [ -x /opt/gnome/bin/gtk-update-icon-cache ]; then
-#      /opt/gnome/bin/gtk-update-icon-cache -q /usr/share/icons/$theme
-#    elif (which gtk-update-icon-cache); then
-#      gtk-update-icon-cache -q /usr/share/icons/$theme
-#    fi
     # ignore errors (e.g. when there is a cache, but no index.theme)
-#    true
-#  fi
-#done
-#fi
+    true
+  fi
+done
+
 %files 
 # specify stale symlinks verbatim, not as glob - a change in recent versions of 
 # glibc breaks rpm unless rpm is build with internal glob-matching (issue 49374)