This version produced proper working packages for LO 4.1.1.2

4 files changed, 128 insertions, 92 deletions

diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild
index 6890f215..b55341fb 100755
--- a/libreoffice/build/libreoffice.SlackBuild
+++ b/libreoffice/build/libreoffice.SlackBuild
@@ -930,18 +930,32 @@ fi
   done
 )
 
-# If we have any dictionaries in the $INSTDIR , now is the time to
-# copy them into the package:
-. ./bin/get_config_variables INSTDIR
-for DICTLANG in $(find $INSTDIR/share/extensions -name "dict-*" -type d -maxdepth 1 -mindepth 1 |rev |cut -d/ -f1 |rev |cut -d- -f2-); do
-  mkdir -p $TMP/package-${PRGNAM}-dict-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/extensions
-  cp -a $INSTDIR/share/extensions/dict-${DICTLANG} \
-    $TMP/package-${PRGNAM}-dict-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/extensions/
-  chown -R root:root $TMP/package-${PRGNAM}-dict-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/$PRGNAM/share/extensions
-  mkdir -p $TMP/package-${PRGNAM}-dict-${DICTLANG}/install
-  cat $SRCDIR/slack-desc.dict \
-    | sed -e "s/@LANG@/$DICTLANG/g" > \
-    $TMP/package-${PRGNAM}-dict-${DICTLANG}/install/slack-desc
+# If we have any dictionaries in the $INSTDIR (this variable is set already by the build process),
+# now is the time to copy them into the package:
+echo "Starting split-off of dictionaries from main $PRGNAM package..."
+DICTS="$(find $INSTDIR/share/extensions -name "dict-*" -type d -maxdepth 1 -mindepth 1 |rev |cut -d/ -f1 |rev |cut -d- -f2-)"
+echo "Found the following dictionaries in $INSTDIR: $(echo $DICTS)"
+for DICTLANG in $(cat $SRCDIR/languages.dict | cut -d= -f1) ; do
+  DICTLANGDESC="$(grep ^${DICTLANG}= $SRCDIR/languages.dict |cut -f2 -d=)"
+  if [ -d $INSTDIR/share/extensions/dict-${DICTLANG} ]; then
+    mkdir -p $TMP/package-${PRGNAM}-dict-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/extensions
+    cp -a $INSTDIR/share/extensions/dict-${DICTLANG} \
+      $TMP/package-${PRGNAM}-dict-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/extensions/
+    chown -R root:root $TMP/package-${PRGNAM}-dict-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/$PRGNAM/share/extensions
+    mkdir -p $TMP/package-${PRGNAM}-dict-${DICTLANG}/install
+    cat $SRCDIR/slack-desc.dict \
+      | sed -e "s/@LANG@/$DICTLANG/g"  -e "s/@LANGDESC@/$DICTLANGDESC/g" > \
+      $TMP/package-${PRGNAM}-dict-${DICTLANG}/install/slack-desc
+      cd $TMP/package-${PRGNAM}-dict-${DICTLANG}
+      /sbin/makepkg -p -l y -c n $OUTPUT/${PRGNAM}-dict-${DICTLANG}-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}
+      cd -
+      cd $OUTPUT
+      md5sum ${PRGNAM}-dict-${DICTLANG}-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-dict-$DICTLANG-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
+      cd -
+      cat $TMP/package-${PRGNAM}-dict-${DICTLANG}/install/slack-desc | grep "^${PRGNAM}-dict-$DICTLANG" > $OUTPUT/${PRGNAM}-dict-$DICTLANG-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.txt
+  else
+    echo "ERROR: could not find dictionary '$DICTLANG' for packageing..."
+  fi
 done
 
 # Create aliases for locales that have matching languages in LibreOffice.
@@ -1045,7 +1059,10 @@ cd $BUILDDIR
 # Libreoffice suddenly added version numbers to the name of the wrapper script
 # as well as the to the names of icons, so I'll remove that
 # (with thanks to Fedora's David Tardon):
-. ./bin/get_config_variables PRODUCTVERSIONSHORT PRODUCTVERSION WORKDIR
+set +u
+. ./bin/get_config_variables PRODUCTVERSIONSHORT PRODUCTVERSION ICONVERSION WORKDIR INSTDIR
+export PRODUCTVERSIONSHORT PRODUCTVERSION ICONVERSION WORKDIR
+set -u
 cd $WORKDIR/CustomTarget/sysui/share/libreoffice
   sed -i -e "s/^PREFIX=.*$/PREFIX=${PRGNAM}/" \
          -e "s/^ICON_PREFIX=.*$/ICON_PREFIX=${PRGNAM}/" \
@@ -1058,10 +1075,6 @@ cd $WORKDIR/CustomTarget/sysui/share/libreoffice
     ./create_tree.sh
 cd -
 
-# We are going to filter these version strings out of program descriptions:
-. ./bin/get_config_variables PRODUCTVERSIONSHORT PRODUCTVERSION SRCDIR WORKDIR
-export PRODUCTVERSIONSHORT PRODUCTVERSIONICONVERSION
-
 mkdir -p $PKG/usr/share/applications/
 # What about template.desktop ?
 cd $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/xdg/
@@ -1093,12 +1106,8 @@ GenericName=Extension Manager
 Comment=Add and organize the LibreOffice extensions.
 EOF
 
-# Copy icons and mime definitions but exclude Gnome-specific stuff:
-cd $BUILDDIR/sysui/output/usr/share
-  rm -r icons/{gnome,locolor}
-  cp -a icons $PKG/usr/share
-  cp -a mime $PKG/usr/share
-cd -
+# Remove Gnome-specific stuff:
+rm -r $PKG/usr/share/icons/{gnome,locolor}
 
 # Add a bash-completion script that was removed (?) after 3.3.2.2:
 if [ ! -f $PKG/etc/bash_completion.d/${PRGNAM}.sh ]; then
diff --git a/libreoffice/build/libreoffice41.SlackBuild b/libreoffice/build/libreoffice41.SlackBuild
index 6890f215..b55341fb 100755
--- a/libreoffice/build/libreoffice41.SlackBuild
+++ b/libreoffice/build/libreoffice41.SlackBuild
@@ -930,18 +930,32 @@ fi
   done
 )
 
-# If we have any dictionaries in the $INSTDIR , now is the time to
-# copy them into the package:
-. ./bin/get_config_variables INSTDIR
-for DICTLANG in $(find $INSTDIR/share/extensions -name "dict-*" -type d -maxdepth 1 -mindepth 1 |rev |cut -d/ -f1 |rev |cut -d- -f2-); do
-  mkdir -p $TMP/package-${PRGNAM}-dict-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/extensions
-  cp -a $INSTDIR/share/extensions/dict-${DICTLANG} \
-    $TMP/package-${PRGNAM}-dict-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/extensions/
-  chown -R root:root $TMP/package-${PRGNAM}-dict-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/$PRGNAM/share/extensions
-  mkdir -p $TMP/package-${PRGNAM}-dict-${DICTLANG}/install
-  cat $SRCDIR/slack-desc.dict \
-    | sed -e "s/@LANG@/$DICTLANG/g" > \
-    $TMP/package-${PRGNAM}-dict-${DICTLANG}/install/slack-desc
+# If we have any dictionaries in the $INSTDIR (this variable is set already by the build process),
+# now is the time to copy them into the package:
+echo "Starting split-off of dictionaries from main $PRGNAM package..."
+DICTS="$(find $INSTDIR/share/extensions -name "dict-*" -type d -maxdepth 1 -mindepth 1 |rev |cut -d/ -f1 |rev |cut -d- -f2-)"
+echo "Found the following dictionaries in $INSTDIR: $(echo $DICTS)"
+for DICTLANG in $(cat $SRCDIR/languages.dict | cut -d= -f1) ; do
+  DICTLANGDESC="$(grep ^${DICTLANG}= $SRCDIR/languages.dict |cut -f2 -d=)"
+  if [ -d $INSTDIR/share/extensions/dict-${DICTLANG} ]; then
+    mkdir -p $TMP/package-${PRGNAM}-dict-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/extensions
+    cp -a $INSTDIR/share/extensions/dict-${DICTLANG} \
+      $TMP/package-${PRGNAM}-dict-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/extensions/
+    chown -R root:root $TMP/package-${PRGNAM}-dict-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/$PRGNAM/share/extensions
+    mkdir -p $TMP/package-${PRGNAM}-dict-${DICTLANG}/install
+    cat $SRCDIR/slack-desc.dict \
+      | sed -e "s/@LANG@/$DICTLANG/g"  -e "s/@LANGDESC@/$DICTLANGDESC/g" > \
+      $TMP/package-${PRGNAM}-dict-${DICTLANG}/install/slack-desc
+      cd $TMP/package-${PRGNAM}-dict-${DICTLANG}
+      /sbin/makepkg -p -l y -c n $OUTPUT/${PRGNAM}-dict-${DICTLANG}-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}
+      cd -
+      cd $OUTPUT
+      md5sum ${PRGNAM}-dict-${DICTLANG}-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-dict-$DICTLANG-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
+      cd -
+      cat $TMP/package-${PRGNAM}-dict-${DICTLANG}/install/slack-desc | grep "^${PRGNAM}-dict-$DICTLANG" > $OUTPUT/${PRGNAM}-dict-$DICTLANG-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.txt
+  else
+    echo "ERROR: could not find dictionary '$DICTLANG' for packageing..."
+  fi
 done
 
 # Create aliases for locales that have matching languages in LibreOffice.
@@ -1045,7 +1059,10 @@ cd $BUILDDIR
 # Libreoffice suddenly added version numbers to the name of the wrapper script
 # as well as the to the names of icons, so I'll remove that
 # (with thanks to Fedora's David Tardon):
-. ./bin/get_config_variables PRODUCTVERSIONSHORT PRODUCTVERSION WORKDIR
+set +u
+. ./bin/get_config_variables PRODUCTVERSIONSHORT PRODUCTVERSION ICONVERSION WORKDIR INSTDIR
+export PRODUCTVERSIONSHORT PRODUCTVERSION ICONVERSION WORKDIR
+set -u
 cd $WORKDIR/CustomTarget/sysui/share/libreoffice
   sed -i -e "s/^PREFIX=.*$/PREFIX=${PRGNAM}/" \
          -e "s/^ICON_PREFIX=.*$/ICON_PREFIX=${PRGNAM}/" \
@@ -1058,10 +1075,6 @@ cd $WORKDIR/CustomTarget/sysui/share/libreoffice
     ./create_tree.sh
 cd -
 
-# We are going to filter these version strings out of program descriptions:
-. ./bin/get_config_variables PRODUCTVERSIONSHORT PRODUCTVERSION SRCDIR WORKDIR
-export PRODUCTVERSIONSHORT PRODUCTVERSIONICONVERSION
-
 mkdir -p $PKG/usr/share/applications/
 # What about template.desktop ?
 cd $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/xdg/
@@ -1093,12 +1106,8 @@ GenericName=Extension Manager
 Comment=Add and organize the LibreOffice extensions.
 EOF
 
-# Copy icons and mime definitions but exclude Gnome-specific stuff:
-cd $BUILDDIR/sysui/output/usr/share
-  rm -r icons/{gnome,locolor}
-  cp -a icons $PKG/usr/share
-  cp -a mime $PKG/usr/share
-cd -
+# Remove Gnome-specific stuff:
+rm -r $PKG/usr/share/icons/{gnome,locolor}
 
 # Add a bash-completion script that was removed (?) after 3.3.2.2:
 if [ ! -f $PKG/etc/bash_completion.d/${PRGNAM}.sh ]; then
diff --git a/libreoffice/build/libreoffice42.SlackBuild b/libreoffice/build/libreoffice42.SlackBuild
index 6890f215..b55341fb 100755
--- a/libreoffice/build/libreoffice42.SlackBuild
+++ b/libreoffice/build/libreoffice42.SlackBuild
@@ -930,18 +930,32 @@ fi
   done
 )
 
-# If we have any dictionaries in the $INSTDIR , now is the time to
-# copy them into the package:
-. ./bin/get_config_variables INSTDIR
-for DICTLANG in $(find $INSTDIR/share/extensions -name "dict-*" -type d -maxdepth 1 -mindepth 1 |rev |cut -d/ -f1 |rev |cut -d- -f2-); do
-  mkdir -p $TMP/package-${PRGNAM}-dict-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/extensions
-  cp -a $INSTDIR/share/extensions/dict-${DICTLANG} \
-    $TMP/package-${PRGNAM}-dict-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/extensions/
-  chown -R root:root $TMP/package-${PRGNAM}-dict-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/$PRGNAM/share/extensions
-  mkdir -p $TMP/package-${PRGNAM}-dict-${DICTLANG}/install
-  cat $SRCDIR/slack-desc.dict \
-    | sed -e "s/@LANG@/$DICTLANG/g" > \
-    $TMP/package-${PRGNAM}-dict-${DICTLANG}/install/slack-desc
+# If we have any dictionaries in the $INSTDIR (this variable is set already by the build process),
+# now is the time to copy them into the package:
+echo "Starting split-off of dictionaries from main $PRGNAM package..."
+DICTS="$(find $INSTDIR/share/extensions -name "dict-*" -type d -maxdepth 1 -mindepth 1 |rev |cut -d/ -f1 |rev |cut -d- -f2-)"
+echo "Found the following dictionaries in $INSTDIR: $(echo $DICTS)"
+for DICTLANG in $(cat $SRCDIR/languages.dict | cut -d= -f1) ; do
+  DICTLANGDESC="$(grep ^${DICTLANG}= $SRCDIR/languages.dict |cut -f2 -d=)"
+  if [ -d $INSTDIR/share/extensions/dict-${DICTLANG} ]; then
+    mkdir -p $TMP/package-${PRGNAM}-dict-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/extensions
+    cp -a $INSTDIR/share/extensions/dict-${DICTLANG} \
+      $TMP/package-${PRGNAM}-dict-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/extensions/
+    chown -R root:root $TMP/package-${PRGNAM}-dict-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/$PRGNAM/share/extensions
+    mkdir -p $TMP/package-${PRGNAM}-dict-${DICTLANG}/install
+    cat $SRCDIR/slack-desc.dict \
+      | sed -e "s/@LANG@/$DICTLANG/g"  -e "s/@LANGDESC@/$DICTLANGDESC/g" > \
+      $TMP/package-${PRGNAM}-dict-${DICTLANG}/install/slack-desc
+      cd $TMP/package-${PRGNAM}-dict-${DICTLANG}
+      /sbin/makepkg -p -l y -c n $OUTPUT/${PRGNAM}-dict-${DICTLANG}-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}
+      cd -
+      cd $OUTPUT
+      md5sum ${PRGNAM}-dict-${DICTLANG}-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-dict-$DICTLANG-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
+      cd -
+      cat $TMP/package-${PRGNAM}-dict-${DICTLANG}/install/slack-desc | grep "^${PRGNAM}-dict-$DICTLANG" > $OUTPUT/${PRGNAM}-dict-$DICTLANG-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.txt
+  else
+    echo "ERROR: could not find dictionary '$DICTLANG' for packageing..."
+  fi
 done
 
 # Create aliases for locales that have matching languages in LibreOffice.
@@ -1045,7 +1059,10 @@ cd $BUILDDIR
 # Libreoffice suddenly added version numbers to the name of the wrapper script
 # as well as the to the names of icons, so I'll remove that
 # (with thanks to Fedora's David Tardon):
-. ./bin/get_config_variables PRODUCTVERSIONSHORT PRODUCTVERSION WORKDIR
+set +u
+. ./bin/get_config_variables PRODUCTVERSIONSHORT PRODUCTVERSION ICONVERSION WORKDIR INSTDIR
+export PRODUCTVERSIONSHORT PRODUCTVERSION ICONVERSION WORKDIR
+set -u
 cd $WORKDIR/CustomTarget/sysui/share/libreoffice
   sed -i -e "s/^PREFIX=.*$/PREFIX=${PRGNAM}/" \
          -e "s/^ICON_PREFIX=.*$/ICON_PREFIX=${PRGNAM}/" \
@@ -1058,10 +1075,6 @@ cd $WORKDIR/CustomTarget/sysui/share/libreoffice
     ./create_tree.sh
 cd -
 
-# We are going to filter these version strings out of program descriptions:
-. ./bin/get_config_variables PRODUCTVERSIONSHORT PRODUCTVERSION SRCDIR WORKDIR
-export PRODUCTVERSIONSHORT PRODUCTVERSIONICONVERSION
-
 mkdir -p $PKG/usr/share/applications/
 # What about template.desktop ?
 cd $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/xdg/
@@ -1093,12 +1106,8 @@ GenericName=Extension Manager
 Comment=Add and organize the LibreOffice extensions.
 EOF
 
-# Copy icons and mime definitions but exclude Gnome-specific stuff:
-cd $BUILDDIR/sysui/output/usr/share
-  rm -r icons/{gnome,locolor}
-  cp -a icons $PKG/usr/share
-  cp -a mime $PKG/usr/share
-cd -
+# Remove Gnome-specific stuff:
+rm -r $PKG/usr/share/icons/{gnome,locolor}
 
 # Add a bash-completion script that was removed (?) after 3.3.2.2:
 if [ ! -f $PKG/etc/bash_completion.d/${PRGNAM}.sh ]; then
diff --git a/libreoffice/build/libreoffice43.SlackBuild b/libreoffice/build/libreoffice43.SlackBuild
index 6890f215..b55341fb 100755
--- a/libreoffice/build/libreoffice43.SlackBuild
+++ b/libreoffice/build/libreoffice43.SlackBuild
@@ -930,18 +930,32 @@ fi
   done
 )
 
-# If we have any dictionaries in the $INSTDIR , now is the time to
-# copy them into the package:
-. ./bin/get_config_variables INSTDIR
-for DICTLANG in $(find $INSTDIR/share/extensions -name "dict-*" -type d -maxdepth 1 -mindepth 1 |rev |cut -d/ -f1 |rev |cut -d- -f2-); do
-  mkdir -p $TMP/package-${PRGNAM}-dict-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/extensions
-  cp -a $INSTDIR/share/extensions/dict-${DICTLANG} \
-    $TMP/package-${PRGNAM}-dict-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/extensions/
-  chown -R root:root $TMP/package-${PRGNAM}-dict-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/$PRGNAM/share/extensions
-  mkdir -p $TMP/package-${PRGNAM}-dict-${DICTLANG}/install
-  cat $SRCDIR/slack-desc.dict \
-    | sed -e "s/@LANG@/$DICTLANG/g" > \
-    $TMP/package-${PRGNAM}-dict-${DICTLANG}/install/slack-desc
+# If we have any dictionaries in the $INSTDIR (this variable is set already by the build process),
+# now is the time to copy them into the package:
+echo "Starting split-off of dictionaries from main $PRGNAM package..."
+DICTS="$(find $INSTDIR/share/extensions -name "dict-*" -type d -maxdepth 1 -mindepth 1 |rev |cut -d/ -f1 |rev |cut -d- -f2-)"
+echo "Found the following dictionaries in $INSTDIR: $(echo $DICTS)"
+for DICTLANG in $(cat $SRCDIR/languages.dict | cut -d= -f1) ; do
+  DICTLANGDESC="$(grep ^${DICTLANG}= $SRCDIR/languages.dict |cut -f2 -d=)"
+  if [ -d $INSTDIR/share/extensions/dict-${DICTLANG} ]; then
+    mkdir -p $TMP/package-${PRGNAM}-dict-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/extensions
+    cp -a $INSTDIR/share/extensions/dict-${DICTLANG} \
+      $TMP/package-${PRGNAM}-dict-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/extensions/
+    chown -R root:root $TMP/package-${PRGNAM}-dict-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/$PRGNAM/share/extensions
+    mkdir -p $TMP/package-${PRGNAM}-dict-${DICTLANG}/install
+    cat $SRCDIR/slack-desc.dict \
+      | sed -e "s/@LANG@/$DICTLANG/g"  -e "s/@LANGDESC@/$DICTLANGDESC/g" > \
+      $TMP/package-${PRGNAM}-dict-${DICTLANG}/install/slack-desc
+      cd $TMP/package-${PRGNAM}-dict-${DICTLANG}
+      /sbin/makepkg -p -l y -c n $OUTPUT/${PRGNAM}-dict-${DICTLANG}-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}
+      cd -
+      cd $OUTPUT
+      md5sum ${PRGNAM}-dict-${DICTLANG}-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-dict-$DICTLANG-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
+      cd -
+      cat $TMP/package-${PRGNAM}-dict-${DICTLANG}/install/slack-desc | grep "^${PRGNAM}-dict-$DICTLANG" > $OUTPUT/${PRGNAM}-dict-$DICTLANG-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.txt
+  else
+    echo "ERROR: could not find dictionary '$DICTLANG' for packageing..."
+  fi
 done
 
 # Create aliases for locales that have matching languages in LibreOffice.
@@ -1045,7 +1059,10 @@ cd $BUILDDIR
 # Libreoffice suddenly added version numbers to the name of the wrapper script
 # as well as the to the names of icons, so I'll remove that
 # (with thanks to Fedora's David Tardon):
-. ./bin/get_config_variables PRODUCTVERSIONSHORT PRODUCTVERSION WORKDIR
+set +u
+. ./bin/get_config_variables PRODUCTVERSIONSHORT PRODUCTVERSION ICONVERSION WORKDIR INSTDIR
+export PRODUCTVERSIONSHORT PRODUCTVERSION ICONVERSION WORKDIR
+set -u
 cd $WORKDIR/CustomTarget/sysui/share/libreoffice
   sed -i -e "s/^PREFIX=.*$/PREFIX=${PRGNAM}/" \
          -e "s/^ICON_PREFIX=.*$/ICON_PREFIX=${PRGNAM}/" \
@@ -1058,10 +1075,6 @@ cd $WORKDIR/CustomTarget/sysui/share/libreoffice
     ./create_tree.sh
 cd -
 
-# We are going to filter these version strings out of program descriptions:
-. ./bin/get_config_variables PRODUCTVERSIONSHORT PRODUCTVERSION SRCDIR WORKDIR
-export PRODUCTVERSIONSHORT PRODUCTVERSIONICONVERSION
-
 mkdir -p $PKG/usr/share/applications/
 # What about template.desktop ?
 cd $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/xdg/
@@ -1093,12 +1106,8 @@ GenericName=Extension Manager
 Comment=Add and organize the LibreOffice extensions.
 EOF
 
-# Copy icons and mime definitions but exclude Gnome-specific stuff:
-cd $BUILDDIR/sysui/output/usr/share
-  rm -r icons/{gnome,locolor}
-  cp -a icons $PKG/usr/share
-  cp -a mime $PKG/usr/share
-cd -
+# Remove Gnome-specific stuff:
+rm -r $PKG/usr/share/icons/{gnome,locolor}
 
 # Add a bash-completion script that was removed (?) after 3.3.2.2:
 if [ ! -f $PKG/etc/bash_completion.d/${PRGNAM}.sh ]; then