[Lunar-commits] <moonbase-other> libreoffice-bin: fix the install.

[Florin Braescu]

commit 023334feec12b57df86e7e72cda9a3a729b7d79c
Author: Florin Braescu <florin at lunar-linux.org>
Date: Fri, 27 Jul 2012 08:15:28 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/023334feec12b57df86e7e72cda9a3a729b7d79c

libreoffice-bin: fix the install.
---
  x11-apps/libreoffice-bin/BUILD                               +22/-12   
  x11-apps/libreoffice-bin/POST_REMOVE                         +1/-1     
  x11-apps/libreoffice-bin/PRE_BUILD                           +0/-8     
  x11-apps/libreoffice-bin/profile.d/libreoffice-bin.rc        +2/-2     
  4 files changed, 25 insertions (+), 23 deletions (-)

--- a/x11-apps/libreoffice-bin/BUILD
+++ b/x11-apps/libreoffice-bin/BUILD
@@ -2,25 +2,35 @@
 
   # not sure what this rpm is for, but its not there in 32bit OO, so I removed it
   #rm -rf userland &&
-  LO_OPT_DIR="/opt/libreoffice${VERSION%.*}"
-
+  LO_OPT_DIR="/usr/lib/libreoffice${VERSION%.*}"
 
   message "${MESSAGE_COLOR}Unpacking base RPMs and installing...${DEFAULT_COLOR}" &&
   for pack in RPMS/*.rpm ; do rpm2cpio $pack > `basename $pack .rpm`.cpio ; done &&
   for pack in RPMS/desktop-integration/*freedesktop* ; do rpm2cpio $pack > `basename $pack .rpm`.cpio ; done &&
   for i in `ls *.cpio`; do cpio -idmuV < $i ;done &&
 
-  prepare_install &&
-  cp -dfR opt / &&
-  cp -dfR usr / &&
+  rm usr/bin/libreoffice${VERSION%.*}
+  desktopfiles="base calc draw impress javafilter math printeradmin startcenter writer"  &&
+  for i in $desktopfiles; do
+    rm usr/share/applications/libreoffice${VERSION%.*}-$i.desktop
+  done
+
+  prepare_install  &&
+  cp -dfR opt/* /usr/lib/  &&
+  cp -dfR usr /  &&
 
   # Create some symlinks to /usr/bin
-  ln -sf ${LO_OPT_DIR}/program/soffice /usr/bin/soffice &&
-  ln -sf ${LO_OPT_DIR}/program/scalc /usr/bin/scalc &&
-  ln -sf ${LO_OPT_DIR}/program/swriter /usr/bin/swriter &&
-  ln -sf ${LO_OPT_DIR}/program/simpress /usr/bin/simpress &&
-  ln -sf ${LO_OPT_DIR}/program/sbase /usr/bin/sbase &&
-  ln -sf ${LO_OPT_DIR}/program/sdraw /usr/bin/sdraw &&
-  ln -sf ${LO_OPT_DIR}/program/smath /usr/bin/smath 
+  ln -sf ${LO_OPT_DIR}/program/soffice  /usr/bin/soffice   &&
+  ln -sf ${LO_OPT_DIR}/program/scalc    /usr/bin/scalc     &&
+  ln -sf ${LO_OPT_DIR}/program/swriter  /usr/bin/swriter   &&
+  ln -sf ${LO_OPT_DIR}/program/simpress /usr/bin/simpress  &&
+  ln -sf ${LO_OPT_DIR}/program/sbase    /usr/bin/sbase     &&
+  ln -sf ${LO_OPT_DIR}/program/sdraw    /usr/bin/sdraw     &&
+  ln -sf ${LO_OPT_DIR}/program/smath    /usr/bin/smath     &&
+  ln -sf ${LO_OPT_DIR}/program/soffice  /usr/bin/libreoffice${VERSION%.*}  &&
+
+  for i in $desktopfiles; do
+    ln -sf ${LO_OPT_DIR}/share/xdg/$i.desktop /usr/share/applications/libreoffice${VERSION%.*}-$i.desktop
+  done
 
 ) > $C_FIFO 2>&1
--- a/x11-apps/libreoffice-bin/POST_REMOVE
+++ b/x11-apps/libreoffice-bin/POST_REMOVE
@@ -1 +1 @@
-rm -rf /opt/lunar/libreoffice${VERSION%.*}
+rm -rf /usr/lib/libreoffice${VERSION%.*}
--- a/x11-apps/libreoffice-bin/PRE_BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-desktopfiles="base calc draw impress javafilter math printeradmin qstart startcenter writer"  &&
-for i in $desktopfiles; do
-  rm -f /usr/share/applications/$i.desktop
-done   &&
-
-rm -rf /opt/libreoffice${VERSION%.*} &&
-
-default_pre_build
--- a/x11-apps/libreoffice-bin/profile.d/libreoffice-bin.rc
+++ b/x11-apps/libreoffice-bin/profile.d/libreoffice-bin.rc
@@ -1,4 +1,4 @@
 # libreoffice-bin specific stuff
 
-[ -d /opt/libreoffice${VERSION%.*}/program/ ] &&
-    PATH="$PATH:/opt/libreoffice${VERSION%.*}/program/"
+[ -d /usr/lib/libreoffice${VERSION%.*}/program/ ] &&
+    PATH="$PATH:/usr/lib/libreoffice${VERSION%.*}/program/"