libreoffice: properly erase old package contents

1 files changed, 23 insertions, 20 deletions

diff --git a/libreoffice/build/libreoffice.SlackBuild b/libreoffice/build/libreoffice.SlackBuild
index 3def5ad2..f66b5bff 100755
--- a/libreoffice/build/libreoffice.SlackBuild
+++ b/libreoffice/build/libreoffice.SlackBuild
@@ -283,6 +283,7 @@ PRGNAM2=mozplugin
 PRGNAM3=dict
 PRGNAM4=sdkdoc
 PRGNAM5=kde-integration
+PRGNAM6=l10n
 
 BUILD=${BUILD:-1}
 TAG=${TAG:-alien}
@@ -364,6 +365,7 @@ PKG2=$TMP/package-$PRGNAM-$PRGNAM2
 PKG3=$TMP/package-$PRGNAM-$PRGNAM3
 PKG4=$TMP/package-$PRGNAM-$PRGNAM4
 PKG5=$TMP/package-$PRGNAM-$PRGNAM5
+PKG6=$TMP/package-$PRGNAM-$PRGNAM6
 OUTPUT=${OUTPUT:-/tmp}
 
 # This package is built with Alien's Google API keys for LibreOffice.
@@ -1021,9 +1023,10 @@ else
   mkdir -p $PKG             # place for the package to be built
   rm -rf $PKG/*             # always erase old package's contents
   rm -rf $PKG2/*            # always erase old package's contents
-  rm -rf $PKG3/*            # always erase old package's contents
+  rm -rf $PKG3-*/*          # always erase old package's contents
   rm -rf $PKG4/*            # always erase old package's contents
   rm -rf $PKG5/*            # always erase old package's contents
+  rm -rf $PKG6-*/*          # always erase old package's contents
   rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
   rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PRGNAM.log
                             # remove old log files
@@ -1430,21 +1433,21 @@ 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
+    mkdir -p $TMP/package-${PRGNAM3}-${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
+      $TMP/package-${PRGNAM3}-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/extensions/
+    chown -R root:root $TMP/package-${PRGNAM3}-${DICTLANG}/usr/lib${LIBDIRSUFFIX}/$PRGNAM/share/extensions
+    mkdir -p $TMP/package-${PRGNAM3}-${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}
+      $TMP/package-${PRGNAM3}-${DICTLANG}/install/slack-desc
+      cd $TMP/package-${PRGNAM3}-${DICTLANG}
+      /sbin/makepkg -p -l y -c n $OUTPUT/${PRGNAM3}-${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
+      md5sum ${PRGNAM3}-${DICTLANG}-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM3}-$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
+      cat $TMP/package-${PRGNAM3}-${DICTLANG}/install/slack-desc | grep "^${PRGNAM3}-$DICTLANG" > $OUTPUT/${PRGNAM3}-$DICTLANG-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.txt
   else
     echo "ERROR: could not find dictionary '$DICTLANG' for packageing..."
   fi
@@ -1512,8 +1515,8 @@ if [ ! -z "${ADD_LANGUAGES}" ]; then
     langdesc="$(grep ^${lang}= $SRCDIR/languages |cut -f2 -d=)"
     lolang=$(echo $lang | tr _ -)
     echo "Splitting out '$lang' ($langdesc) - looking for '$lolang'..."
-    rm -rf ${PKG}-l10n-$lang
-    mkdir -p ${PKG}-l10n-$lang
+    rm -rf ${PKG6}-$lang
+    mkdir -p ${PKG6}-$lang
     tar cf - --remove-files \
       $(find . -depth -name "README*$lolang*" \
       -o -name "LICENSE*${lolang}*" \
@@ -1526,24 +1529,24 @@ if [ ! -z "${ADD_LANGUAGES}" ]; then
       -o -name "Lang_*${lolang}.xba" \
       -o -name "Langpack-${lolang}.xcu" \
       -o -name "*${lolang}.oxt") \
-    | ( cd ${PKG}-l10n-$lang ; tar xf - )
+    | ( cd ${PKG6}-$lang ; tar xf - )
     # Create slack-desc and doinst.sh :
-    mkdir -p ${PKG}-l10n-$lang/install
+    mkdir -p ${PKG6}-$lang/install
     cat $SRCDIR/slack-desc.l10n \
       | sed -e "s/@LANG@/$lang/g" -e "s/@LANGDESC@/$langdesc/g" > \
-      ${PKG}-l10n-$lang/install/slack-desc
+      ${PKG6}-$lang/install/slack-desc
     # Install per-language dictionary:
     cat $SRCDIR/doinst.sh.l10n \
       | sed -e "s/@LIBDIRSUFFIX@/${LIBDIRSUFFIX}/g" \
             -e "s/@LANG@/${lolang}/g" -e "s/@PRGNAM@/$PRGNAM/" \
-      > ${PKG}-l10n-$lang/install/doinst.sh
-    cd ${PKG}-l10n-$lang
-    /sbin/makepkg -p -l y -c n $OUTPUT/${PRGNAM}-l10n-${lang}-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}
+      > ${PKG6}-$lang/install/doinst.sh
+    cd ${PKG6}-$lang
+    /sbin/makepkg -p -l y -c n $OUTPUT/${PRGNAM6}-${lang}-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}
     cd -
     cd $OUTPUT
-    md5sum ${PRGNAM}-l10n-${lang}-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-l10n-$lang-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
+    md5sum ${PRGNAM6}-${lang}-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM6}-$lang-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5
     cd -
-    cat $PKG-l10n-$lang/install/slack-desc | grep "^${PRGNAM}-l10n-$lang" > $OUTPUT/${PRGNAM}-l10n-$lang-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.txt
+    cat $PKG6-$lang/install/slack-desc | grep "^${PRGNAM6}-$lang" > $OUTPUT/${PRGNAM6}--$lang-${LOVER}${VERSION}${PKG_SUBVER}-${ARCH}-${BUILD}${TAG}.txt
   done
 fi # End of splitting out language packs