diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-10-05 11:57:23 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-10-05 11:57:23 +0000 |
| commit | f621a67eb4ec959ecbadcf26c95cfec7aa83c017 (patch) | |
| tree | aef6ba8a9c29ba3ed1fa5d1fc1fab1eaa9bebf30 /sysui/desktop | |
| parent | fd7da2305662532d986a67bbcb0e46f74526243a (diff) | |
INTEGRATION: CWS sysui11 (1.8.2); FILE MERGED
2005/09/13 06:28:53 obr 1.8.2.4: RESYNC: (1.10-1.11); FILE MERGED
2005/09/01 05:57:38 obr 1.8.2.3: RESYNC: (1.9-1.10); FILE MERGED
2005/08/24 08:53:58 obr 1.8.2.2: RESYNC: (1.8-1.9); FILE MERGED
2005/08/16 13:21:03 obr 1.8.2.1: #i52807# triggerin now runs only for initial install, updates are handled by new triggerpostun
Diffstat (limited to 'sysui/desktop')
| -rw-r--r-- | sysui/desktop/freedesktop/freedesktop-menus.spec | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec index 92a6ae00a40c..7eba57277305 100644 --- a/sysui/desktop/freedesktop/freedesktop-menus.spec +++ b/sysui/desktop/freedesktop/freedesktop-menus.spec @@ -89,25 +89,7 @@ export NO_BRP_STALE_LINK_ERROR=yes cd .. rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%name-%version-build%unique -%triggerin -- openoffice.org-core01 -# create file in /etc that contains the office installation path -cat > /tmp/install.$$ << EOF -sleep 2 -coreprefix=\`rpm -q --qf '%{INSTALLPREFIX}' openoffice.org-core01\` -# non-patched epm cannot create relocatable packages -if [ \$coreprefix == "(none)" ]; then - coreprefix="/opt/openoffice.org%version" -fi -ln -snf \$coreprefix /etc/%unixfilename -# needed here as as well since execution of this one is delayed, the link is -# not intact when the other triggers are run before this one -if (which update-desktop-database); then - 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-math # this is run when one of the above packages is already installed and the menu |