diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-04-20 10:36:52 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-04-20 10:36:52 +0000 |
| commit | 275032aceb2daa1f00dc4e5158006b468952789c (patch) | |
| tree | 8bde0ce6102a9ac841061b65396f8d0328deba18 /sysui/desktop/suse | |
| parent | dcf43963dbe92d415b92558a7ff795502b516004 (diff) | |
INTEGRATION: CWS nativefixer6 (1.14.2); FILE MERGED
2005/04/12 06:36:29 obr 1.14.2.2: moved /usr/bin/soffice link to desktop integration packages
2005/04/06 13:16:43 obr 1.14.2.1: #i46317# make ln not deference the target if exits
Diffstat (limited to 'sysui/desktop/suse')
| -rw-r--r-- | sysui/desktop/suse/suse-menus.spec | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec index 246ea9b538..895180705e 100644 --- a/sysui/desktop/suse/suse-menus.spec +++ b/sysui/desktop/suse/suse-menus.spec @@ -4,6 +4,7 @@ Version: 2.0 Release: 1 Group: Office License: LGPL, SISSL +Vendor: OpenOffice.org AutoReqProv: no # /etc/SuSE-release for SuSE, SLES and Novell Linux Desktop .. Requires: openofficeorg-core01, /etc/SuSE-release @@ -19,7 +20,7 @@ cat > /tmp/install.$$ << EOF while [ "\$TARGET" == "" ] do sleep 2 - TARGET=\`rpm -q --qf '%{INSTALLPREFIX}' openofficeorg-core01 2>&1\` && ln -sf \$TARGET /etc/%PREFIX + TARGET=\`rpm -q --qf '%{INSTALLPREFIX}' openofficeorg-core01 2>&1\` && ln -snf \$TARGET /etc/%PREFIX # some rpm versions do not wait for the shared lock echo \$TARGET | grep '/var/lib/rpm' && TARGET="" done @@ -186,6 +187,7 @@ then fi %files +%attr(0755,root,root) /usr/bin/soffice %attr(0755,root,root) %verify(not size md5) /usr/bin/%PREFIX %attr(0755,root,root) /usr/bin/%PREFIX-printeradmin %defattr(0644, root, root) @@ -519,4 +521,3 @@ fi /opt/kde3/share/icons/locolor/32x32/mimetypes/%ICONPREFIX-oasis-formula.png /opt/kde3/share/icons/locolor/32x32/mimetypes/%ICONPREFIX-oasis-database.png /opt/kde3/share/icons/locolor/32x32/mimetypes/%ICONPREFIX-oasis-web-template.png -%define _rpmdir /export/home/obr/workspaces/sysui03/sysui/unxlngi6.pro/bin |