[Lunar-commits] r23236 - moonbase/trunk/zbeta/openoffice-src

[Moritz Heiber]

Author: moe
Date: 2007-02-12 11:38:56 +0100 (Mon, 12 Feb 2007)
New Revision: 23236

Modified:
   moonbase/trunk/zbeta/openoffice-src/BUILD
Log:
Okay, last fixes .. it actually compiled this time and created all the directories as expected. Sorry dveatch ;-)
Yet, of course its -2.1 now and not -2.0. So it didn't actually go through all in all. Doesn't matter since the rest of the BUILD file was somewhat broken anyway ;-)



Modified: moonbase/trunk/zbeta/openoffice-src/BUILD
===================================================================
--- moonbase/trunk/zbeta/openoffice-src/BUILD	2007-02-12 08:10:22 UTC (rev 23235)
+++ moonbase/trunk/zbeta/openoffice-src/BUILD	2007-02-12 10:38:56 UTC (rev 23236)
@@ -1,10 +1,13 @@
 (
+  $OO_DIR="/opt/lunar/openoffice-src"
+  
   sedit "/^ARCH_FLAGS\*=/d" solenv/inc/unxlngi{4,5,6}.mk &&
 
   # All of the options have been carefully chosen. Don't edit them unless you
   # really know what you're doing  
 
-  OPTS="$OPTS --disable-qadevooo --disable-fontooo --disable-odk \
+  OPTS="$OPTS --prefix=$OO_DIR --disable-qadevooo
+              --disable-fontooo --disable-odk --enable-libart \
               --disable-mathmldtd --enable-cairo --with-mozilla-version=1.7.5 \
               --enable-mozilla --disable-binfilter --enable-xrender-link \
               --without-fonts --without-ppds --without-afms \
@@ -63,7 +66,7 @@
   cd instsetoo_native/unxlngi6.pro/OpenOffice/native/install/en-US/linux-2.6-intel/buildroot/opt &&
 
   rm -rf /opt/lunar/openoffice-src &&
-  cp -rv openoffice.org2.0 /opt/lunar/openoffice-src &&
+  cp -rv openoffice.org2.1 $OO_DIR &&
 
   # Install icons for the .desktop files
   mkdir -p -m0755 /usr/share/icons/{HighContrast,hicolor} &&
@@ -74,7 +77,14 @@
 
   # Desktop integration
   mkdir -p -m0755 /usr/share/applications &&
-  for file in /opt/lunar/openoffice-src-${VERSION}/share/xdg/*.desktop ; do
+  cd $OO_DIR/share/xdg &&
+  sedit 's/bin\/sprinteradmin/bin\/spadmin/' printeradmin.desktop &&
+
+  for file in *.desktop ; do
+    sedit '/Exec/d' $file;
+    echo "Exec=$OO_DIR/program/s`echo $file | sed 's/.desktop//'`" >> $file;
+    sedit '/Icon/d' $file;
+    echo "Icon=`echo $file | sed 's/.desktop//'`" >> $file
     install -m644 $file /usr/share/applications;
   done &&
   update-desktop-database