CVS: crater/x11-apps/openoffice-src BUILD,1.3,1.4 DETAILS,1.5,1.6

[nhudson at lunar-linux.org]

Update of /var/cvs/lunar/crater/x11-apps/openoffice-src
In directory dbguin.lunar-linux.org:/tmp/cvs-serv21388

Modified Files:
	BUILD DETAILS 
Log Message:

Updating stuff for the openoffice build.  Please noone build this except for me and niki.  You must you a alpha version of bison for it to compile.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/BUILD,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- BUILD	8 Aug 2003 11:55:31 -0000	1.3
+++ BUILD	9 Aug 2003 23:19:00 -0000	1.4
@@ -6,14 +6,17 @@
                 --enable-devel    \
 		$OPTS &&
 
+  cd build/RC_030729/solenv/inc    &&
+  cp unxlngi3.mk unxlngi3.mk.orig &&
+  sed -e "s:^CFLAGSOPT=.*:CFLAGSOPT=$CFLAGS:g" \
+  unxlngi3.mk.orig > unxlngi3.mk &&
+ 
+  cp unxlngi4.mk unxlngi4.mk.orig &&
+  sed -e "s:^CFLAGSOPT=.*:CFLAGSOPT=$CFLAGS:g" \
+  unxlngi4.mk.orig > unxlngi4.mk
+
   cp $SCRIPT_DIRECTORY/build-ooo $SOURCE_DIRECTORY/bin &&
-  cd build/RC_030729/idlc/unxlngi4.pro/misc &&
-  patch $SOURCE_CACHE/$SOURCE7 0            &&
-  cd $SOURCE_DIRECTORY/build/RC_030729/rsc/unxlngi4.pro/inc &&
-  patch $SOURCE_CACHE/$SOURCE8 0            &&
-  cd $SOURCE_DIRECTORY/build/RC_030729/connectivity/unxlngi4.pro/misc &&
-  patch $SOURCE_CACHE/$SOURCE9 0            &&
-  cd $SOURCE_DIRECTORY                      &&
+  cd $SOURCE_DIRECTORY &&
 
   default_make  
 

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/DETAILS,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- DETAILS	8 Aug 2003 11:57:28 -0000	1.5
+++ DETAILS	9 Aug 2003 23:19:00 -0000	1.6
@@ -6,18 +6,12 @@
          SOURCE4=binutils-2.13.2.1.tar.bz2 
          SOURCE5=j2sdk-1.4.1-01-linux-i586-gcc3.2.tar.bz2
          SOURCE6=ooo-icons-RC3-2.tar.gz
-         SOURCE7=ooo-fix1.patch
-         SOURCE8=ooo-fix2.patch
-         SOURCE9=ooo-fix3.patch
       SOURCE_URL=cvs://:pserver:anonymous@anoncvs.gnome.org:/cvs/gnome:openoffice
      SOURCE2_URL=http://ooo.ximian.com/packages/RC3_030729/$SOURCE2
      SOURCE3_URL=http://ooo.ximian.com/packages/support/$SOURCE3
      SOURCE4_URL=http://ooo.ximian.com/packages/support/$SOURCE4
      SOURCE5_URL=http://ooo.ximian.com/packages/support/$SOURCE5
-     SOURCE6_URL=http://ooo.ximian.com/packages/$SOURCE6
-     SOURCE7_URL=http://lunar-linux.org/~nhudson/patches/$SOURCE7
-     SOURCE8_URL=http://lunar-linux.org/~nhudson/patches/$SOURCE8
-     SOURCE9_URL=http://lunar-linux.org/~nhudson/patches/$SOURCE9
+     SOURCE6_URL=http://ooo.ximian.com/packages/support/$SOURCE6
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/openoffice
       MAINTAINER=nhudson at lunar-linux.org
         WEB_SITE=http://ooo.ximian.com