summaryrefslogtreecommitdiffstats
path: root/office/openoffice.org/openoffice.org.SlackBuild
diff options
context:
space:
mode:
author Donald Cooley2018-01-21 09:38:15 +0100
committer Willy Sudiarto Raharjo2018-01-27 01:43:47 +0100
commit3af27c45dd2c07b65997a8a8099fa63cbf59b75f (patch)
treebfbbd141a871c3120c04967b2aa22b957fd147fe /office/openoffice.org/openoffice.org.SlackBuild
parent22da25f287094d399d2dc454878ef0b737606f90 (diff)
downloadslackbuilds-3af27c45dd2c07b65997a8a8099fa63cbf59b75f.tar.gz
office/openoffice.org: Updated for version 4.1.5 + new maintainer.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'office/openoffice.org/openoffice.org.SlackBuild')
-rw-r--r--office/openoffice.org/openoffice.org.SlackBuild18
1 files changed, 10 insertions, 8 deletions
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}
-