CVS: crater/x11-apps/openoffice-src DEPENDS, 1.1, 1.2 PRE_BUILD, 1.1,
1.2 build-ooo, 1.1, 1.2
nhudson at lunar-linux.org
nhudson at lunar-linux.org
Sun Aug 10 04:45:08 GMT 2003
Update of /var/cvs/lunar/crater/x11-apps/openoffice-src
In directory dbguin.lunar-linux.org:/tmp/cvs-serv31285
Modified Files:
DEPENDS PRE_BUILD build-ooo
Log Message:
Ok I added a depends of XML-Twig. After finally getting this to install the
startup scripts didnt work due to I didnt have XML-Twig installed. Also I
hacked the build-ooo script so that it will not unpack the oo.o source so
that we can do that in our PRE_BUILD
Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/DEPENDS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DEPENDS 8 Aug 2003 02:24:50 -0000 1.1
+++ DEPENDS 10 Aug 2003 04:45:06 -0000 1.2
@@ -7,4 +7,5 @@
depends startup-notification &&
depends ImageMagick &&
depends tcsh &&
-depends Python
+depends Python &&
+depends XML-Twig
Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/PRE_BUILD,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PRE_BUILD 8 Aug 2003 02:24:50 -0000 1.1
+++ PRE_BUILD 10 Aug 2003 04:45:06 -0000 1.2
@@ -7,5 +7,7 @@
cp $SOURCE_CACHE/$SOURCE3 src/ &&
cp $SOURCE_CACHE/$SOURCE4 src/ &&
cp $SOURCE_CACHE/$SOURCE5 src/ &&
- cp $SOURCE_CACHE/$SOURCE6 src/
+ cp $SOURCE_CACHE/$SOURCE6 src/ &&
+ cd src/ &&
+ unpack $SOURCE2
)
Index: build-ooo
===================================================================
RCS file: /var/cvs/lunar/crater/x11-apps/openoffice-src/build-ooo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- build-ooo 8 Aug 2003 02:24:50 -0000 1.1
+++ build-ooo 10 Aug 2003 04:45:06 -0000 1.2
@@ -188,18 +188,6 @@
echo "Updating source ..."
cd $OOBUILDDIR
- if test -f $SRCDIR/$CVSTAG.tar.bz2; then
- cd ..
- tar xjf $SRCDIR/$CVSTAG.tar.bz2;
- else
- echo "Unreliably broken CVS branch...";
- if test "z`hostname`" = "zchampignon.ximian.com"; then
- cvs -d /cvsroot update -dP
- else
- cvs -z3 -q -d ':pserver:anoncvs at ftp.stardiv.de:/cvs' checkout -r $CVSTAG OpenOffice || exit 1;
-# cvs -z3 -q -d ':pserver:mmeeks at localhost:/cvs' checkout -r $CVSTAG OpenOffice || echo "Some error updating [?]";
- fi
- fi
else
# We expect a pristine copy to be there already ...
More information about the Lunar-commits
mailing list