diff options
| -rw-r--r-- | office/openoffice.org/README | 25 | ||||
| -rw-r--r-- | office/openoffice.org/desktop-file-fix-3.0.0.diff | 72 | ||||
| -rw-r--r-- | office/openoffice.org/openoffice.org.SlackBuild | 72 | ||||
| -rw-r--r-- | office/openoffice.org/openoffice.org.info | 8 | ||||
| -rw-r--r-- | office/openoffice.org/slack-desc | 22 |
5 files changed, 68 insertions, 131 deletions
diff --git a/office/openoffice.org/README b/office/openoffice.org/README index edf509468a..e3222d589d 100644 --- a/office/openoffice.org/README +++ b/office/openoffice.org/README @@ -8,29 +8,4 @@ by a normal installation. A java runtime environment (jre) is suggested by openoffice.org, but it is not required (note that jre is part of a standard installation of Slackware). -Please don't file bug reports relating to the fact that the resulting package -doesn't open MS Office files by default. Default applications to open specific -file types is a per-user setting, and and installing some application should -not change it. See these two links for more info: - http://freedesktop.org/wiki/Standards/shared-mime-info-spec - http://freedesktop.org/wiki/Standards/mime-actions-spec - -Please don't file reports about us not using the the 'slackware-menus' package -included in the desktop-integration/ directory. We don't use that package for -the following reasons: - 1. The package installs to /opt/openoffice.org3, but then a symlink is - created in /etc to that same directory (/etc/openoffice.org3). - This is not expected behavior from Slackware packages - we don't typically - put binary files in /etc, and we certainly don't have entire software - packages installed there. - 2. It installs the icons to /opt/kde/share/icons instead of /usr/share/icons. - This is fine if you're running kde on Slackware 11.0 or earlier, but for - those people who use gnome or anything on Slackware 12.0 or later, it's - a Bad Thing. The generic freedesktop menu integration package is better - in that respect, as it puts everything in /usr/share/icons/ - 3. The only other thing the 'slackware-menus' package does is set up the - symlinks for the *.desktop files in /usr/share/applications, and it's done - with them linked from /etc/openoffice.org3... Since we don't want the - link to /etc at all, this is useless to us. - Be sure to look at the script for some optional things you can do when building. diff --git a/office/openoffice.org/desktop-file-fix-3.0.0.diff b/office/openoffice.org/desktop-file-fix-3.0.0.diff deleted file mode 100644 index 106dd2c8fe..0000000000 --- a/office/openoffice.org/desktop-file-fix-3.0.0.diff +++ /dev/null @@ -1,72 +0,0 @@ -diff -Nur a/opt/openoffice.org3/share/xdg/base.desktop b/opt/openoffice.org3/share/xdg/base.desktop ---- a/opt/openoffice.org3/share/xdg/base.desktop 2008-09-19 20:04:46.000000000 -0500 -+++ b/opt/openoffice.org3/share/xdg/base.desktop 2008-09-30 14:05:11.639524235 -0500 -@@ -4,7 +4,7 @@ - Icon=openofficeorg3-base - Type=Application - Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-MoreApplications-Databases; --Exec=openoffice.org3 -base %U -+Exec=sbase %U - MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base; - Name=OpenOffice.org 3.0 Base - GenericName=Database Development -diff -Nur a/opt/openoffice.org3/share/xdg/calc.desktop b/opt/openoffice.org3/share/xdg/calc.desktop ---- a/opt/openoffice.org3/share/xdg/calc.desktop 2008-09-19 20:04:46.000000000 -0500 -+++ b/opt/openoffice.org3/share/xdg/calc.desktop 2008-09-30 14:05:19.224052521 -0500 -@@ -4,7 +4,7 @@ - Icon=openofficeorg3-calc - Type=Application - Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Spreadsheets; --Exec=openoffice.org3 -calc %U -+Exec=scalc %U - MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroenabled.12;application/vnd.ms-excel.sheet.binary.macroenabled.12; - Name=OpenOffice.org 3.0 Calc - GenericName=Spreadsheet -diff -Nur a/opt/openoffice.org3/share/xdg/draw.desktop b/opt/openoffice.org3/share/xdg/draw.desktop ---- a/opt/openoffice.org3/share/xdg/draw.desktop 2008-09-19 20:04:46.000000000 -0500 -+++ b/opt/openoffice.org3/share/xdg/draw.desktop 2008-09-30 14:05:26.016528565 -0500 -@@ -4,7 +4,7 @@ - Icon=openofficeorg3-draw - Type=Application - Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Drawing; --Exec=openoffice.org3 -draw %U -+Exec=sdraw %U - MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw; - Name=OpenOffice.org 3.0 Draw - Comment=Create and edit drawings, flow charts, and logos by using Draw. -diff -Nur a/opt/openoffice.org3/share/xdg/impress.desktop b/opt/openoffice.org3/share/xdg/impress.desktop ---- a/opt/openoffice.org3/share/xdg/impress.desktop 2008-09-19 20:04:46.000000000 -0500 -+++ b/opt/openoffice.org3/share/xdg/impress.desktop 2008-09-30 14:05:32.997015784 -0500 -@@ -4,7 +4,7 @@ - Icon=openofficeorg3-impress - Type=Application - Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Presentations; --Exec=openoffice.org3 -impress %U -+Exec=simpress %U - MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroenabled.12; - Name=OpenOffice.org 3.0 Impress - GenericName=Presentation -diff -Nur a/opt/openoffice.org3/share/xdg/math.desktop b/opt/openoffice.org3/share/xdg/math.desktop ---- a/opt/openoffice.org3/share/xdg/math.desktop 2008-09-19 20:04:46.000000000 -0500 -+++ b/opt/openoffice.org3/share/xdg/math.desktop 2008-09-30 14:05:40.449534571 -0500 -@@ -4,7 +4,7 @@ - Icon=openofficeorg3-math - Type=Application - Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other; --Exec=openoffice.org3 -math %U -+Exec=smath %U - MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math; - Name=OpenOffice.org 3.0 Math - Comment=Create and edit scientific formulas and equations by using Math. -diff -Nur a/opt/openoffice.org3/share/xdg/writer.desktop b/opt/openoffice.org3/share/xdg/writer.desktop ---- a/opt/openoffice.org3/share/xdg/writer.desktop 2008-09-19 20:04:46.000000000 -0500 -+++ b/opt/openoffice.org3/share/xdg/writer.desktop 2008-09-30 14:06:00.938967174 -0500 -@@ -4,7 +4,7 @@ - Icon=openofficeorg3-writer - Type=Application - Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Wordprocessors; --Exec=openoffice.org3 -writer %U -+Exec=swriter %U - MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12; - Name=OpenOffice.org 3.0 Writer - GenericName=Word Processor diff --git a/office/openoffice.org/openoffice.org.SlackBuild b/office/openoffice.org/openoffice.org.SlackBuild index 536a5c58b7..4a4c418a5c 100644 --- a/office/openoffice.org/openoffice.org.SlackBuild +++ b/office/openoffice.org/openoffice.org.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for OpenOffice.org -# Copyright 2006-2008 Robby Workman, Northport, Alabama, ASA +# Copyright 2006-2009 Robby Workman, Northport, Alabama, ASA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,13 +24,16 @@ # Thanks to Sandman1, Larhzu, and MacIver for early assistance. # Thanks to Fred Emmott (http://slamd64.com) for some better code in a few -# places and ideas to include the Optimization Solver and disable javaldx. +# places and ideas to include the Optimization Solver and disable javaldx. # Thanks to hba for the idea to include support for other languages. +# Thanks to Nille Akerstrom for the diff to support w/JRE tarballs +# Thanks to ivo@linvo.org for hints on installing extensions +# Thsnks to necropresto for better x86_64 support PRGNAM=openoffice.org -VERSION=3.0.0 -ARCH=i586 # The binaries are built for i586 - leave this alone -BUILD=${BUILD:-3} +VERSION=3.1.0 +ARCH=${ARCH:-i586} +BUILD=${BUILD:-4} TAG=${TAG:-_SBo} CWD=$(pwd) @@ -47,31 +50,55 @@ OUTPUT=${OUTPUT:-/tmp} # Thanks to Niki Kovacs for finding this :-) OOLANG=${OOLANG:-en-US} PKG_LANG=$(echo $OOLANG | sed s/-/_/) # Leave this alone +# Some localized versions only ship with a bundled JRE, and we'd like this +# script to work on those as well... +WJRE=${WJRE:-no} + # If you want to disable java support by removing executable permissions # form OOo's java loader (this will not affect other apps), set this # variable to "YES" Default is "NO" -# According to Fred Emmott, this is *highly* desirable on 64 bit systems DISABLE_JAVA=${DISABLE_JAVA:-NO} -# Yes, I know there is a Slackware integration file in the desktop-integration -# directory, but it's worthless to us. I mailed the maintainer of this -# module with suggestions on how to make it more compliant with standard -# Slackware packaging, but I received no response. Anyway, to sum up, we're -# not using that file... +# Change source package name +if [ "$ARCH" = "i586" ]; then + PKGARCH="Intel" +elif [ "$ARCH" = "x86_64" ]; then + PKGARCH="X86-64" + WJRE=no #Overwrite WJRE option since they don't ship a x86_64 with JRE. +fi -set -e +# 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. # Ignore this - it's just to get the toplevel directory name of the # extracted tarball archive -SOURCEDIR=$(tar tzf $CWD/OOo_${VERSION}_LinuxIntel_install_${OOLANG}.tar.gz | head -1 | tr -d \/) +if [ $WJRE != no ]; then + SOURCEDIR=$(tar tzf $CWD/OOo_${VERSION}_Linux${PKGARCH}_install_wJRE_${OOLANG}.tar.gz | head -1 | tr -d \/) +else + SOURCEDIR=$(tar tzf $CWD/OOo_${VERSION}_Linux${PKGARCH}_install_${OOLANG}.tar.gz | head -1 | tr -d \/) +fi +# If the above operation failed for some reason, unset SOURCEDIR so that +# the "set -eu" below will cause us to bail out with an error +[ -z $SOURCEDIR ] && unset SOURCEDIR + +set -eu rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT rm -rf $TMP/$SOURCEDIR -tar xvf $CWD/OOo_${VERSION}_LinuxIntel_install_${OOLANG}.tar.gz -C $TMP + +# Handle the tarballs that include a bundled JRE +if [ $WJRE != no ]; then + tar xvf $CWD/OOo_${VERSION}_Linux${PKGARCH}_install_wJRE_${OOLANG}.tar.gz -C $TMP + rm -rf $TMP/$SOURCEDIR/{JavaSetup.jar,installdata,setup} + rm -rf $TMP/$SOURCEDIR/RPMS/{userland,jre-*-linux-i586.rpm} +else + tar xvf $CWD/OOo_${VERSION}_Linux${PKGARCH}_install_${OOLANG}.tar.gz -C $TMP +fi + cd $TMP/$SOURCEDIR/RPMS/ -mv desktop-integration/openoffice.org3.0-freedesktop-menus-3.0-9354.noarch.rpm . +mv desktop-integration/openoffice.org3.1-freedesktop-menus-3.1-9393.noarch.rpm . rm *onlineupdate*.rpm # We don't want this for FILE in *.rpm ; do rpm2cpio < $FILE | cpio -imdv ; done rm -rf desktop-integration *.rpm @@ -83,20 +110,27 @@ cd $PKG/usr/bin for FILE in \ sbase scalc sdraw simpress smath soffice spadmin swriter unopkg ; do rm -f $FILE - ln -sf /opt/openoffice.org3/program/$FILE . ; + ln -sf ../../opt/openoffice.org3/program/$FILE $FILE ; done cd - +# Remove DejaVu and Liberation fonts - these are included in other packages +rm -f opt/openoffice.org/basis3.1/share/fonts/truetype/[DL]*.ttf + # Fix Exec commands in the desktop files # See http://bugzilla.xfce.org/show_bug.cgi?id=2430 -patch -p1 < $CWD/desktop-file-fix-3.0.0.diff +cd $PKG//opt/openoffice.org3/share/xdg/ + for APP in base calc draw impress math writer; do + sed -i 's%Exec=openoffice.org3 -%Exec=s%' $APP.desktop ; + done +cd - -# Install dictionary extensions for spellchecking +# Install extensions UNOPKG_BIN=$PKG/opt/openoffice.org3/program/unopkg DICT_DIR=$PKG/opt/openoffice.org3/share/extension/install if [ -x "$UNOPKG_BIN" ]; then UNOPKG_TMP=$TMP/$$$$$$ - find $DICT_DIR -type f -name "dict-*.oxt" \ + find $DICT_DIR -type f -name "*.oxt" \ -exec $UNOPKG_BIN add --shared {} \ "-env:UserInstallation=file:///$UNOPKG_TMP" \; rm -rf $UNOPKG_TMP # Clean up after ourselves diff --git a/office/openoffice.org/openoffice.org.info b/office/openoffice.org/openoffice.org.info index 7b54dee663..84872b83cf 100644 --- a/office/openoffice.org/openoffice.org.info +++ b/office/openoffice.org/openoffice.org.info @@ -1,8 +1,8 @@ PRGNAM="openoffice.org" -VERSION="3.0.0" +VERSION="3.1.0" HOMEPAGE="http://openoffice.org" -DOWNLOAD="http://ftp-atl.osuosl.org/pub/openoffice/stable/3.0.0/OOo_3.0.0_LinuxIntel_install_en-US.tar.gz" -MD5SUM="aa8935aa6a71e4fd7ddae4d56eedb59b" +DOWNLOAD="http://mirrors.isc.org/pub/openoffice/stable/3.1.0/OOo_3.1.0_LinuxIntel_install_en-US.tar.gz" +MD5SUM="b89dbf7da6c4d25195345b0d5bd80102" MAINTAINER="Robby Workman" EMAIL="rw@rlworkman.net" -APPROVED="Erik Hanson" +APPROVED="chess" diff --git a/office/openoffice.org/slack-desc b/office/openoffice.org/slack-desc index dc4cc81962..c2bb3eebb4 100644 --- a/office/openoffice.org/slack-desc +++ b/office/openoffice.org/slack-desc @@ -5,15 +5,15 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler-----------------------------------------------| -openoffice.org: OpenOffice.org Office Suite -openoffice.org: -openoffice.org: OpenOffice.org is a full-featured open-source office suite -openoffice.org: that is compatible with all other major office software. -openoffice.org: -openoffice.org: This is a repackaging of the official OpenOffice.org binary -openoffice.org: RPM's distributed by the upstream developers. -openoffice.org: + |-----handy-ruler-------------------------------------------------------| +openoffice.org: OpenOffice.org (a full-featured open-source office suite) +openoffice.org: +openoffice.org: OpenOffice.org is a full-featured open-source office suite that is +openoffice.org: compatible with all other major office software. +openoffice.org: +openoffice.org: This is a repackaging of the official OpenOffice.org binary RPM's +openoffice.org: distributed by the upstream developers. +openoffice.org: openoffice.org: Homepage: http://openoffice.org -openoffice.org: -openoffice.org: +openoffice.org: +openoffice.org: |