diff options
| -rw-r--r-- | office/openoffice.org/openoffice.org.SlackBuild | 23 | ||||
| -rw-r--r-- | office/openoffice.org/openoffice.org.info | 10 |
2 files changed, 9 insertions, 24 deletions
diff --git a/office/openoffice.org/openoffice.org.SlackBuild b/office/openoffice.org/openoffice.org.SlackBuild index c2ce3bd61f793..8ae0adc5e4c36 100644 --- a/office/openoffice.org/openoffice.org.SlackBuild +++ b/office/openoffice.org/openoffice.org.SlackBuild @@ -2,10 +2,11 @@ # Slackware build script for openoffice.org +# Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com + # Originally written by Niki Kovacs <info@microlinux.fr) # # Rewritten for slackbuilds.org by Ryan P.C. McQuen -# Copyright 2014 Ryan P.C. McQuen, ryan.q@linux.com, WA # # All rights reserved. # @@ -27,7 +28,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=openoffice.org -VERSION=${VERSION:-4.1.0} +VERSION=${VERSION:-4.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} SRCSHORT=$(echo $VERSION | cut -f1-2 -d.) @@ -83,9 +84,6 @@ tar xvf $CWD/$TARNAME -C $TMP cd $TMP/$SOURCEDIR/RPMS -# We only need the freedesktop integration, so we move it to the current location -mv desktop-integration/openoffice$SRCSHORT-freedesktop-menus-$SRCSHORT-*.noarch.rpm . - # We don't want this, so we delete the *onlineupdate*.rpm rm -f *onlineupdate*.rpm @@ -93,22 +91,9 @@ rm -f *onlineupdate*.rpm for FILE in *.rpm ; do rpm2cpio < $FILE | cpio -imdv ; done rm -rf desktop-integration *.rpm -mv opt usr $PKG +mv opt $PKG cd $PKG -# Fix broken symlinks -cd $PKG/usr/bin - rm -f soffice - ln -s ../../opt/openoffice4/program/soffice . -cd - -cd $PKG/usr/share/applications - for FILE in \ - base calc draw impress javafilter math printeradmin startcenter writer ; do - rm -f openoffice4-$FILE.desktop - ln -sf ../../../opt/openoffice4/share/xdg/$FILE.desktop $FILE.desktop ; - done -cd - - # Remove DejaVu fonts - these are included in other packages rm -f $PKG/opt/openoffice4/share/fonts/truetype/DejaVu*.ttf diff --git a/office/openoffice.org/openoffice.org.info b/office/openoffice.org/openoffice.org.info index 2434ab330d7e5..719fab6ba19f4 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.0" +VERSION="4.1.1" HOMEPAGE="https://openoffice.org" -DOWNLOAD="http://sourceforge.net/projects/openofficeorg.mirror/files/4.1.0/binaries/en-US/Apache_OpenOffice_4.1.0_Linux_x86_install-rpm_en-US.tar.gz" -MD5SUM="54ef66e4929302b7b4c9a3cff5489bc3" -DOWNLOAD_x86_64="http://sourceforge.net/projects/openofficeorg.mirror/files/4.1.0/binaries/en-US/Apache_OpenOffice_4.1.0_Linux_x86-64_install-rpm_en-US.tar.gz" -MD5SUM_x86_64="2c9c41c3c49129fa2518ebffd300a832" +DOWNLOAD="http://sourceforge.net/projects/openofficeorg.mirror/files/4.1.1/binaries/en-US/Apache_OpenOffice_4.1.1_Linux_x86_install-rpm_en-US.tar.gz" +MD5SUM="46e0aa610b121b23d9ed820016a6e7fd" +DOWNLOAD_x86_64="http://sourceforge.net/projects/openofficeorg.mirror/files/4.1.1/binaries/en-US/Apache_OpenOffice_4.1.1_Linux_x86-64_install-rpm_en-US.tar.gz" +MD5SUM_x86_64="b86a422de7be43f659555f2edbd74590" REQUIRES="" MAINTAINER="Ryan P.C. McQuen" EMAIL="ryan.q@linux.com" |