INTEGRATION: CWS native147 (1.29.6); FILE MERGED

2008/04/23 20:26:46 obr 1.29.6.1: #i88334#,#i61569#,#i62176# removed /etc indirection and package database check for office install location

1 files changed, 7 insertions, 13 deletions

diff --git a/sysui/desktop/redhat/redhat-menus.spec b/sysui/desktop/redhat/redhat-menus.spec
index 0ff40a7b1a3b..7556c0bd4859 100644
--- a/sysui/desktop/redhat/redhat-menus.spec
+++ b/sysui/desktop/redhat/redhat-menus.spec
@@ -8,9 +8,8 @@ License: LGPL
 Vendor: OpenOffice.org
 AutoReqProv: no
 BuildArch: noarch
-Requires: %pkgprefix-core01, redhat-release
-Provides: openoffice.org-desktop-integration
-Obsoletes: openofficeorg-redhat-menus
+Requires: redhat-release
+Provides: openoffice.org3-desktop-integration
 %define _unpackaged_files_terminate_build 0
 %description 
 %productname desktop integration
@@ -21,9 +20,7 @@ Obsoletes: openofficeorg-redhat-menus
 # 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
 
 # set parameters for the create_tree script 
 export DESTDIR=$RPM_BUILD_ROOT
@@ -36,20 +33,18 @@ export GNOME_MIME_THEME=hicolor
 # legacy redhat KDE location for .desktop files
 mkdir -p $RPM_BUILD_ROOT/usr/share/applnk-redhat/Office
 for i in `cat launcherlist`; do
-  ln -sf /etc/%unixfilename/share/xdg/$i $RPM_BUILD_ROOT/usr/share/applnk-redhat/Office/%unixfilename-$i
+  ln -sf /opt/%unixfilename/share/xdg/$i $RPM_BUILD_ROOT/usr/share/applnk-redhat/Office/%unixfilename-$i
 done
 
 %clean
 rm -rf $RPM_BUILD_ROOT/*
 
-#include<symlink_triggers>
-
-%triggerin -- %pkgprefix-writer, %pkgprefix-calc, %pkgprefix-draw, %pkgprefix-impress, %pkgprefix-base, %pkgprefix-math
-if [ -x /usr/bin/update-desktop-database -a -h /etc/%unixfilename ]; then
+%triggerin --  %pkgprefix, %pkgprefix-writer, %pkgprefix-calc, %pkgprefix-draw, %pkgprefix-impress, %pkgprefix-base, %pkgprefix-math
+if [ -x /usr/bin/update-desktop-database ]; then
   update-desktop-database -q /usr/share/applications
 fi
 
-%triggerun -- %pkgprefix-writer, %pkgprefix-calc, %pkgprefix-draw, %pkgprefix-impress, %pkgprefix-base, %pkgprefix-math
+%triggerun --  %pkgprefix, %pkgprefix-writer, %pkgprefix-calc, %pkgprefix-draw, %pkgprefix-impress, %pkgprefix-base, %pkgprefix-math
 if [ "$1" = "0" ] ; then  
   # the menu-package gets uninstalled/updated - postun will run the command
   exit 0
@@ -252,7 +247,6 @@ done
 %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
 /usr/share/application-registry/*.applications
 /usr/share/applications/%unixfilename-writer.desktop
 /usr/share/applications/%unixfilename-calc.desktop