From 821cd3ef0989bff0b1d15b96c7a490b6705e4052 Mon Sep 17 00:00:00 2001
From: Damien Goutte-Gattat <dgouttegattat@incenp.org>
Date: Sat, 4 Jun 2011 20:53:11 +0200
Subject: [PATCH] xap/libreoffice:  Upgraded to libreoffice-3.4.0.

---
 .../LibO_3.3.2_Linux_x86-64_install-rpm_en-US.tar.gz.sha1 | 1 -
 .../LibO_3.4.0_Linux_x86-64_install-rpm_en-US.tar.gz.sha1 | 1 +
 xap/libreoffice/libreoffice.SlackBuild                    | 8 ++++----
 3 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 xap/libreoffice/LibO_3.3.2_Linux_x86-64_install-rpm_en-US.tar.gz.sha1
 create mode 100644 xap/libreoffice/LibO_3.4.0_Linux_x86-64_install-rpm_en-US.tar.gz.sha1

diff --git a/xap/libreoffice/LibO_3.3.2_Linux_x86-64_install-rpm_en-US.tar.gz.sha1 b/xap/libreoffice/LibO_3.3.2_Linux_x86-64_install-rpm_en-US.tar.gz.sha1
deleted file mode 100644
index c6386acd..00000000
--- a/xap/libreoffice/LibO_3.3.2_Linux_x86-64_install-rpm_en-US.tar.gz.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ad8bdea7b60b2845bc3181a211ed8af0d6c7a72e  LibO_3.3.2_Linux_x86-64_install-rpm_en-US.tar.gz
diff --git a/xap/libreoffice/LibO_3.4.0_Linux_x86-64_install-rpm_en-US.tar.gz.sha1 b/xap/libreoffice/LibO_3.4.0_Linux_x86-64_install-rpm_en-US.tar.gz.sha1
new file mode 100644
index 00000000..44e2539b
--- /dev/null
+++ b/xap/libreoffice/LibO_3.4.0_Linux_x86-64_install-rpm_en-US.tar.gz.sha1
@@ -0,0 +1 @@
+84a7b7caf32515f00e6ae71f291ae8232a18a08c  LibO_3.4.0_Linux_x86-64_install-rpm_en-US.tar.gz
diff --git a/xap/libreoffice/libreoffice.SlackBuild b/xap/libreoffice/libreoffice.SlackBuild
index f4eb477b..b63da529 100755
--- a/xap/libreoffice/libreoffice.SlackBuild
+++ b/xap/libreoffice/libreoffice.SlackBuild
@@ -34,7 +34,7 @@ else
 fi
 
 # Source package infos
-VERSION=${VERSION:-3.3.2}
+VERSION=${VERSION:-3.4.0}
 ARCHIVE=${ARCHIVE:-LibO_${VERSION}_Linux_${SRCARCH}_install-rpm_en-US.tar.gz}
 WGET=${WGET:-http://download.documentfoundation.org/libreoffice/stable/$VERSION/rpm/$ARCH/$ARCHIVE}
 
@@ -77,7 +77,7 @@ cd $NAME
 
 # Extract the RPMs
 cd RPMS
-mv desktop-integration/libreoffice3.3-freedesktop-menus-3.3-202.noarch.rpm .
+mv desktop-integration/libreoffice3.4-freedesktop-menus-3.4-12.noarch.rpm .
 for FILE in *.rpm ; do rpm2cpio < $FILE | cpio -imdv ; done
 mkdir -p $PKG
 mv opt usr $PKG
@@ -88,13 +88,13 @@ 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 . ;
+    ln -sf /opt/libreoffice3.4/program/$FILE . ;
 done
 cd -
 
 # Place docs at the expected locations
 mkdir -p $PKG/usr/doc/$NAMEPKG-$VERSION
-cd $PKG/opt/libreoffice
+cd $PKG/opt/libreoffice3.4
 mv CREDITS.odt *LICENSE* readmes $PKG/usr/doc/$NAMEPKG-$VERSION
 find $PKG/usr/doc/$NAMEPKG-$VERSION -type f -exec chmod 644 {} \;
 cd -