This version correctly creates a 3.4.0.2 package

1 files changed, 9 insertions, 7 deletions

diff --git a/libreoffice/build/libreoffice36.SlackBuild b/libreoffice/build/libreoffice36.SlackBuild
index fb5e5adc..03e703b2 100755
--- a/libreoffice/build/libreoffice36.SlackBuild
+++ b/libreoffice/build/libreoffice36.SlackBuild
@@ -888,6 +888,9 @@ if [ ! -z "${ADD_LANGUAGES}" ]; then
   done
 fi # End of splitting out language packs
 
+# Back to base:
+cd $TMP/tmp-$PRGNAM/build
+
 # Libreoffice suddenly adds 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):
@@ -895,7 +898,7 @@ cd sysui/unxl*.pro/misc/libreoffice
   sed -i -e "s/^PREFIX=.*$/PREFIX=${PRGNAM}/" \
          -e "s/^ICON_PREFIX=.*$/ICON_PREFIX=${PRGNAM}/" \
          -e "s/^PRODUCTVERSION=.*$/PRODUCTVERSION=''/" \
-         -e "s#^office_prefix=.*$#office_prefix=/usr/lib${LIBDIRSUFFIX}/${PRGNAM}#" \
+         -e "s/^office_prefix=.*$/office_prefix=\/usr\/lib${LIBDIRSUFFIX}\/${PRGNAM}/" \
     create_tree.sh
 
   # Time to start doing what the deprecated 'build' tarball used to do for us:
@@ -918,7 +921,7 @@ cd $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/xdg/
     sed -i \
         -e "s/$PRODUCTVERSION//g" \
         -e "s/$ICONVERSION//g" \
-        -e "s/$PRODUCTVERSIONSHORT//g"
+        -e "s/$PRODUCTVERSIONSHORT//g" \
       ${FILE}.desktop
     echo "StartupNotify=true" >> ${FILE}.desktop
     install -m0644 ${FILE}.desktop \
@@ -942,8 +945,7 @@ GenericName=Extension Manager
 Comment=Add and organize the LibreOffice extensions.
 EOF
 
-# Add the new icons and tell the menu entries to use those instead of ooo-* :
-find $PKG/usr/share/icons -name "ooo-*" -exec rm -f {} \; || true
+# Copy icons and mime definitions but exclude Gnome-specific stuff:
 cd $TMP/tmp-$PRGNAM/build/sysui/output/usr/share
   rm -r icons/{gnome,locolor}
   cp -a icons $PKG/usr/share
@@ -957,11 +959,11 @@ if [ ! -f $PKG/etc/bash_completion.d/${PRGNAM}.sh ]; then
     $PKG/etc/bash_completion.d/${PRGNAM}.sh
 fi
 
-# Add scripts that call the real binaries:
+# Add wrapper scripts that call the real binaries:
 mkdir -p $PKG/usr/bin
 cat <<EOF > $PKG/usr/bin/${PRGNAM}
 #!/bin/sh
-/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/program/soffice  "\$@"
+/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/program/soffice "\$@"
 EOF
 chmod 0755 $PKG/usr/bin/${PRGNAM}
 
@@ -1020,7 +1022,7 @@ EOF
 chmod 0755 $PKG/usr/bin/loimpress
 
 # Back to base:
-cd $TMP/tmp-$PRGNAM
+cd $TMP/tmp-$PRGNAM/build
 
 # Create the package's post-install script:
 mkdir -p $PKG/install