summaryrefslogtreecommitdiff
path: root/sysui
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2005-08-18 11:46:19 +0000
committerRüdiger Timm <rt@openoffice.org>2005-08-18 11:46:19 +0000
commit3ce0fe066f0a00efc349d7c559606c7b69afa541 (patch)
tree96c159f8b68e1348d45d65e68dd7c4396f97cad8 /sysui
parent2b8a564b96927b7c05c9bc4ed974e4ecc982822e (diff)
INTEGRATION: CWS debianer (1.16.8); FILE MERGED
2005/08/08 08:21:44 obr 1.16.8.2: RESYNC: (1.16-1.17); FILE MERGED 2005/08/05 09:06:09 obr 1.16.8.1: #i52874# rename linux packages: openofficeorg => openoffice.org
Diffstat (limited to 'sysui')
-rw-r--r--sysui/desktop/redhat/redhat-menus.spec15
1 files changed, 8 insertions, 7 deletions
diff --git a/sysui/desktop/redhat/redhat-menus.spec b/sysui/desktop/redhat/redhat-menus.spec
index 4ddfc18ea0aa..6cdc12a154b3 100644
--- a/sysui/desktop/redhat/redhat-menus.spec
+++ b/sysui/desktop/redhat/redhat-menus.spec
@@ -2,14 +2,15 @@
Version: %version
Release: %release
Summary: OpenOffice.org desktop integration
-Name: openofficeorg-redhat-menus
+Name: openoffice.org-redhat-menus
Group: Office
License: LGPL, SISSL
Vendor: OpenOffice.org
AutoReqProv: no
BuildArch: noarch
-Requires: openofficeorg-core01, redhat-release
-Provides: openofficeorg-desktop-integration
+Requires: openoffice.org-core01, redhat-release
+Provides: openoffice.org-desktop-integration, openofficeorg-redhat-menus
+Obsoletes: openofficeorg-redhat-menus
%define _unpackaged_files_terminate_build 0
%description
OpenOffice.org desktop integration
@@ -50,13 +51,13 @@ for dir in *; do
cd ../..
done
-%triggerin -- openofficeorg-core01
+%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}' openofficeorg-core01 2>&1\` && ln -snf \$TARGET /etc/%unixfilename
+ 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
@@ -68,12 +69,12 @@ EOF
/bin/sh /tmp/install.$$ &
-%triggerin -- openofficeorg-writer, openofficeorg-calc, openofficeorg-draw, openofficeorg-impress, openofficeorg-base, openofficeorg-math
+%triggerin -- openoffice.org-writer, openoffice.org-calc, openoffice.org-draw, openoffice.org-impress, openoffice.org-base, openoffice.org-math
if [ -x /usr/bin/update-desktop-database -a -h /etc/%unixfilename ]; then
update-desktop-database -q /usr/share/applications
fi
-%triggerun -- openofficeorg-writer, openofficeorg-calc, openofficeorg-draw, openofficeorg-impress, openofficeorg-base, openofficeorg-math
+%triggerun -- openoffice.org-writer, openoffice.org-calc, openoffice.org-draw, openoffice.org-impress, openoffice.org-base, openoffice.org-math
if [ "$1" = "0" ] ; then
# the menu-package gets uninstalled/updated - postun will run the command
exit 0