ooo-build r13842 - in branches/ooo-build-3-0: . bin distro-configs

[pmladek svn gnome org]

Author: pmladek
Date: Mon Sep  8 15:13:27 2008
New Revision: 13842
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13842&view=rev

Log:
2008-09-08  Petr Mladek  <pmladek suse cz>

	* bin/ooinstall, bin/install-dictionaries: allow to preinstall some
	  dictionaries even with OOo-3.0; they are put into
	  $OOINSTDIR/basis$VERSION/share/dictionaries;
	  we use it on SLED10 for hyphen and thesaurus dictionaries
	* bin/install-dict.in, bin/package-ooo, bin/Makefile.am:
	  bin the obsolete install-dict script; dictionary.lst is not longer
	  needed

	* ooo-build/distro-configs/SUSE-10.1.conf.in: configure the
	  dictionaries for SLED10; add
	   --with-external-dict-dir=/usr/share/myspell
	   --with-external-hyph-dir= libdir@/@OOOINSTALLDIRNAME@/basis OOO_VERSION@/share/dictionaries
	   --with-external-thes-dir= libdir@/@OOOINSTALLDIRNAME@/basis OOO_VERSION@/share/dictionaries 
	   --with-system-dicts 




Removed:
   branches/ooo-build-3-0/bin/install-dict.in
Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/NEWS
   branches/ooo-build-3-0/bin/Makefile.am
   branches/ooo-build-3-0/bin/install-dictionaries
   branches/ooo-build-3-0/bin/ooinstall
   branches/ooo-build-3-0/bin/package-ooo
   branches/ooo-build-3-0/distro-configs/SUSE-10.1.conf.in

Modified: branches/ooo-build-3-0/NEWS
==============================================================================
--- branches/ooo-build-3-0/NEWS	(original)
+++ branches/ooo-build-3-0/NEWS	Mon Sep  8 15:13:27 2008
@@ -1,3 +1,23 @@
+ooo-build-3.0.0.3.1:
+
+    +features:
+	+ support ooo300-m5 (3.0rc1) [Rene, Petr]
+	+ enabled again WW-like input-fields and checkboxes (Florian)
+    + disabled problematic stuff:
+	+ move cell notes with anchored cells (i#59745, bnc#n#422677) [Kohei]
+	+ skip data in hidden cells when rendering charts (bnc#404190,
+	  i#81209) [Kohei]
+	+ external range names [Kohei]
+	+ layout stuff [Jan]
+    + bug fixes:
+	+ annoying pdf permission checks [Thorsten]
+	+ wrong read-out of fontconfig flags (bnc#407958) [Thorsten]
+    + Win32 bits:
+	+ lots installer and patchability fixes [Tor]
+    + build bits:
+	+ updated scsover to the snapshot 2008-09-08 [Kohei]
+	+ temporary globally disabled report builder [Petr]
+
 ooo-build-3.0.0.3:
 
     + features:

Modified: branches/ooo-build-3-0/bin/Makefile.am
==============================================================================
--- branches/ooo-build-3-0/bin/Makefile.am	(original)
+++ branches/ooo-build-3-0/bin/Makefile.am	Mon Sep  8 15:13:27 2008
@@ -14,7 +14,6 @@
 	fix-deps \
 	generate-bash-completion \
 	help-font-munge \
-	install-dict.in \
 	install-dictionaries \
 	install-mono \
 	install-artwork \

Modified: branches/ooo-build-3-0/bin/install-dictionaries
==============================================================================
--- branches/ooo-build-3-0/bin/install-dictionaries	(original)
+++ branches/ooo-build-3-0/bin/install-dictionaries	Mon Sep  8 15:13:27 2008
@@ -8,12 +8,7 @@
 if test "z$1" != "z"; then
     DICTDIR=$1;
 else
-    DICTDIR=$OOINSTDIR/share/dict/ooo
-fi
-
-if (! test -d $DICTDIR); then
-    echo "Cannot find $DICTDIR; make sure you installed OOo first"
-    exit 1;
+    DICTDIR=$OOINSTDIR/basis$VERSION/share/dictionaries
 fi
 
 DICTDIRBASE=`echo $DICTDIR | sed "s|^$OODESTDIR||"`
@@ -136,7 +131,7 @@
 
 install_dic()
 {
-    test -f $1/$2 && mv $1/$2 $DICTDIR/ && echo "$DICTDIRBASE/$2" >>$DICTFILELIST
+    test -f $1/$2 && mv $1/$2 $DICTDIR/ && echo "$DICTDIRBASE/$2" >>$DICTFILELIST && dic_installed=true 
 }
 
 install_doc()
@@ -161,15 +156,17 @@
     DICTFILELIST=/dev/null
 fi
 
+dic_installed=false
 doc_installed=false
 for DICT in $DICTS ; do
   if test -f $SRCDIR/$DICT.tar.bz2 ; then
     echo "Unpacking $DICT dictionary..."
+    mkdir -m 755 -p $DICTDIR
     mkdir -m 755 -p $DOCDIR/dictionaries
     TMPDIR=`mktemp -d /tmp/ooo-build.dict.XXXXXX`
     tar -xjf $SRCDIR/$DICT.tar.bz2 -C $TMPDIR || exit 1;
     chmod 644 $TMPDIR/*.* || exit 1;
-    
+
     # dictionaries
     DICTNAME=$(echo $DICT | sed s/thes/th/)
     install_dic $TMPDIR $DICTNAME.dic
@@ -193,11 +190,15 @@
   fi
 done
 
+if $dic_installed ; then
+    echo "%dir $DICTDIRBASE"	      		>>$DICTFILELIST
+fi
+
 if $doc_installed ; then
     echo "%dir $DOCDIRBASE"	      		>>$DICTFILELIST
     echo "%dir $DOCDIRBASE/dictionaries" 	>>$DICTFILELIST
 fi
 
-echo "Creating dictionary.lst..."
-$TOOLSDIR/bin/install-dict.in $DICTDIR
-test -f $DICTDIR/dictionary.lst && echo "$DICTDIRBASE/dictionary.lst" >>$DICTFILELIST
+#echo "Creating dictionary.lst..."
+#$TOOLSDIR/bin/install-dict.in $DICTDIR
+#test -f $DICTDIR/dictionary.lst && echo "$DICTDIRBASE/dictionary.lst" >>$DICTFILELIST

Modified: branches/ooo-build-3-0/bin/ooinstall
==============================================================================
--- branches/ooo-build-3-0/bin/ooinstall	(original)
+++ branches/ooo-build-3-0/bin/ooinstall	Mon Sep  8 15:13:27 2008
@@ -179,11 +179,9 @@
     `$configure_vars{SOLARENV}/bin/linkoo $path $configure_vars{SRC_ROOT}`;
 }
 
-if ( -e "$path/share/dict/ooo" ) {
 print "Installing extra dictionaries...\n";
-	system ("cd $setup_vars{TOOLSDIR}/bin ; " .
-       		"sh ./install-dictionaries $path/share/dict/ooo") && die "Failed to install dictionaries: $!";
-}
+system ("cd $setup_vars{TOOLSDIR}/bin ; " .
+	"sh ./install-dictionaries $path/basis$setup_vars{VERSION}/share/dictionaries") && die "Failed to install dictionaries: $!";
 
 print "Building galleries...\n";
 system ("cd $setup_vars{TOOLSDIR}/bin ; " .

Modified: branches/ooo-build-3-0/bin/package-ooo
==============================================================================
--- branches/ooo-build-3-0/bin/package-ooo	(original)
+++ branches/ooo-build-3-0/bin/package-ooo	Mon Sep  8 15:13:27 2008
@@ -136,10 +136,6 @@
 
 mkdir -p $OOINSTDIR/basis$VERSION/program
 
-echo "Building $OOINSTDIR/install-dict";
-sed -e "s|@OOINSTBASE@|$OOINSTBASE|g" $TOOLSDIR/bin/install-dict.in >| "$OOBUILDDIR/install-dict" || exit 1;
-install_script $OOBUILDDIR/install-dict $OOINSTDIR/install-dict
-
 echo "Building $OOINSTDIR/basis$VERSION/program/java-set-classpath";
 sed -e "s|@OOINSTBASE@|$OOINSTBASE|g" $TOOLSDIR/bin/java-set-classpath.in >| "$OOBUILDDIR/java-set-classpath" || exit 1;
 install_script $OOBUILDDIR/java-set-classpath $OOINSTDIR/basis$VERSION/program/java-set-classpath
@@ -535,7 +531,6 @@
 	      $OOINSTBASE/basis$VERSION/share/template/en-US/officorr/project-proposal.ott" >> gid_Module_Langpack_Basis_en_US
 
 	echo "%dir $OOINSTBASE
-	      $OOINSTBASE/install-dict
 	      $OOINSTBASE/basis$VERSION/program/java-set-classpath" > gid_Module_Root_Hack
 
 

Modified: branches/ooo-build-3-0/distro-configs/SUSE-10.1.conf.in
==============================================================================
--- branches/ooo-build-3-0/distro-configs/SUSE-10.1.conf.in	(original)
+++ branches/ooo-build-3-0/distro-configs/SUSE-10.1.conf.in	Mon Sep  8 15:13:27 2008
@@ -9,11 +9,15 @@
 --enable-opengl
 --enable-ogltrans
 --with-ant-home=/usr
+--with-external-dict-dir=/usr/share/myspell
+--with-external-hyph-dir= libdir@/@OOOINSTALLDIRNAME@/basis OOO_VERSION@/share/dictionaries
+--with-external-thes-dir= libdir@/@OOOINSTALLDIRNAME@/basis OOO_VERSION@/share/dictionaries
 --with-jdk-home=$JAVA_HOME
 --with-system-boost
 --with-system-cairo
 --with-system-curl
 --with-system-db
+--with-system-dicts
 --with-system-expat
 --with-system-libxslt
 --with-system-mozilla=xulrunner