diff options
| -rw-r--r-- | office/libreoffice/libreoffice.SlackBuild | 23 | ||||
| -rw-r--r-- | office/libreoffice/libreoffice.info | 10 |
2 files changed, 16 insertions, 17 deletions
diff --git a/office/libreoffice/libreoffice.SlackBuild b/office/libreoffice/libreoffice.SlackBuild index 85ae4389399dc..6f2adbde5ed36 100644 --- a/office/libreoffice/libreoffice.SlackBuild +++ b/office/libreoffice/libreoffice.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for LibreOffice # Copyright 2006,2007,2008,2009,2010 Robby Workman, Northport, Alabama, USA -# Copyright 2010-2012 Niels Horn, Rio de Janeiro, RJ, Brazil +# Copyright 2010-2013 Niels Horn, Rio de Janeiro, RJ, Brazil # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,16 +24,16 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # Modified by Niels Horn <niels.horn@gmail.com> -# Revision date: 2012/12/27 +# Revision date: 2013/03/24 PRGNAM=libreoffice -VERSION=${VERSION:-"3.6.4"} +VERSION=${VERSION:-"4.0.1"} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} # These variables seem to change with (almost) every release... SRCVERSION=$VERSION -SRCSHORT=$(echo $VERSION | cut -f1-2 -d.) #"3.5" +SRCSHORT=$(echo $VERSION | cut -f1-2 -d.) if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -48,11 +48,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -# For now it seems upstream will have only one "base" program in 'en-US' and -# LanguagePacks for all other languages. -LOLANG=${LOLANG:-en-US} -PKG_LANG=${LOLANG//-/_} # Leave this alone - # Until now all releases were without the JRE... WJRE=${WJRE:-no} @@ -80,7 +75,7 @@ else fi # We have all the variables, construct the name of the tarball -TARNAME="LibO_${SRCVERSION}_Linux_${SRCARCH}_install-rpm${TARJRE}_${LOLANG}.tar.gz" +TARNAME="LibreOffice_${SRCVERSION}_Linux_${SRCARCH}_rpm${TARJRE}.tar.gz" if [ ! -r $TARNAME ]; then echo "$TARNAME not found" exit 1 @@ -133,7 +128,7 @@ cd $PKG/usr/bin cd - # Remove DejaVu and Liberation fonts - these are included in other packages -rm -f opt/libreoffice/basis$SRCSHORT/share/fonts/truetype/{DejaVu,Liberation}*.ttf +rm -f opt/libreoffice$SRCSHORT/share/fonts/truetype/{DejaVu,Liberation}*.ttf # Fix Exec commands in the desktop files # See http://bugzilla.xfce.org/show_bug.cgi?id=2430 @@ -148,6 +143,10 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cd $PKG/opt/libreoffice$SRCSHORT mv CREDITS* *LICENSE* readmes $PKG/usr/doc/$PRGNAM-$VERSION cd - +# Remove executable flag from some docs +cd $PKG/usr/doc/$PRGNAM-$VERSION + find . -type f -exec chmod -x {} \; +cd - cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild # Include a script for those wanting to have OO.o + LibO installed together cp $CWD/open-libre-together.sh $PKG/usr/doc/$PRGNAM-$VERSION/ @@ -165,4 +164,4 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh chown -R root:root . 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} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-${VERSION}-$PKGARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/office/libreoffice/libreoffice.info b/office/libreoffice/libreoffice.info index 91a27d9b48bf8..1342e369a5256 100644 --- a/office/libreoffice/libreoffice.info +++ b/office/libreoffice/libreoffice.info @@ -1,10 +1,10 @@ PRGNAM="libreoffice" -VERSION="3.6.4" +VERSION="4.0.1" HOMEPAGE="http://www.libreoffice.org" -DOWNLOAD="http://download.documentfoundation.org/libreoffice/stable/3.6.4/rpm/x86/LibO_3.6.4_Linux_x86_install-rpm_en-US.tar.gz" -MD5SUM="fd7f484b4965a0f53e202b02dc8b4775" -DOWNLOAD_x86_64="http://download.documentfoundation.org/libreoffice/stable/3.6.4/rpm/x86_64/LibO_3.6.4_Linux_x86-64_install-rpm_en-US.tar.gz" -MD5SUM_x86_64="c13458c60a2c75317b8a09e73a868a99" +DOWNLOAD="http://download.documentfoundation.org/libreoffice/stable/4.0.1/rpm/x86/LibreOffice_4.0.1_Linux_x86_rpm.tar.gz" +MD5SUM="177a58ff05223d7a56253eb64f056d2b" +DOWNLOAD_x86_64="http://download.documentfoundation.org/libreoffice/stable/4.0.1/rpm/x86_64/LibreOffice_4.0.1_Linux_x86-64_rpm.tar.gz" +MD5SUM_x86_64="3524a59107d1120c2ce364a46bc9d795" REQUIRES="jdk" MAINTAINER="Niels Horn" EMAIL="niels.horn@gmail.com" |