ooo-build r13027 - in trunk: . bin/piece patches/dev300 scratch/split

[michael svn gnome org]

Author: michael
Date: Wed Jul  2 16:12:11 2008
New Revision: 13027
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13027&view=rev

Log:
2008-07-02  Michael Meeks  <michael meeks novell com>

        * patches/dev300/apply: disable internalcairo bits for m22.



Modified:
   trunk/ChangeLog
   trunk/bin/piece/install-ure
   trunk/bin/piece/sys-setup
   trunk/patches/dev300/apply
   trunk/scratch/split/ooo3_bootstrap.spec
   trunk/scratch/split/ooo3_ure.spec

Modified: trunk/bin/piece/install-ure
==============================================================================
--- trunk/bin/piece/install-ure	(original)
+++ trunk/bin/piece/install-ure	Wed Jul  2 16:12:11 2008
@@ -2,4 +2,3 @@
 DEST="$OO_SOLVERDIR/solver"
 mkdir -p $DEST
 cp -R $SRCDIR/* $DEST
-ln -s . $DEST/$INPATH

Modified: trunk/bin/piece/sys-setup
==============================================================================
--- trunk/bin/piece/sys-setup	(original)
+++ trunk/bin/piece/sys-setup	Wed Jul  2 16:12:11 2008
@@ -16,7 +16,7 @@
 
 # create a new local solver
 export SOLARVER="$SRC_ROOT/solver/$UPD"
-export SOLARENV="$DEV_DIR/solenv"
+export SOLARENV="$DEV_DIR/../solenv"
 
 export SOLARVERSION="$SOLARVER"
 export SOLARENVINC="$SOLARENV/inc"

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jul  2 16:12:11 2008
@@ -2262,8 +2262,9 @@
 cairo-makefile-mk.diff
 cairo-prj-build-lst.diff
 cairo-prj-d-lst.diff
-cairo-config_office-configure-in.diff
 cairo-canvas-cairo.diff
+[ InternalCairo < dev300-m22 >= beb300-m1 ]
+cairo-config_office-configure-in.diff
 
 
 [ WWInProgress ]

Modified: trunk/scratch/split/ooo3_bootstrap.spec
==============================================================================
--- trunk/scratch/split/ooo3_bootstrap.spec	(original)
+++ trunk/scratch/split/ooo3_bootstrap.spec	Wed Jul  2 16:12:11 2008
@@ -300,8 +300,10 @@
 %files devel
 %defattr(-,root,root)
 %dir %ooo_prefix/%ooo_home/solver
+%dir %ooo_prefix/%ooo_home/solenv
 %dir %ooo_prefix/%ooo_home/ooo-build
 %ooo_prefix/%ooo_home/solver/*
+%ooo_prefix/%ooo_home/solenv/*
 %ooo_prefix/%ooo_home/ooo-build/*
 
 %changelog

Modified: trunk/scratch/split/ooo3_ure.spec
==============================================================================
--- trunk/scratch/split/ooo3_ure.spec	(original)
+++ trunk/scratch/split/ooo3_ure.spec	Wed Jul  2 16:12:11 2008
@@ -43,9 +43,9 @@
 %build
 
 #setup env.
-OO_INSTDIR=%{_libdir}/%ooo_home/
-OO_SOLVERDIR=$OO_INSTDIR/solver
-OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
+export OO_INSTDIR=%{_libdir}/%ooo_home/
+export OO_SOLVERDIR=$OO_INSTDIR/solver
+export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 
 $OO_TOOLSDIR/../patches/apply.pl $OO_TOOLSDIR/../patches/dev300 --pieces --tag=%ooo_build_tag --distro=SUSE `pwd` 
 source $OO_TOOLSDIR/piece/sys-setup
@@ -54,9 +54,9 @@
 %install
 
 #setup env.
-OO_INSTDIR=%{_libdir}/%ooo_home/
-OO_SOLVERDIR=$OO_INSTDIR/solver
-OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
+export OO_INSTDIR=%{_libdir}/%ooo_home/
+export OO_SOLVERDIR=$OO_INSTDIR/solver
+export OO_TOOLSDIR=$OO_INSTDIR/ooo-build/bin
 
 source $OO_TOOLSDIR/piece/sys-setup
 $OO_TOOLSDIR/piece/install-%piece