CVS: crater/x11-apps/openoffice-src BUILD, 1.16, 1.17 DEPENDS, 1.3, 1.4 DETAILS, 1.15, 1.16 PRE_BUILD, 1.8, 1.9

nhudson at lunar-linux.org nhudson at lunar-linux.org
Fri Oct 10 23:09:49 GMT 2003 

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

Modified Files:
	BUILD DEPENDS DETAILS PRE_BUILD 
Log Message:

God I am hoping this works now.  I am using the system gcc to build so no more using a seperate version for that which makes things much easier.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/BUILD,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- BUILD	10 Sep 2003 21:33:10 -0000	1.16
+++ BUILD	10 Oct 2003 23:09:47 -0000	1.17
@@ -1,30 +1,10 @@
 (
   cd $SOURCE_DIRECTORY &&
 
-  ./autogen.sh	--prefix=/usr \
+  ./configure	--prefix=/usr \
 		--sysconfdir=/etc \
-                --with-distro=Lunar-Linux \
-                --enable-devel \
+                --with-system-gcc \
  		$OPTS &&
-
-  echo "applying patches"         &&
-  cd $SOURCE_DIRECTORY/build/OOO_1_1_RC4              &&
-  ../../patches/apply.pl ../../patches/OOO_1_1_RC4/ . &&
-
-  cd $SOURCE_DIRECTORY/build/OOO_1_1_RC4/solenv/inc   &&
-  
-  perl -pi -e "s|^CFLAGSOPT=.*|CFLAGSOPT=${CFLAGS}|g" \
-       unxlngi3.mk                                    &&
-  perl -pi -e "s|^CFLAGSOPT=.*|CFLAGSOPT=${CFLAGS}|g" \
-       unxlngi4.mk                                    &&                                                                                
-
-  cd $SOURCE_DIRECTORY/build/OOO_1_1_RC4/extras/source/symbols &&
-  rm -fr *bmp                                                 &&
-
-  cp $SCRIPT_DIRECTORY/build-ooo $SOURCE_DIRECTORY/bin &&
-  cp $SCRIPT_DIRECTORY/package-ooo $SOURCE_DIRECTORY/bin &&
-  cp $SCRIPT_DIRECTORY/scale-icons $SOURCE_DIRECTORY/bin &&
-  cd $SOURCE_DIRECTORY &&
 
   default_make 
   

Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/DEPENDS,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- DEPENDS	18 Aug 2003 03:02:21 -0000	1.3
+++ DEPENDS	10 Oct 2003 23:09:47 -0000	1.4
@@ -1,12 +1,9 @@
 depends automake   &&
 depends gnome-vfs2 &&
 depends gnome-cups-manager &&
-depends mozilla    &&
 depends Linux-PAM  &&
 depends libart_lgpl &&
 depends startup-notification &&
 depends ImageMagick  &&
 depends tcsh         &&
-depends Python       &&
-depends XML-Twig     &&
-depends j2sdk 
+depends Python       

Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/DETAILS,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- DETAILS	12 Sep 2003 01:44:32 -0000	1.15
+++ DETAILS	10 Oct 2003 23:09:47 -0000	1.16
@@ -1,21 +1,22 @@
           MODULE=openoffice-src
-         VERSION=1.1rc4
-          SOURCE=$MODULE-$VERSION.tar.gz
-          SOURCE2=OOO_1_1_RC4.tar.bz2
-          SOURCE3=ooo-icons-RC3-4.tar.gz
-          SOURCE4=gcc-3.2.2.tar.bz2
-          SOURCE5=j2sdk-1.4.1-01-linux-i586-gcc3.2.tar.bz2
-      SOURCE2_VFY=md5:9e746a441e46104d107b020a7c1382d0
-      SOURCE_URL=cvs://:pserver:anonymous@anoncvs.gnome.org:/cvs/gnome:openoffice
-     SOURCE2_URL=http://ooo.ximian.com/packages/OOO_1_1_RC4/$SOURCE2
+         VERSION=1.1.0
+          SOURCE=ooo-build-1.1.44.tar.gz
+          SOURCE2=OOO_1_1_0.tar.bz2
+          SOURCE3=ooo-icons-OOO_1_1-4.tar.gz
+          SOURCE4=j2sdk-1.4.1-01-linux-i586-gcc3.2.tar.bz2
+      SOURCE_URL=http://ooo.ximian.com/packages/OOO_1_1_0/$SOURCE
+      SOURCE_VFY=md5:1b1ac3685b82c487afafaf244c86a85e
+     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:02548122dd8d435d3e5c2d6ecf2c95d3
      SOURCE4_URL=http://ooo.ximian.com/packages/support/$SOURCE4
-     SOURCE5_URL=http://ooo.ximian.com/packages/support/$SOURCE5
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/openoffice
+     SOURCE4_VFY=md5:ac1cb4ed5e121d25ba1c9a2ff9afa62a
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/ooo-build-1.1.44
       MAINTAINER=nhudson at lunar-linux.org
         WEB_SITE=http://ooo.ximian.com
          ENTERED=20030805
-         UPDATED=20030910
+         UPDATED=20031011
            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/crater/x11-apps/openoffice-src/PRE_BUILD,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- PRE_BUILD	27 Aug 2003 11:49:57 -0000	1.8
+++ PRE_BUILD	10 Oct 2003 23:09:47 -0000	1.9
@@ -5,8 +5,6 @@
   cp $SOURCE_CACHE/$SOURCE2 src/ &&
   cp $SOURCE_CACHE/$SOURCE3 src/ &&
   cp $SOURCE_CACHE/$SOURCE4 src/ &&
-  cp $SOURCE_CACHE/$SOURCE5 src/ &&
-  mkdir build                    &&
-  cd build/                      &&
-  unpack $SOURCE2               
+
+  cp $SCRIPT_DIRECTORY/build-ooo bin/
 )

More information about the Lunar-commits mailing list