CVS: crater/x11-apps/openoffice-src BUILD, 1.15, 1.16 DETAILS, 1.13,
1.14 build-ooo, 1.10, 1.11 unxlngi3.mk, 1.1, NONE unxlngi4.mk,
1.1, NONE
nhudson at lunar-linux.org
nhudson at lunar-linux.org
Wed Sep 10 21:33:12 GMT 2003
Update of /var/cvs/lunar/crater/x11-apps/openoffice-src
In directory dbguin.lunar-linux.org:/tmp/cvs-serv10778
Modified Files:
BUILD DETAILS build-ooo
Removed Files:
unxlngi3.mk unxlngi4.mk
Log Message:
Updating for RC4 and adding in your compilers CFLAGS :)
Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/BUILD,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- BUILD 27 Aug 2003 22:48:49 -0000 1.15
+++ BUILD 10 Sep 2003 21:33:10 -0000 1.16
@@ -3,18 +3,22 @@
./autogen.sh --prefix=/usr \
--sysconfdir=/etc \
+ --with-distro=Lunar-Linux \
+ --enable-devel \
$OPTS &&
echo "applying patches" &&
- cd $SOURCE_DIRECTORY/build/OOO_1_1_RC3 &&
- ../../patches/apply.pl ../../patches/OOO_1_1_RC3/ . &&
+ cd $SOURCE_DIRECTORY/build/OOO_1_1_RC4 &&
+ ../../patches/apply.pl ../../patches/OOO_1_1_RC4/ . &&
- cd $SOURCE_DIRECTORY/build/OOO_1_1_RC3/solenv/inc &&
-
- cp $SCRIPT_DIRECTORY/unxlngi3.mk . &&
- cp $SCRIPT_DIRECTORY/unxlngi4.mk . &&
+ 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_RC3/extras/source/symbols &&
+ cd $SOURCE_DIRECTORY/build/OOO_1_1_RC4/extras/source/symbols &&
rm -fr *bmp &&
cp $SCRIPT_DIRECTORY/build-ooo $SOURCE_DIRECTORY/bin &&
Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/DETAILS,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- DETAILS 27 Aug 2003 22:43:56 -0000 1.13
+++ DETAILS 10 Sep 2003 21:33:10 -0000 1.14
@@ -1,13 +1,13 @@
MODULE=openoffice-src
- VERSION=1.1rc3
+ VERSION=1.1rc4
SOURCE=$MODULE-$VERSION.tar.gz
- SOURCE2=OOO_1_1_RC3.tar.bz2
- SOURCE3=ooo-icons-RC3-3.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:7f79af2e1346f68c3a0ab60654459afd
SOURCE_URL=cvs://:pserver:anonymous@anoncvs.gnome.org:/cvs/gnome:openoffice
- SOURCE2_URL=http://ooo.ximian.com/packages/OOO_1_1_RC3/$SOURCE2
+ SOURCE2_URL=http://ooo.ximian.com/packages/OOO_1_1_RC4/$SOURCE2
SOURCE3_URL=http://ooo.ximian.com/packages/$SOURCE3
SOURCE4_URL=http://ooo.ximian.com/packages/support/$SOURCE4
SOURCE5_URL=http://ooo.ximian.com/packages/support/$SOURCE5
@@ -15,7 +15,7 @@
MAINTAINER=nhudson at lunar-linux.org
WEB_SITE=http://ooo.ximian.com
ENTERED=20030805
- UPDATED=20030827
+ UPDATED=20030910
SHORT="OO.o Office Suite with Ximian Patches"
cat << EOF
OO.o Office Suite with Ximian Patches
Index: build-ooo
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/build-ooo,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- build-ooo 27 Aug 2003 22:48:49 -0000 1.10
+++ build-ooo 10 Sep 2003 21:33:10 -0000 1.11
@@ -36,7 +36,7 @@
JDK_TARBALL=j2sdk-1.4.1-01-linux-i586-gcc3.2.tar.bz2
JDK_UNTAR_OPTIONS=jxf
-OOO_ICONS_VER=ooo-icons-RC3-3
+OOO_ICONS_VER=ooo-icons-RC3-4
OOO_ICONS_TARBALL=$OOO_ICONS_VER.tar.gz
OOO_ICONS_UNTAR_OPTIONS=xzf
@@ -146,7 +146,7 @@
touch $OOBUILDDIR/$STAMP;
# configure
-cd /usr/src/openoffice/build/OOO_1_1_RC3/config_office
+cd /usr/src/openoffice/build/OOO_1_1_RC4/config_office
rm -f config.cache
echo "configuring ...";
/usr/bin/autoconf || exit 1;
@@ -154,7 +154,7 @@
./configure $CONFIGURE_OPTIONS || exit 1;
echo "Starting tsch source builds"
-cat > /usr/src/openoffice/build/OOO_1_1_RC3/build-ooo-tcsh <<"EOF"
+cat > /usr/src/openoffice/build/OOO_1_1_RC4/build-ooo-tcsh <<"EOF"
#!/usr/bin/tcsh
# Warning - do not edit, this is a temporary file, see build-ooo
# Many Java files have 8bit char-set comments, javac barfs on them in utf8 locales
@@ -163,8 +163,8 @@
setenv LD_ASSUME_KERNEL "2.2.5";
# Embedded python dies without Home set
setenv HOME "";
-cd /usr/src/openoffice/build/OOO_1_1_RC3
-source /usr/src/openoffice/build/OOO_1_1_RC3/*.Set || exit 1;
+cd /usr/src/openoffice/build/OOO_1_1_RC4
+source /usr/src/openoffice/build/OOO_1_1_RC4/*.Set || exit 1;
echo "Copying libraries to $SOLARVER/$UPD/$INPATH/lib";
mkdir -p $SOLARVER/$UPD/$INPATH/lib || exit 1;
cp -R /usr/src/openoffice/build/lib $SOLARVER/$UPD/$INPATH || exit 1;
@@ -179,12 +179,12 @@
$SOLARENV/$OUTPATH/bin/dmake || $SOLARENV/$OUTPATH/bin/dmake || $SOLARENV/$OUTPATH/bin/dmake || exit 1;
EOF
-chmod 755 /usr/src/openoffice/build/OOO_1_1_RC3/build-ooo-tcsh
+chmod 755 /usr/src/openoffice/build/OOO_1_1_RC4/build-ooo-tcsh
# tcsh sucks great rocks, and refuses to re-direct it's output otherwise
export TERM=
-/usr/src/openoffice/build/OOO_1_1_RC3/build-ooo-tcsh || exit 1;
+/usr/src/openoffice/build/OOO_1_1_RC4/build-ooo-tcsh || exit 1;
-touch /usr/src/openoffice/build/OOO_1_1_RC3/$STAMP || exit 1;
+touch /usr/src/openoffice/build/OOO_1_1_RC4/$STAMP || exit 1;
echo "Build succeeded ...!"
exit 0;
--- unxlngi3.mk DELETED ---
--- unxlngi4.mk DELETED ---
More information about the Lunar-commits
mailing list