summaryrefslogtreecommitdiff
path: root/sysui/desktop/suse
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-10-05 12:02:20 +0000
committerKurt Zenker <kz@openoffice.org>2005-10-05 12:02:20 +0000
commit5f420b1e95df4fda614c33aee277228673e38481 (patch)
tree10e497a4f813a887db3aae0841f5dd5f9e274df0 /sysui/desktop/suse
parent791a6b61c570032ca1e5b5fceff0dbe8901cca48 (diff)
INTEGRATION: CWS sysui11 (1.18.2); FILE MERGED
2005/09/13 06:31:30 obr 1.18.2.4: RESYNC: (1.20-1.21); FILE MERGED 2005/09/01 05:58:04 obr 1.18.2.3: RESYNC: (1.19-1.20); FILE MERGED 2005/08/24 08:54:29 obr 1.18.2.2: RESYNC: (1.18-1.19); FILE MERGED 2005/08/16 13:21:13 obr 1.18.2.1: #i52807# triggerin now runs only for initial install, updates are handled by new triggerpostun
Diffstat (limited to 'sysui/desktop/suse')
-rw-r--r--sysui/desktop/suse/suse-menus.spec19
1 files changed, 1 insertions, 18 deletions
diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec
index b8dba2adc4..1afe032284 100644
--- a/sysui/desktop/suse/suse-menus.spec
+++ b/sysui/desktop/suse/suse-menus.spec
@@ -53,24 +53,7 @@ for dir in *; do
ln -sf ../../../gnome/$dir/mimetypes/$iconname-text-template.png ../hicolor/$dir/mimetypes/gnome-mime-application-vnd.sun.xml.writer.template.png
done
-%triggerin -- openoffice.org-core01
-# create file in /etc that contains the office installation path
-cat > /tmp/install.$$ << EOF
-while [ "\$TARGET" == "" ]
-do
- sleep 2
- TARGET=\`rpm -q --qf '%{INSTALLPREFIX}' openoffice.org-core01 2>&1\` && ln -snf \$TARGET /etc/%unixfilename
- # some rpm versions do not wait for the shared lock
- echo \$TARGET | grep '/var/lib/rpm' && TARGET=""
-done
-if [ -x /opt/gnome/bin/update-desktop-database ]; then
- /opt/gnome/bin/update-desktop-database -q /usr/share/applications
-fi
-rm -f /tmp/install.$$
-EOF
-
-/bin/sh /tmp/install.$$ &
-
+#include<symlink_triggers>
%triggerin -- openoffice.org-writer, openoffice.org-calc, openoffice.org-draw, openoffice.org-impress, openoffice.org-base, openoffice.org-math
if [ -x /opt/gnome/bin/update-desktop-database -a -h /etc/%unixfilename ]; then