summaryrefslogtreecommitdiff
path: root/sysui/desktop/suse
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2005-02-07 14:32:12 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2005-02-07 14:32:12 +0000
commit4e56474520d44b7a7e5852616d890bf8d470266d (patch)
tree0c4c95cd65fe9cc59d8e98edf37227b9abb9c40a /sysui/desktop/suse
parent6ac198fee42461dd3c06a1ea890101e6b3c9f673 (diff)
INTEGRATION: CWS sysui04 (1.10.2); FILE MERGED
2005/02/07 14:36:07 obr 1.10.2.1: some rpm versions do not wait for the shared lock
Diffstat (limited to 'sysui/desktop/suse')
-rw-r--r--sysui/desktop/suse/suse-menus.spec9
1 files changed, 7 insertions, 2 deletions
diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec
index 1e7cec35fc8e..62e197dff782 100644
--- a/sysui/desktop/suse/suse-menus.spec
+++ b/sysui/desktop/suse/suse-menus.spec
@@ -13,8 +13,13 @@ OpenOffice.org desktop integration
%triggerin -- openofficeorg-core01
# create file in /etc that contains the office installation path
cat > /tmp/install.$$ << EOF
-sleep 2
-ln -sf \`rpm -q --qf '%{INSTALLPREFIX}' openofficeorg-core01\` /etc/%PREFIX
+while [ "\$TARGET" == "" ]
+do
+ sleep 2
+ TARGET=\`rpm -q --qf '%{INSTALLPREFIX}' openofficeorg-core01 2>&1\` && ln -sf \$TARGET /etc/%PREFIX
+ # some rpm versions do not wait for the shared lock
+ echo \$TARGET | grep '/var/lib/rpm' && TARGET=""
+done
rm -f /tmp/install.$$
EOF