[Lunar-commits] CVS: moonbase/zbeta/openoffice-src BUILD, 1.6, 1.7 CONFIGURE, 1.1, 1.2 DEPENDS, 1.4, 1.5 DETAILS, 1.5, 1.6 PRE_BUILD, 1.2, 1.3

[Nick Hudson]

Update of /var/cvs/lunar/moonbase/zbeta/openoffice-src
In directory dbguin.lunar-linux.org:/tmp/cvs-serv20790

Modified Files:
	BUILD CONFIGURE DEPENDS DETAILS PRE_BUILD 
Log Message:

Updating OpenOffice.org Source module again.  Sorry for the update so shortly but this new version will compile with Java.  have fun!


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/openoffice-src/BUILD,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- BUILD	2 Mar 2004 23:10:01 -0000	1.6
+++ BUILD	3 Mar 2004 21:52:21 -0000	1.7
@@ -1,20 +1,24 @@
 (
-  cd $SOURCE_DIRECTORY &&
+  cd $SOURCE_DIRECTORY 				&&
 
-  ./configure	--prefix=/usr \
-		--sysconfdir=/etc \
-                --with-system-gcc \
-                --enable-devel    \
-                --enable-bonobo   \
-                --disable-dependency-tracking \
- 		$OPTS &&
+  if module_installed j2sdk; then
+    export OPTS="$OPTS --enable-java --with-jdk-home=/usr/lib/j2sdk1.4.1/"
+  fi   						&&
 
-  default_make   &&
+  ./configure	--prefix=/usr 			\
+		--sysconfdir=/etc 		\
+                --with-system-gcc 		\
+                --enable-devel    		\
+                --enable-bonobo   		\
+                --disable-dependency-tracking   \
+ 		$OPTS 				&&
 
-  cp etc/autoresponse.conf /etc/openoffice &&
-  cd desktop                               &&
+  default_make   				&&
+
+  cp etc/autoresponse.conf /etc/openoffice 	&&
+  cd desktop                               	&&
   cp drawing.desktop presentation.desktop spreadsheet.desktop textdoc.desktop /usr/share/applications/ &&
-  cp *png /usr/share/pixmaps               &&
+  cp *png /usr/share/pixmaps               	&&
   cd $SOURCE_DIRECTORY     
   
 ) > $C_FIFO 2>&1

Index: CONFIGURE
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/openoffice-src/CONFIGURE,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CONFIGURE	31 Oct 2003 13:07:32 -0000	1.1
+++ CONFIGURE	3 Mar 2004 21:52:21 -0000	1.2
@@ -2,4 +2,9 @@
 message  "compile, just to give you a idea you will need atleast" 
 message  "4GB worth of free space, compile time will depend on" 
 message  "your CPU and RAM on your system.  On a Athlon XP 1800+ it took a" 
-message  "good 10-12 hours to compile"
+message  "good 7-8 hours to compile"
+
+message  "If you wish to compile Java into OpenOffice.org, please exit"
+message  "this install and lin j2sdk to enable Java support."
+
+sleep 10

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/openoffice-src/DEPENDS,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- DEPENDS	2 Mar 2004 13:30:29 -0000	1.4
+++ DEPENDS	3 Mar 2004 21:52:21 -0000	1.5
@@ -1,10 +1,11 @@
-depends automake   &&
-depends gnome-vfs2 &&
-depends libbonoboui &&
-depends Linux-PAM  &&
-depends libart_lgpl &&
+depends automake   	     &&
+depends gnome-vfs2 	     &&
+depends libbonoboui 	     &&
+depends Linux-PAM  	     &&
+depends libart_lgpl 	     &&
 depends startup-notification &&
-depends ImageMagick  &&
-depends tcsh         &&
-depends gnome-cups-manager &&
+depends ImageMagick  	     &&
+depends tcsh         	     &&
+depends gnome-cups-manager   &&
+depends XML-Parser           &&
 depends Python       

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/openoffice-src/DETAILS,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- DETAILS	2 Mar 2004 14:31:31 -0000	1.5
+++ DETAILS	3 Mar 2004 21:52:21 -0000	1.6
@@ -1,19 +1,19 @@
           MODULE=openoffice-src
          VERSION=1.1.0
-          SOURCE=ooo-build-1.1.50.tar.gz
+          SOURCE=ooo-build-1.1.51.tar.gz
           SOURCE2=OOO_1_1_0.tar.bz2
-          SOURCE3=ooo-icons-OOO_1_1-7.tar.gz
+          SOURCE3=ooo-icons-OOO_1_1-8.tar.gz
       SOURCE_URL=http://ooo.ximian.com/packages/OOO_1_1_0/$SOURCE
-      SOURCE_VFY=md5:3b5731e74e810265f6806a77e8dcd513
+      SOURCE_VFY=md5:bddcc0e8958c85b0191551fceecdcb9c
      SOURCE2_URL=http://ooo.ximian.com/packages/OOO_1_1_0/$SOURCE2
      SOURCE2_VFY=md5:4a21da1d8bb5d65360ddd82848ad4b55
      SOURCE3_URL=http://ooo.ximian.com/packages/$SOURCE3
-     SOURCE3_VFY=md5:6baa8cb0a8df8486eb8148abb0e7d237
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/ooo-build-1.1.50
+     SOURCE3_VFY=md5:61c9379fa718ee7f36ccd2d70f3649c8
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/ooo-build-1.1.51
       MAINTAINER=nhudson at lunar-linux.org
         WEB_SITE=http://ooo.ximian.com
          ENTERED=20030805
-         UPDATED=20040302
+         UPDATED=20040303
            SHORT="OO.o Office Suite with Ximian Patches"
 cat << EOF
 OO.o Office Suite with Ximian Patches

Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/zbeta/openoffice-src/PRE_BUILD,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PRE_BUILD	2 Mar 2004 13:00:31 -0000	1.2
+++ PRE_BUILD	3 Mar 2004 21:52:21 -0000	1.3
@@ -1,8 +1,7 @@
 ( 
-  default_pre_build &&
-  cd $SOURCE_DIRECTORY &&
-  mkdir -p src
+  default_pre_build 		 &&
+  cd $SOURCE_DIRECTORY 		 &&
+  mkdir -p src 			 &&
   cp $SOURCE_CACHE/$SOURCE2 src/ &&
   cp $SOURCE_CACHE/$SOURCE3 src/ 
-
 )