diff options
| -rw-r--r-- | office/libreoffice/README | 27 | ||||
| -rw-r--r-- | office/libreoffice/libreoffice.SlackBuild | 12 | ||||
| -rw-r--r-- | office/libreoffice/libreoffice.info | 12 | ||||
| -rw-r--r-- | office/libreoffice/open-libre-together.sh | 25 | ||||
| -rw-r--r-- | office/libreoffice/slack-desc | 2 |
5 files changed, 57 insertions, 21 deletions
diff --git a/office/libreoffice/README b/office/libreoffice/README index 07f98d1d66..a6ecb13134 100644 --- a/office/libreoffice/README +++ b/office/libreoffice/README @@ -1,12 +1,21 @@ -LibreOffice is a productivity suite that is compatible with other major office -suites, and available on a variety of platforms. It is free software and -therefore free to download, use and distribute. +LibreOffice is a productivity suite that is compatible with other major +office suites, and available on a variety of platforms. It is free +software and therefore free to download, use and distribute. -This script builds a Slackware package from the official binary (RPM's) -distributed by The Document Foundation. Everything needed by the application -should be built statically into it, so there aren't any dependencies not -satisfied by a normal installation. +This script builds a Slackware package from the official binary (RPM's) +distributed by The Document Foundation. Everything needed by the +application should be built statically into it, so there aren't any +dependencies not satisfied by a normal installation. -Be sure to look at the script for some optional things you can do when building. +Be sure to look at the script for some optional things you can do when +building. + +NOTE: + See the separate SlackBuild script for the language packs. + +NOTE2: + To keep LibreOffice installed concurrently with OpenOffice, run the + included open-libre-together.sh script saved in the + /usr/doc/libreoffice-<version>/ directory to patch the .desktop menu + files. -NOTE: See the separate SlackBuild script for the language packs. diff --git a/office/libreoffice/libreoffice.SlackBuild b/office/libreoffice/libreoffice.SlackBuild index dc3f982d9d..c81e879e1c 100644 --- a/office/libreoffice/libreoffice.SlackBuild +++ b/office/libreoffice/libreoffice.SlackBuild @@ -6,7 +6,7 @@ # from its author, Robby Workman # Copyright 2006,2007,2008,2009,2010 Robby Workman, Northport, Alabama, USA -# Copyright 2010 Niels Horn, Rio de Janeiro, RJ, Brazil +# Copyright 2010,2011 Niels Horn, Rio de Janeiro, RJ, Brazil # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -27,10 +27,10 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # Modified by Niels Horn <niels.horn@gmail.com> -# Revision date: 2010/12/10 +# Revision date: 2011/01/03 PRGNAM=libreoffice -VERSION="3.3.0rc1" +VERSION="3.3.0rc2" BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -112,7 +112,7 @@ cd $TMP/$SOURCEDIR/RPMS/ # Yes, I know there is a Slackware integration file in the desktop-integration # directory, but it's worthless to us. I'd prefer to do things correctly. -mv desktop-integration/libreoffice3.3-freedesktop-menus-3.3-3.noarch.rpm . +mv desktop-integration/libreoffice3.3-freedesktop-menus-3.3-4.noarch.rpm . # No, I don't want to update our packaged files after the fact rm -f *onlineupdate*.rpm # We don't want this @@ -160,9 +160,11 @@ cd - # Move docs to their expected locations mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cd $PKG/opt/libreoffice - mv README* *LICENSE* readmes licenses $PKG/usr/doc/$PRGNAM-$VERSION + mv CREDITS* *LICENSE* readmes $PKG/usr/doc/$PRGNAM-$VERSION 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/ # Disable Java support if desired (see above) if [ "$DISABLE_JAVA" = "YES" ]; then diff --git a/office/libreoffice/libreoffice.info b/office/libreoffice/libreoffice.info index 2a80d87711..fd2e74cf5d 100644 --- a/office/libreoffice/libreoffice.info +++ b/office/libreoffice/libreoffice.info @@ -1,10 +1,10 @@ PRGNAM="libreoffice" -VERSION="3.3.0rc1" +VERSION="3.3.0rc2" HOMEPAGE="http://www.documentfoundation.org" -DOWNLOAD="http://download.documentfoundation.org/libreoffice/testing/3.3.0-rc1/rpm/x86/LibO_3.3.0rc1_Linux_x86_install-rpm_en-US.tar.gz" -MD5SUM="59c670fcd9e45d087ec1c5e0b9dbcab0" -DOWNLOAD_x86_64="http://download.documentfoundation.org/libreoffice/testing/3.3.0-rc1/rpm/x86_64/LibO_3.3.0rc1_Linux_x86-64_install-rpm_en-US.tar.gz" -MD5SUM_x86_64="019bd7b634cccf6d8b03518103956f2a" +DOWNLOAD="http://download.documentfoundation.org/libreoffice/testing/3.3.0-rc2/rpm/x86/LibO_3.3.0rc2_Linux_x86_install-rpm_en-US.tar.gz" +MD5SUM="19917f506434c12f1f8f8ce264275f8e" +DOWNLOAD_x86_64="http://download.documentfoundation.org/libreoffice/testing/3.3.0-rc2/rpm/x86_64/LibO_3.3.0rc2_Linux_x86-64_install-rpm_en-US.tar.gz" +MD5SUM_x86_64="b4ae8fed64330c96b2228ef372b59c96" MAINTAINER="Niels Horn" EMAIL="niels.horn@gmail.com" -APPROVED="rworkman" +APPROVED="dsomero" diff --git a/office/libreoffice/open-libre-together.sh b/office/libreoffice/open-libre-together.sh new file mode 100644 index 0000000000..aa6852da47 --- /dev/null +++ b/office/libreoffice/open-libre-together.sh @@ -0,0 +1,25 @@ +#!/bin/sh + +# open-libre-together.sh +# +# Script to patch .desktop files from OpenOffice.org so that it can +# coexist with LibreOffice + +# v1.00 - 2011/01/03 - Niels Horn <niels.horn@gmail.com> + +set -e + +if [ $(id -u) -ne 0 ]; then + echo "Sorry, need to be root to run this..." + exit 1 +fi + +cd /usr/share/applications + +for dt in base calc draw impress math writer; do + echo "Changing .desktop file for '$dt' ..." + sed -i "s|^Exec=s$cmd|Exec=/opt/openoffice.org3/program/s$cmd|" openoffice.org3-$dt.desktop +done + +echo "All done..." + diff --git a/office/libreoffice/slack-desc b/office/libreoffice/slack-desc index d76746d1d1..2fcc73fbd0 100644 --- a/office/libreoffice/slack-desc +++ b/office/libreoffice/slack-desc @@ -5,7 +5,7 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler-------------------------------------------------------| + |-----handy-ruler------------------------------------------------------| libreoffice: LibreOffice (Productivity Suite) libreoffice: libreoffice: LibreOffice is a productivity suite that is compatible with other |