summaryrefslogtreecommitdiff
path: root/sysui/desktop
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-09-02 10:52:30 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-09-02 10:52:30 +0000
commiteb71e8a813d8580f08e7fc388e4523958d8915b5 (patch)
tree74353445b869c70bf14228b8298fa1a23a328ffd /sysui/desktop
parent6c53e54d25f0bea4183e3e4121390d80050bdb5a (diff)
INTEGRATION: CWS sysui30_DEV300 (1.22.10); FILE MERGED
2008/08/27 12:40:38 ihi 1.22.10.1: #i92874# 3-layer-office fix
Diffstat (limited to 'sysui/desktop')
-rw-r--r--sysui/desktop/freedesktop/freedesktop-menus.spec87
1 files changed, 62 insertions, 25 deletions
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 793c95629878..517c1d39ee3c 100644
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -92,29 +92,50 @@ fi
# afterwards
if [ "$1" = "1" ] ; then # first install
-if [ -x /opt/gnome/bin/update-desktop-database ]; then
+ if [ -x /opt/gnome/bin/update-desktop-database ]; then
/opt/gnome/bin/update-desktop-database -q
-elif (which update-desktop-database); then
- update-desktop-database -q /usr/share/applications
-fi
+ elif (which update-desktop-database); then
+ update-desktop-database -q /usr/share/applications
+ fi
+
if (which update-mime-database); then
update-mime-database /usr/share/mime
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 -q /usr/share/icons/$theme
+ /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 -q /usr/share/icons/$theme
+ gtk-update-icon-cache -f /usr/share/icons/$theme
fi
# ignore errors (e.g. when there is a cache, but no index.theme)
- true
+ #true
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
+
# update /etc/mime.types
# backing out existing entries to avoid duplicates
sed '
@@ -280,29 +301,45 @@ fi
%postun
if [ "$1" = 0 ] ; then # only run when erasing the package - other cases handled by the triggers
-if [ -x /opt/gnome/bin/update-desktop-database ]; then
+ if [ -x /opt/gnome/bin/update-desktop-database ]; then
/opt/gnome/bin/update-desktop-database -q
-elif (which update-desktop-database); then
- update-desktop-database -q
-fi
+ elif (which update-desktop-database); then
+ update-desktop-database -q
+ fi
# run always - both when upgrading as well as when erasing the package
-if (which update-mime-database); then
- update-mime-database /usr/share/mime
+ if (which update-mime-database); then
+ update-mime-database /usr/share/mime
+ 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
+ fi
+ done
fi
-for theme in gnome hicolor locolor; do
- if [ -e /usr/share/icons/$theme/icon-theme.cache ] ; then
+
+#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
+# 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
+#fi
%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)