summaryrefslogtreecommitdiff
path: root/sysui/desktop
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-05-06 09:30:21 +0000
committerKurt Zenker <kz@openoffice.org>2008-05-06 09:30:21 +0000
commitca1dba28fef9fc1bb17460fb8436fba0974893e9 (patch)
tree245b5061766a740c970de5f81edbe0b04b9d8b2d /sysui/desktop
parent8ce299c8a86cbbf785445c2d11c35fa94b35f176 (diff)
INTEGRATION: CWS native147 (1.18.16); FILE MERGED
2008/04/23 20:26:45 obr 1.18.16.1: #i88334#,#i61569#,#i62176# removed /etc indirection and package database check for office install location
Diffstat (limited to 'sysui/desktop')
-rw-r--r--sysui/desktop/freedesktop/freedesktop-menus.spec15
1 files changed, 4 insertions, 11 deletions
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 0bc297e036db..713f384e36fc 100644
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -7,8 +7,7 @@ Name: %pkgprefix-freedesktop-menus
#BuildRequires: perl
Group: Office
License: LGPL
-Provides: openoffice.org-desktop-integration, openofficeorg-freedesktop-menus
-Obsoletes: openofficeorg-freedesktop-menus
+Provides: openoffice.org3-desktop-integration
BuildArch: noarch
AutoReqProv: no
@@ -26,10 +25,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
-# dummy for %ghost
-touch $RPM_BUILD_ROOT/etc/%unixfilename
+mkdir -p $RPM_BUILD_ROOT
# FIXME: remove - only purpose is to create packages identical to OOF680 m8
umask 0000
@@ -55,9 +51,7 @@ rm -rf usr/share/applnk-redhat
%clean
rm -rf $RPM_BUILD_ROOT
-#include<symlink_triggers>
-
-%triggerin -- %pkgprefix-writer, %pkgprefix-calc, %pkgprefix-draw, %pkgprefix-impress, %pkgprefix-math
+%triggerin -- %pkgprefix, %pkgprefix-writer, %pkgprefix-calc, %pkgprefix-draw, %pkgprefix-impress, %pkgprefix-math
# this is run when one of the above packages is already installed and the menu
# package gets installed OR when the menu-package is already installed and one
# of the above listed packages gets installed
@@ -75,7 +69,7 @@ elif (which update-desktop-database); then
update-desktop-database -q /usr/share/applications
fi
-%triggerun -- %pkgprefix-writer, %pkgprefix-calc, %pkgprefix-draw, %pkgprefix-impress, %pkgprefix-math
+%triggerun -- %pkgprefix, %pkgprefix-writer, %pkgprefix-calc, %pkgprefix-draw, %pkgprefix-impress, %pkgprefix-math
if [ "$1" = "0" ] ; then
# the menu-package gets uninstalled/updated - postun will run the command
exit 0
@@ -286,7 +280,6 @@ fi
# glibc breaks rpm unless rpm is build with internal glob-matching (issue 49374)
# https://bugzilla.redhat.com/beta/show_bug.cgi?id=134362
%defattr(-, root, root)
-%ghost /etc/%unixfilename
%attr(0755, root, root) /usr/bin/*
/usr/share/applications/%unixfilename-base.desktop
/usr/share/applications/%unixfilename-calc.desktop