office/openoffice.org: Updated for version 4.1.5 + new maintainer.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 20 insertions, 19 deletions

diff --git a/office/openoffice.org/README b/office/openoffice.org/README
index 92b3c5b861..f4b064b83b 100644
--- a/office/openoffice.org/README
+++ b/office/openoffice.org/README
@@ -1,11 +1,10 @@
-OpenOffice.org is a full-featured open-source office suite that is compatible 
-with all other major office software.
+OpenOffice.org is a full-featured open-source office suite that is
+compatible with all other major office software.
 
-This script builds a Slackware package from the official binary (RPM's) 
+This script builds a Slackware package from the official binary (RPM's)
 distributed by openoffice.org.
 
 Apache recommends having either jre or jdk installed, but it is not
 required. See more details here:
 
 https://wiki.openoffice.org/wiki/Java_and_OpenOffice.org
-
diff --git a/office/openoffice.org/openoffice.org.SlackBuild b/office/openoffice.org/openoffice.org.SlackBuild
index 613ff2afd4..2831770d3d 100644
--- a/office/openoffice.org/openoffice.org.SlackBuild
+++ b/office/openoffice.org/openoffice.org.SlackBuild
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 # Slackware build script for openoffice.org
+# Copyright 2018 Donald Cooley South Haven, Indiana USA
+# with help from Ekin Akoglu to fix missing menu icons and script cleanup.
 # Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
 # Originally written by Niki Kovacs <info@microlinux.fr)
 #
@@ -27,7 +29,7 @@
 
 PRGNAM=openoffice.org
 SRCNAM=openoffice
-VERSION=${VERSION:-4.1.3}
+VERSION=${VERSION:-4.1.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 SRCSHORT=$(echo $VERSION | cut -f1 -d.)
@@ -82,8 +84,6 @@ rm -rf $TMP/$SOURCEDIR
 
 tar xvf $CWD/$TARNAME -C $TMP
 
-#unzip -u $CWD/apache-${SRCNAM}-${VERSION}-patch1-apply-Linux`getconf LONG_BIT`.zip libtl.so -d $TMP
-
 cd $TMP/$SOURCEDIR/RPMS
 chown -R root:root .
 find -L . \
@@ -98,11 +98,11 @@ rm -f *onlineupdate*.rpm
 # Extract the files from the *.rpm
 for FILE in *.rpm ; do rpm2cpio < $FILE | cpio -imdv ; done
 
-rm -rf desktop-integration *.rpm
-mv opt $PKG
+cd desktop-integration
+rpm2cpio < openoffice$VERSION-freedesktop-menus-$VERSION-9789.noarch.rpm | cpio -imdv
+cd -
 
-## Apply security patch:
-#mv $TMP/libtl.so $PKG/opt/${SRCNAM}${SRCSHORT}/program/libtl.so
+mv opt $PKG
 
 cd $PKG
 
@@ -127,6 +127,9 @@ for APP in base calc draw impress math writer; do
   cp -av $PKG/opt/${SRCNAM}${SRCSHORT}/share/xdg/$APP.desktop $PKG/usr/share/applications/open-$APP.desktop ;
 done
 
+## menu icons!
+cp -R $TMP/$SOURCEDIR/RPMS/desktop-integration/usr/share/icons $PKG/usr/share/
+
 ## Move docs to their expected locations
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cd $PKG/opt/${SRCNAM}${SRCSHORT}
@@ -148,4 +151,3 @@ find . -type d -exec chmod 755 {} \;
 chmod -R u+rw,go+r-w,a-s .
 
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-${VERSION}_${PKG_LANG}-$PKGARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-
diff --git a/office/openoffice.org/openoffice.org.info b/office/openoffice.org/openoffice.org.info
index 0c4c53af69..8c0b3a4c99 100644
--- a/office/openoffice.org/openoffice.org.info
+++ b/office/openoffice.org/openoffice.org.info
@@ -1,10 +1,10 @@
 PRGNAM="openoffice.org"
-VERSION="4.1.3"
+VERSION="4.1.5"
 HOMEPAGE="https://openoffice.org"
-DOWNLOAD="http://sourceforge.net/projects/openofficeorg.mirror/files/4.1.3/binaries/en-US/Apache_OpenOffice_4.1.3_Linux_x86_install-rpm_en-US.tar.gz"
-MD5SUM="af75e671fce11bd0b8d3e91fef5fae13"
-DOWNLOAD_x86_64="http://sourceforge.net/projects/openofficeorg.mirror/files/4.1.3/binaries/en-US/Apache_OpenOffice_4.1.3_Linux_x86-64_install-rpm_en-US.tar.gz"
-MD5SUM_x86_64="d3f71313aaa04cf2b826ea0d9083c3ac"
+DOWNLOAD="https://sourceforge.net/projects/openofficeorg.mirror/files/4.1.5/binaries/en-US/Apache_OpenOffice_4.1.5_Linux_x86_install-rpm_en-US.tar.gz"
+MD5SUM="4e8acf5e611d0d5bf0386ef651255cd2"
+DOWNLOAD_x86_64="https://sourceforge.net/projects/openofficeorg.mirror/files/4.1.5/binaries/en-US/Apache_OpenOffice_4.1.5_Linux_x86-64_install-rpm_en-US.tar.gz"
+MD5SUM_x86_64="256ae2b559f771ebef9e5d4d6f076044"
 REQUIRES=""
-MAINTAINER="Ryan P.C. McQuen"
-EMAIL="ryanpcmcquen@member.fsf.org"
+MAINTAINER="Donald Cooley"
+EMAIL="chytraeu@sdf.org"