summaryrefslogtreecommitdiff
path: root/office/libreoffice
diff options
context:
space:
mode:
Diffstat (limited to 'office/libreoffice')
-rw-r--r--office/libreoffice/libreoffice.SlackBuild30
-rw-r--r--office/libreoffice/libreoffice.info12
2 files changed, 15 insertions, 27 deletions
diff --git a/office/libreoffice/libreoffice.SlackBuild b/office/libreoffice/libreoffice.SlackBuild
index ca7484750b..bf586ca60c 100644
--- a/office/libreoffice/libreoffice.SlackBuild
+++ b/office/libreoffice/libreoffice.SlackBuild
@@ -24,17 +24,17 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Modified by Niels Horn <niels.horn@gmail.com>
-# Revision date: 2011/03/22
+# Revision date: 2011/06/20
PRGNAM=libreoffice
-VERSION="3.3.2"
+VERSION="3.4.0"
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
# These variables seem to change with (almost) every release...
SRCVERSION=$VERSION
-SRCSHORT="3.3"
-SRCBUILD="3.3-202"
+SRCSHORT="3.4"
+SRCBUILD="3.4-12"
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -129,7 +129,7 @@ cd $PKG/usr/bin
for FILE in \
sbase scalc sdraw simpress smath soffice spadmin swriter unopkg ; do
rm -f $FILE
- ln -sf ../../opt/libreoffice/program/$FILE $FILE ;
+ ln -sf ../../opt/libreoffice$SRCSHORT/program/$FILE $FILE ;
done
cd -
@@ -138,27 +138,15 @@ rm -f opt/libreoffice/basis$SRCSHORT/share/fonts/truetype/{DejaVu,Liberation}*.t
# Fix Exec commands in the desktop files
# See http://bugzilla.xfce.org/show_bug.cgi?id=2430
-cd $PKG//opt/libreoffice/share/xdg/
+cd $PKG/opt/libreoffice$SRCSHORT/share/xdg/
for APP in base calc draw impress math writer; do
- sed -i 's%Exec=libreoffice -%Exec=/opt/libreoffice/program/s%' $APP.desktop ;
+ sed -i "s%Exec=libreoffice -%Exec=/opt/libreoffice$SRCSHORT/program/s%" $APP.desktop ;
done
cd -
-## Install extensions
-### --> TODO: Doesn't work for now <-- ###
-#UNOPKG_BIN=$PKG/opt/libreoffice/program/unopkg
-#DICT_DIR=$PKG/opt/libreoffice/share/extension/install
-#if [ -x "$UNOPKG_BIN" ]; then
-# UNOPKG_TMP=$TMP/$$$$$$
-# 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
-#fi
-
# Move docs to their expected locations
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cd $PKG/opt/libreoffice
+cd $PKG/opt/libreoffice$SRCSHORT
mv CREDITS* *LICENSE* readmes $PKG/usr/doc/$PRGNAM-$VERSION
cd -
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -167,7 +155,7 @@ cp $CWD/open-libre-together.sh $PKG/usr/doc/$PRGNAM-$VERSION/
# Disable Java support if desired (see above)
if [ "$DISABLE_JAVA" = "YES" ]; then
- chmod -x $PKG/opt/libreoffice/ure/bin/javaldx
+ chmod -x $PKG/opt/libreoffice$SRCSHORT/ure/bin/javaldx
fi
mkdir -p $PKG/install
diff --git a/office/libreoffice/libreoffice.info b/office/libreoffice/libreoffice.info
index a9ebea926f..8494661363 100644
--- a/office/libreoffice/libreoffice.info
+++ b/office/libreoffice/libreoffice.info
@@ -1,10 +1,10 @@
PRGNAM="libreoffice"
-VERSION="3.3.2"
+VERSION="3.4.0"
HOMEPAGE="http://www.libreoffice.org"
-DOWNLOAD="http://download.documentfoundation.org/libreoffice/stable/3.3.2/rpm/x86/LibO_3.3.2_Linux_x86_install-rpm_en-US.tar.gz"
-MD5SUM="2c54b9f1f0aecf4e7b5cdc857005942f"
-DOWNLOAD_x86_64="http://download.documentfoundation.org/libreoffice/stable/3.3.2/rpm/x86_64/LibO_3.3.2_Linux_x86-64_install-rpm_en-US.tar.gz"
-MD5SUM_x86_64="82d5d7b5e77084151557b569970c73c5"
+DOWNLOAD="http://download.documentfoundation.org/libreoffice/stable/3.4.0/rpm/x86/LibO_3.4.0_Linux_x86_install-rpm_en-US.tar.gz"
+MD5SUM="236aa36128f195d22cba23cdd8d64c1c"
+DOWNLOAD_x86_64="http://download.documentfoundation.org/libreoffice/stable/3.4.0/rpm/x86_64/LibO_3.4.0_Linux_x86-64_install-rpm_en-US.tar.gz"
+MD5SUM_x86_64="9970418f3e05538a0dcb062768b6b6f8"
MAINTAINER="Niels Horn"
EMAIL="niels.horn@gmail.com"
-APPROVED="rworkman"
+APPROVED="pprkut"