summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2005-02-07 14:31:40 +0000
committerRüdiger Timm <rt@openoffice.org>2005-02-07 14:31:40 +0000
commit2e631716576d8a4055aa4ae4b15ea4cd575d4312 (patch)
tree8702cea99fb11f22f926298e98786c1e347f6ba1
parent82c938f9fbdd12c1eda71e0d4852fdeb33304e48 (diff)
INTEGRATION: CWS sysui04 (1.9.2); FILE MERGED
2005/02/07 14:36:08 obr 1.9.2.1: some rpm versions do not wait for the shared lock
-rw-r--r--sysui/desktop/redhat/redhat-menus.spec9
1 files changed, 7 insertions, 2 deletions
diff --git a/sysui/desktop/redhat/redhat-menus.spec b/sysui/desktop/redhat/redhat-menus.spec
index 2776a352fb39..272eb93b6e69 100644
--- a/sysui/desktop/redhat/redhat-menus.spec
+++ b/sysui/desktop/redhat/redhat-menus.spec
@@ -14,8 +14,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