summaryrefslogtreecommitdiff
path: root/sysui/desktop/mandriva
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-05-06 09:30:59 +0000
committerKurt Zenker <kz@openoffice.org>2008-05-06 09:30:59 +0000
commit90fab4e3a670460c5bef86d37142749ec471e677 (patch)
tree328f9f64567f7fb2b5940993da5d45fe50ea6dee /sysui/desktop/mandriva
parent869ddb3a4bb525c31b48d286fce3cd032a05b163 (diff)
INTEGRATION: CWS native147 (1.19.6); FILE MERGED
2008/04/23 20:26:46 obr 1.19.6.1: #i88334#,#i61569#,#i62176# removed /etc indirection and package database check for office install location
Diffstat (limited to 'sysui/desktop/mandriva')
-rw-r--r--sysui/desktop/mandriva/mandriva-menus.spec18
1 files changed, 5 insertions, 13 deletions
diff --git a/sysui/desktop/mandriva/mandriva-menus.spec b/sysui/desktop/mandriva/mandriva-menus.spec
index 84de379fd5c6..6ceb7a3c6c6d 100644
--- a/sysui/desktop/mandriva/mandriva-menus.spec
+++ b/sysui/desktop/mandriva/mandriva-menus.spec
@@ -12,9 +12,8 @@ BuildArch: noarch
# which provides 'mandrake-release'. We should leave 'mandrake-release'
# here and check for the 'mandriva-release' in the future (next year).
#
-Requires: %pkgprefix-core01, mandrake-release
-Provides: openoffice.org-desktop-integration
-Obsoletes: openofficeorg-mandrakelinux-menus, openofficeorg-mandriva-menus
+Requires: mandrake-release
+Provides: openoffice.org3-desktop-integration
%define _unpackaged_files_terminate_build 0
@@ -25,22 +24,18 @@ Obsoletes: openofficeorg-mandrakelinux-menus, openofficeorg-mandriva-menus
%description
%productname desktop integration
-#include<symlink_triggers>
-
# Update menus
#
-# - core01 for base
# - core02 for spadmin (printeradmin)
#
-%triggerin -- %pkgprefix-core01 %pkgprefix-calc %pkgprefix-draw %pkgprefix-impress %pkgprefix-writer %pkgprefix-math %pkgprefix-core02
+%triggerin -- %pkgprefix, %pkgprefix-core01 %pkgprefix-calc %pkgprefix-draw %pkgprefix-impress %pkgprefix-writer %pkgprefix-math %pkgprefix-core02
%{update_menus}
# Update menus
#
-# - core01 for base
# - core02 for spadmin (printeradmin)
#
-%triggerpostun -- %pkgprefix-core01 %pkgprefix-calc %pkgprefix-draw %pkgprefix-impress %pkgprefix-writer %pkgprefix-math %pkgprefix-core02
+%triggerpostun -- %pkgprefix, %pkgprefix-core01 %pkgprefix-calc %pkgprefix-draw %pkgprefix-impress %pkgprefix-writer %pkgprefix-math %pkgprefix-core02
%{trigger_clean_menus}
%post
@@ -178,9 +173,7 @@ rm -rf $RPM_BUILD_ROOT/*
# links intentionally (until we find a better solution) #46226
export NO_BRP_STALE_LINK_ERROR=yes
-# enable relocation in create_tree.sh
-mkdir -p $RPM_BUILD_ROOT/etc
-touch $RPM_BUILD_ROOT/etc/%unixfilename
+mkdir -p $RPM_BUILD_ROOT
export DESTDIR=$RPM_BUILD_ROOT
export KDEMAINDIR=/usr
@@ -295,7 +288,6 @@ fi
%attr(0755,root,root) %verify(not size md5) /usr/bin/%unixfilename
%attr(0755,root,root) /usr/bin/%unixfilename-printeradmin
%defattr(0644, root, root)
-%ghost /etc/%unixfilename
%{_menudir}/%{name}
/usr/share/application-registry/*.applications
/usr/share/applications/%unixfilename-writer.desktop