[Lunar-commits] r23184 - in moonbase/trunk/x11-apps/openoffice-bin: . profile.d

[Samuel Verstraete]

Author: elangelo
Date: 2007-02-08 17:30:48 +0100 (Thu, 08 Feb 2007)
New Revision: 23184

Modified:
   moonbase/trunk/x11-apps/openoffice-bin/BUILD
   moonbase/trunk/x11-apps/openoffice-bin/DETAILS
   moonbase/trunk/x11-apps/openoffice-bin/profile.d/openoffice-bin.rc
Log:
update to 2.1 with an optional install of the .desktop files.


Modified: moonbase/trunk/x11-apps/openoffice-bin/BUILD
===================================================================
--- moonbase/trunk/x11-apps/openoffice-bin/BUILD	2007-02-08 14:54:18 UTC (rev 23183)
+++ moonbase/trunk/x11-apps/openoffice-bin/BUILD	2007-02-08 16:30:48 UTC (rev 23184)
@@ -2,18 +2,38 @@
   OO_INSTALL_DIR="${SOURCE_DIRECTORY}/RPMS"
   cd $OO_INSTALL_DIR			&&
 
-  # I don't know what do with those. Hints anybody?
-  rm -rf desktop-integration		&&
+  if [[ "$USE_DESKTOPINTEGRATION" = "y" ]]; then
+    cd $OO_INSTALL_DIR/desktop-integration ; 
+    INT_FILE=openoffice.org-freedesktop-menus-2.1-5.noarch ;
+    rpm2cpio $INT_FILE.rpm > $INT_FILE.cpio ;
+    cpio -idm < $INT_FILE.cpio &> /dev/null ;
+    rm $OO_INSTALL_DIR/desktop-integration/usr/bin/soffice ;
+    sedit "s/\/etc\/openoffice.org-2.1/\/opt\/lunar\/openoffice\/openoffice.org2.1/g" $OO_INSTALL_DIR/desktop-integration/usr/bin/openoffice.org-2.1 ;
+    sedit "s/\/etc\/openoffice.org-2.1/\/opt\/lunar\/openoffice\/openoffice.org2.1/g" $OO_INSTALL_DIR/desktop-integration/usr/bin/openoffice.org-2.1-printeradmin ;
+    install -m755 $OO_INSTALL_DIR/desktop-integration/usr/bin/openoffice.org-2.1 /usr/bin/ ;
+    install -m755 $OO_INSTALL_DIR/desktop-integration/usr/bin/openoffice.org-2.1-printeradmin /usr/bin/ ;
+    desktop_files="base calc draw impress math printeradmin writer" ;
+    for i in $desktop_files; do
+      ln -s /opt/lunar/openoffice/openoffice.org2.1/share/xdg/$i.desktop /usr/share/applications/$i.desktop
+    done ;
+    cp -a "${OO_INSTALL_DIR}/desktop-integration/usr/share/icons" /usr/share ;
+    install -m644 "${OO_INSTALL_DIR}/desktop-integration/usr/share/mime/packages/openoffice.org.xml" /usr/share/mime/packages/ ;
+    update-mime-database /usr/share/mime/ ;
+  fi &&
 
+
+  cd $OO_INSTALL_DIR                                      &&
+
+  rm -fr desktop-integration &&
+
   # Let the "magic" happen. Ugh, I hate rpm
   message "${MESSAGE_COLOR}Unpacking RPMs...${DEFAULT_COLOR}" &&
   for pack in ${OO_INSTALL_DIR}/*; do
-    rpmunpack $pack;
+    rpm2cpio $pack > `basename $pack .rpm`.cpio ;
   done &&
 
   # Now, lets get rid of the rpms
   rm -rf ${OO_INSTALL_DIR}/*.rpm	&&
-  gunzip $OO_INSTALL_DIR/*		&&
   
   for pack in ${OO_INSTALL_DIR}/*; do
     cpio -idm < $pack &> /dev/null;
@@ -21,6 +41,6 @@
   
   prepare_install &&
   message "${MESSAGE_COLOR}Installing OpenOffice ${VERSION}...${DEFAULT_COLOR}" &&
-  cp -a "${OO_INSTALL_DIR}/opt/openoffice.org2.0" /opt/lunar/openoffice
+  cp -a "${OO_INSTALL_DIR}/opt/openoffice.org2.1" /opt/lunar/openoffice
 
 ) > $C_FIFO 2>&1

Modified: moonbase/trunk/x11-apps/openoffice-bin/DETAILS
===================================================================
--- moonbase/trunk/x11-apps/openoffice-bin/DETAILS	2007-02-08 14:54:18 UTC (rev 23183)
+++ moonbase/trunk/x11-apps/openoffice-bin/DETAILS	2007-02-08 16:30:48 UTC (rev 23184)
@@ -1,15 +1,15 @@
           MODULE=openoffice-bin
-         VERSION=2.0.4
-          SOURCE=OOo_${VERSION}_LinuxIntel_install.tar.gz
-SOURCE_DIRECTORY=${BUILD_DIRECTORY}/OOD680_m5_native_packed-1_en-US.9073
+         VERSION=2.1.0 
+          SOURCE=OOo_${VERSION}_LinuxIntel_install_en-US.tar.gz
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/OOE680_m6_native_packed-1_en-US.9095
    SOURCE_URL[0]=http://ftp.ussg.iu.edu/openoffice/stable/$VERSION/
    SOURCE_URL[1]=http://mirrors.sunsite.dk/openoffice/stable/$VERSION/
    SOURCE_URL[2]=http://niihau.student.utwente.nl/openoffice/stable/$VERSION/
    SOURCE_URL[3]=ftp://ftp.funet.fi/pub/mirrors/openoffice.org/stable/$VERSION/
-      SOURCE_VFY=sha1:7a92e7dd7b9a26cf40210bf1ab9b4baa132432a0
+      SOURCE_VFY=sha1:6de6a83d402817ef5116d28072f9dd6b0600c6d6
         WEB_SITE=http://www.openoffice.org/
          ENTERED=20020704
-         UPDATED=20061011
+         UPDATED=20070208
            SHORT="The open office suite for unix"
        LDD_CHECK=off
          ARCHIVE=off

Modified: moonbase/trunk/x11-apps/openoffice-bin/profile.d/openoffice-bin.rc
===================================================================
--- moonbase/trunk/x11-apps/openoffice-bin/profile.d/openoffice-bin.rc	2007-02-08 14:54:18 UTC (rev 23183)
+++ moonbase/trunk/x11-apps/openoffice-bin/profile.d/openoffice-bin.rc	2007-02-08 16:30:48 UTC (rev 23184)
@@ -1,5 +1,5 @@
 # openoffice-bin specific stuff
 
-[ -d /opt/lunar/openoffice/openoffice.org2.0/program ] &&
-    PATH="$PATH:/opt/lunar/openoffice/openoffice.org2.0/program"
+[ -d /opt/lunar/openoffice/openoffice.org2.1/program ] &&
+    PATH="$PATH:/opt/lunar/openoffice/openoffice.org2.1/program"