Try if this works properly for 3.4.0.2

1 files changed, 39 insertions, 23 deletions

diff --git a/libreoffice/build/libreoffice36.SlackBuild b/libreoffice/build/libreoffice36.SlackBuild
index 71e7c443..fb5e5adc 100755
--- a/libreoffice/build/libreoffice36.SlackBuild
+++ b/libreoffice/build/libreoffice36.SlackBuild
@@ -79,10 +79,10 @@
 #               The SlackBuild has been updated to use new LibreOffice menu
 #               icons instead of the old OOo versions.
 #               Also add italian dictionary (request).
-# 3.3.99.5-1: 13/may/2011 by Eric Hameleers <alien@slackware.com>
-#             * Beta 5 of the new major release.
-#               Add german dictionary (dict-de-DE_frami) on request.
-#               Add bundled scripting extensions.
+# 3.4.0.2-1:  28/may/2011 by Eric Hameleers <alien@slackware.com>
+#             * Second release candidate of the new major release.
+#               Added german dictionary (dict-de-DE_frami) and polish pl-dict
+#               on request.  Added bundled scripting extensions.
 #               Stopped building from the 'build' tarball since that seems
 #               to be deprecated soon. Stupid decision folks! It makes proper
 #               packaging so much harder.
@@ -110,7 +110,7 @@ TAG=${TAG:-alien}
 #SRCVER=${SRCVER:-HEAD}
 #SRCVER=${SRCVER:-3.3.0.4}
 
-SRCVER=${SRCVER:-3.3.99.5}
+SRCVER=${SRCVER:-3.4.0.2}
 SUBVER=""
 
 # If we pull a git shapshot, use today's date as the VERSION:
@@ -466,7 +466,8 @@ SOURCE[115]="$SRCDIR/sources/dict-it.oxt"
 SRCURL[115]="http://extensions.services.openoffice.org/e-files/1064/0/dict-it-IT_and_Latin_2010-08-23.oxt"
 SOURCE[116]="$SRCDIR/sources/dict-de.oxt"
 SRCURL[116]="http://extensions.services.openoffice.org/e-files/1075/8/dict-de_DE-frami_2010-12-04.oxt"
-
+SOURCE[117]="$SRCDIR/sources/pl-dict.oxt"
+SRCURL[117]="http://extensions.services.openoffice.org/e-files/806/4/pl-dict.oxt"
 
 # Use the src_checkout() function if no downloadable tarball exists.
 # This function checks out sources from SVN/CVS and creates a tarball of them.
@@ -887,12 +888,38 @@ if [ ! -z "${ADD_LANGUAGES}" ]; then
   done
 fi # End of splitting out language packs
 
-# Create desktop menu entries:
+# 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):
+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}#" \
+    create_tree.sh
+
+  # Time to start doing what the deprecated 'build' tarball used to do for us:
+  # We need to generate the icons and mime type files ourselves now.
+  # All the other created stuff can be discarded:
+  KDEMAINDIR=/usr GNOMEDIR=/usr GNOME_MIME_THEME=hicolor \
+  DESTDIR=../../../output \
+    ./create_tree.sh
+cd -
+
+# We are going to filter these version strings out of program descriptions:
+export $(grep "^PRODUCTVERSIONSHORT =" solenv/inc/productversion.mk | sed -e "s/ //g")
+export $(grep "PRODUCTVERSION[ ]*=[ ]*" solenv/inc/productversion.mk | sed -e "s/ //g")
+ICONVERSION=`echo $PRODUCTVERSION | sed -e 's/\.//'`
+
 mkdir -p $PKG/usr/share/applications/
 # What about template.desktop ?
 cd $PKG/usr/lib${LIBDIRSUFFIX}/${PRGNAM}/share/xdg/
   for FILE in base calc impress writer math draw startcenter ; do
-    sed -i -e "/^Exec=/s/Exec=libreoffice[^ ]* /Exec=libreoffice /" $FILE
+    sed -i \
+        -e "s/$PRODUCTVERSION//g" \
+        -e "s/$ICONVERSION//g" \
+        -e "s/$PRODUCTVERSIONSHORT//g"
+      ${FILE}.desktop
     echo "StartupNotify=true" >> ${FILE}.desktop
     install -m0644 ${FILE}.desktop \
       $PKG/usr/share/applications/${PRGNAM}-${FILE}.desktop
@@ -917,18 +944,12 @@ 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
-cd $TMP/tmp-$PRGNAM/build/sysui/desktop
-  find icons/hicolor -path "*apps*" -name "*.png" | while read LINE
-  do
-    mkdir -p $PKG/usr/share/$(dirname $LINE)
-    install -m0644 $LINE \
-      $PKG/usr/share/$(dirname $LINE)/${PRGNAM}-$(basename $LINE)
-  done
+cd $TMP/tmp-$PRGNAM/build/sysui/output/usr/share
+  rm -r icons/{gnome,locolor}
+  cp -a icons $PKG/usr/share
+  cp -a mime $PKG/usr/share
 cd -
 
-# May no longer be needed:
-sed -i -e "s/^Icon=ooo-/Icon=${PRGNAM}-/" $PKG/usr/share/applications/*.desktop
-
 # Add a bash-completion script that was removed (?) after 3.3.2.2:
 if [ ! -f $PKG/etc/bash_completion.d/${PRGNAM}.sh ]; then
   mkdir -p $PKG/etc/bash_completion.d
@@ -998,11 +1019,6 @@ cat <<EOF > $PKG/usr/bin/loimpress
 EOF
 chmod 0755 $PKG/usr/bin/loimpress
 
-# Fix the call to the program name in desktop entries (3.3.0.3 needs this):
-if [ ! -f $PKG/usr/bin/oowriter ]; then
-  sed -i -e "s/Exec=oo/Exec=lo/g" $PKG/usr/share/applications/*.desktop
-fi
-
 # Back to base:
 cd $TMP/tmp-$PRGNAM