Update to 3.4.5, first try

1 files changed, 15 insertions, 8 deletions

diff --git a/libreoffice/build/libreoffice36.SlackBuild b/libreoffice/build/libreoffice36.SlackBuild
index 332a835a..987ef22f 100755
--- a/libreoffice/build/libreoffice36.SlackBuild
+++ b/libreoffice/build/libreoffice36.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2010, 2011  Eric Hameleers, Eindhoven, NL
+# Copyright 2010, 2011, 2012  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -100,9 +100,12 @@
 # 3.4.4-2:    24/nov/2011 by Eric Hameleers <alien@slackware.com>
 #             * Apply two patches to fix annoying issues with KDE (black
 #               tooltips and non-movable horizontal scrollbar).
-# X.X.X-1:    XX/XXX/2011 by Eric Hameleers <alien@slackware.com>
+# 3.4.5-1:    17/jan/2012 by Eric Hameleers <alien@slackware.com>
 #             * Added Swedish dictionary (requested by eXpander). Fixed the
 #               name of the Polish dictionary so that it gets really included.
+#               Moved a lot of language-specific files to their language packs.
+#               Thanks to Andrzej Szelachow for reporting about the dictionary
+#               and language files.
 #
 # Run 'sh libreoffice.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -114,7 +117,7 @@
 
 PRGNAM=libreoffice
 PRGNAM2=mozplugin
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
 
 # SRCVER is the variable you control. It can be one of:
@@ -128,7 +131,7 @@ TAG=${TAG:-alien}
 #SRCVER=${SRCVER:-HEAD}
 #SRCVER=${SRCVER:-3.3.0.4}
 
-SRCVER=${SRCVER:-3.4.4}
+SRCVER=${SRCVER:-3.4.5}
 SUBVER=".2"
 
 # If we pull a git shapshot, use today's date as the VERSION:
@@ -332,8 +335,8 @@ SOURCE[40]="$SRCDIR/sources/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-
 SRCURL[40]="http://hg.services.openoffice.org/binaries/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz"
 SOURCE[41]="$SRCDIR/sources/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"
 SRCURL[41]="http://hg.services.openoffice.org/binaries/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"
-SOURCE[42]="$SRCDIR/sources/ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz"
-SRCURL[42]="http://hg.services.openoffice.org/binaries/ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz"
+SOURCE[42]="$SRCDIR/sources/0be45d54cc5e1c2e3102e32b8c190346-liberation-fonts-ttf-1.07.1.tar.gz"
+SRCURL[42]="http://dev-www.libreoffice.org/src/0be45d54cc5e1c2e3102e32b8c190346-liberation-fonts-ttf-1.07.1.tar.gz"
 SOURCE[43]="$SRCDIR/sources/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
 SRCURL[43]="http://hg.services.openoffice.org/binaries/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
 SOURCE[44]="$SRCDIR/sources/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip"
@@ -434,8 +437,8 @@ SOURCE[91]="$SRCDIR/sources/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz
 SRCURL[91]="http://download.go-oo.org/src/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2"
 SOURCE[92]="$SRCDIR/sources/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz"
 SRCURL[92]="http://hg.services.openoffice.org/binaries/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz"
-SOURCE[93]="$SRCDIR/sources/37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip"
-SRCURL[93]="http://hg.services.openoffice.org/binaries/37282537d0ed1a087b1c8f050dc812d9-dejavu-fonts-ttf-2.32.zip"
+SOURCE[93]="$SRCDIR/sources/f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip"
+SRCURL[93]="http://dev-www.libreoffice.org/src/f872f4ac066433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip"
 SOURCE[94]="$SRCDIR/sources/831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip"
 SRCURL[94]="http://hg.services.openoffice.org/binaries/831126a1ee5af269923cfab6050769fe-mysql-connector-cpp.zip"
 SOURCE[95]="$SRCDIR/sources/067201ea8b126597670b5eff72e1f66c-mythes-1.2.0.tar.gz"
@@ -903,7 +906,11 @@ if [ ! -z "${ADD_LANGUAGES}" ]; then
     tar cf - --remove-files \
       $(find . -depth -name "README*$lolang*" \
       -o -name "LICENSE*${lolang}*" \
+      -o -name "description_${lolang}.txt" \
       -o -type d -name "${lolang}" \
+      -o -path "*/autocorr/*" -name "*${lolang}.dat" \
+      -o -path "*/resource/*" -name "*${lolang}.res" \
+      -o -path "*/registry/*" -name "*${lolang}.xcd" \
       -o -name "Lang_*${lolang}.xba" \
       -o -name "Langpack-${lolang}.xcu" \
       -o -name "*${lolang}.oxt") \