Try another checkout - see if that stops complaining about userland.txt

1 files changed, 16 insertions, 11 deletions

diff --git a/libreoffice/build/libreoffice36.SlackBuild b/libreoffice/build/libreoffice36.SlackBuild
index 63b4355f..d77da316 100755
--- a/libreoffice/build/libreoffice36.SlackBuild
+++ b/libreoffice/build/libreoffice36.SlackBuild
@@ -29,7 +29,7 @@
 # Descr:      free office suite
 # URL:        http://www.documentfoundation.org/
 # Needs:      
-# Build-time: apache-ant,perl-Archive-Zip,xulrunner
+# Build-time: apache-ant,jdk,perl-Archive-Zip,xulrunner
 # Changelog:  
 # 20101010-1: 10/oct/2010 by Eric Hameleers <alien@slackware.com>
 #             * Initial build from git. I will refine this SlackBuild, once a
@@ -39,7 +39,7 @@
 #               so that the package version will be like "3.2.99.2_20101012".
 #               Remove the slack-required file, since this package has no
 #               run-time dependencies any more.
-# 20101023-1: 23/oct/2010 by Eric Hameleers <alien@slackware.com>
+# 20101024-1: 23/oct/2010 by Eric Hameleers <alien@slackware.com>
 #             * Fix permissions of LICENSE.odt file.
 #               Add additional (non-english) language support - some code taken
 #               from GnomeSlackBuild's openoffice3.SlackBuild script.
@@ -53,8 +53,8 @@
 # Set initial variables:
 
 PRGNAM=libreoffice
-#SRCVER=${SRCVER:-20101023}
-SRCVER=${SRCVER:-HEAD}
+SRCVER=${SRCVER:-20101024}
+#SRCVER=${SRCVER:-HEAD}
 [ "$SRCVER" = "HEAD" ] && VERSION=$(date +%Y%m%d) || VERSION=$SRCVER
 BUILD=${BUILD:-1}
 NUMCPUS=${NUMCPUS:4}
@@ -62,8 +62,12 @@ TAG=${TAG:-alien}
 
 DOCS="AUTHORS COPYING* MAINTAINERS NEWS README* TODO TOTEST"
 
+# Where do we look for sources?
+SRCDIR=$(cd $(dirname $0); pwd)
+
 # Select default langue for the libreoffice package:
-DEF_LANG=${DEF_LANG:-"en-US"}                                                             
+DEF_LANG=${DEF_LANG:-"en_US"}                                                             
+
 # If this variable is non-empty, we will build additional languuage packs;
 # otherwise LibreOffice will be built for one language, defined in DEF_LANG:
 # By the way:
@@ -71,9 +75,6 @@ DEF_LANG=${DEF_LANG:-"en-US"}
 #  called 'languages' in the same directory, edit that one if you want:
 ADD_LANGUAGES="$(cat $SRCDIR/languages |cut -f1 -d= |tr '\n' ' ' |tr -s ' ' |sed -e 's/ *$//')"
 
-# Where do we look for sources?
-SRCDIR=$(cd $(dirname $0); pwd)
-
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
 TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
@@ -213,8 +214,10 @@ echo "|| $PRGNAM-$VERSION"
 echo "++"
 
 cd $TMP/tmp-$PRGNAM
-echo "Extracting the source archive(s) for $PRGNAM..."
-tar -xvf ${SOURCE[0]}
+if [ "$P1" != "--oldbuild" ]; then
+  echo "Extracting the source archive(s) for $PRGNAM..."
+  tar -xvf ${SOURCE[0]}
+fi
 cd ${PRGNAM}-${VERSION}
 
 chown -R root:root .
@@ -258,9 +261,11 @@ mkdir -p /usr/share/openclipart
 if [ -z "$ADD_LANGUAGES" ]; then
   LANGUAGES="$DEF_LANG"
 else
-  LANGUAGES="${DEF_LANG} $(echo ${ADD_LANGUAGES} |sed -e 's/${DEF_LANG} *//')"
+  LANGUAGES="${DEF_LANG} $(echo ${ADD_LANGUAGES} |sed -e "s/${DEF_LANG} *//")"
 fi
 
+echo "Building for these languages: $LANGUAGES"
+
 enable_pam=no \
 ./autogen.sh \
   --with-arch-flags="$SLKCFLAGS" \