summaryrefslogtreecommitdiff
path: root/sysui/desktop
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2005-08-05 13:57:02 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2005-08-05 13:57:02 +0000
commit4ae3871eb9bfacb1e2270e7755642c0b0558d8dd (patch)
tree26245b1284bb1df5ad6eb223be5dac19ddda6562 /sysui/desktop
parent3123192811cbf4d1ea91f0049f415b1918cfa053 (diff)
INTEGRATION: CWS sysui10 (1.16.4); FILE MERGED
2005/08/02 06:08:32 obr 1.16.4.2: #i52018# added -q parameter to update-desktop-database calls 2005/07/29 13:11:00 obr 1.16.4.1: #i52532# fixed typo in icon symlinks
Diffstat (limited to 'sysui/desktop')
-rw-r--r--sysui/desktop/redhat/redhat-menus.spec16
1 files changed, 8 insertions, 8 deletions
diff --git a/sysui/desktop/redhat/redhat-menus.spec b/sysui/desktop/redhat/redhat-menus.spec
index a30cdc1f9fde..4ddfc18ea0aa 100644
--- a/sysui/desktop/redhat/redhat-menus.spec
+++ b/sysui/desktop/redhat/redhat-menus.spec
@@ -36,15 +36,15 @@ for dir in *; do
ln -sf $iconname-oasis-master-document.png gnome-mime-application-vnd.oasis.opendocument.text-master.png
ln -sf $iconname-oasis-presentation.png gnome-mime-application-vnd.oasis.opendocument.presentation.png
ln -sf $iconname-oasis-presentation-template.png gnome-mime-application-vnd.oasis.opendocument.presentation-template.png
- ln -sf $iconname-oasis-sfpreadsheet.png gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png
- ln -sf $iconname-oasis-sfpreadsheet-template.png gnome-mime-application-vnd.oasis.opendocument.spreadsheet-template.png
+ ln -sf $iconname-oasis-spreadsheet.png gnome-mime-application-vnd.oasis.opendocument.spreadsheet.png
+ ln -sf $iconname-oasis-spreadsheet-template.png gnome-mime-application-vnd.oasis.opendocument.spreadsheet-template.png
ln -sf $iconname-oasis-text.png gnome-mime-application-vnd.oasis.opendocument.text.png
ln -sf $iconname-oasis-text-template.png gnome-mime-application-vnd.oasis.opendocument.text-template.png
ln -sf $iconname-oasis-web-template.png gnome-mime-application-vnd.oasis.opendocument.text-web.png
ln -sf $iconname-presentation.png gnome-mime-application-vnd.sun.xml.impress.png
ln -sf $iconname-presentation-template.png gnome-mime-application-vnd.sun.xml.impress.template.png
- ln -sf $iconname-sfpreadsheet.png gnome-mime-application-vnd.sun.xml.calc.png
- ln -sf $iconname-sfpreadsheet-template.png gnome-mime-application-vnd.sun.xml.calc.template.png
+ ln -sf $iconname-spreadsheet.png gnome-mime-application-vnd.sun.xml.calc.png
+ ln -sf $iconname-spreadsheet-template.png gnome-mime-application-vnd.sun.xml.calc.template.png
ln -sf $iconname-text.png gnome-mime-application-vnd.sun.xml.writer.png
ln -sf $iconname-text-template.png gnome-mime-application-vnd.sun.xml.writer.template.png
cd ../..
@@ -61,7 +61,7 @@ do
echo \$TARGET | grep '/var/lib/rpm' && TARGET=""
done
if [ -x /usr/bin/update-desktop-database ]; then
- update-desktop-database /usr/share/applications
+ update-desktop-database -q /usr/share/applications
fi
rm -f /tmp/install.$$
EOF
@@ -70,7 +70,7 @@ EOF
%triggerin -- openofficeorg-writer, openofficeorg-calc, openofficeorg-draw, openofficeorg-impress, openofficeorg-base, openofficeorg-math
if [ -x /usr/bin/update-desktop-database -a -h /etc/%unixfilename ]; then
- update-desktop-database /usr/share/applications
+ update-desktop-database -q /usr/share/applications
fi
%triggerun -- openofficeorg-writer, openofficeorg-calc, openofficeorg-draw, openofficeorg-impress, openofficeorg-base, openofficeorg-math
@@ -81,7 +81,7 @@ fi
if [ "$2" = "0" ] ; then
# the triggering package gets removed
if [ -x /usr/bin/update-desktop-database ]; then
- update-desktop-database /usr/share/applications
+ update-desktop-database -q /usr/share/applications
fi
fi
@@ -254,7 +254,7 @@ fi
# previously or updates already handled by triggers.
if [ "$1" = 0 ] ; then
if [ -x /usr/bin/update-desktop-database ]; then
- update-desktop-database /usr/share/applications
+ update-desktop-database -q /usr/share/applications
fi
if [ -x /usr/bin/update-mime-database ]; then
update-mime-database /usr/share/mime