From 91bf6ac5b7deab706a1cd89916bd3871bc6774bc Mon Sep 17 00:00:00 2001
From: Damien Goutte-Gattat <dgouttegattat@incenp.org>
Date: Thu, 24 Mar 2011 09:30:20 +0100
Subject: [PATCH] xap/libreoffice:  Upgraded to libreoffice-3.3.2.

---
 ....0_Linux_x86-64_install-rpm_en-US.tar.gz.sha1 |  1 -
 ....2_Linux_x86-64_install-rpm_en-US.tar.gz.sha1 |  1 +
 xap/libreoffice/libreoffice.SlackBuild           | 16 +++-------------
 3 files changed, 4 insertions(+), 14 deletions(-)
 delete mode 100644 xap/libreoffice/LibO_3.3.0_Linux_x86-64_install-rpm_en-US.tar.gz.sha1
 create mode 100644 xap/libreoffice/LibO_3.3.2_Linux_x86-64_install-rpm_en-US.tar.gz.sha1

diff --git a/xap/libreoffice/LibO_3.3.0_Linux_x86-64_install-rpm_en-US.tar.gz.sha1 b/xap/libreoffice/LibO_3.3.0_Linux_x86-64_install-rpm_en-US.tar.gz.sha1
deleted file mode 100644
index ae4d4d35..00000000
--- a/xap/libreoffice/LibO_3.3.0_Linux_x86-64_install-rpm_en-US.tar.gz.sha1
+++ /dev/null
@@ -1 +0,0 @@
-5e146ed760afcc7dd6ddaca210e59513fad31a9f  LibO_3.3.0_Linux_x86-64_install-rpm_en-US.tar.gz
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
new file mode 100644
index 00000000..c6386acd
--- /dev/null
+++ b/xap/libreoffice/LibO_3.3.2_Linux_x86-64_install-rpm_en-US.tar.gz.sha1
@@ -0,0 +1 @@
+ad8bdea7b60b2845bc3181a211ed8af0d6c7a72e  LibO_3.3.2_Linux_x86-64_install-rpm_en-US.tar.gz
diff --git a/xap/libreoffice/libreoffice.SlackBuild b/xap/libreoffice/libreoffice.SlackBuild
index fbc8889b..e5dd8544 100755
--- a/xap/libreoffice/libreoffice.SlackBuild
+++ b/xap/libreoffice/libreoffice.SlackBuild
@@ -34,7 +34,7 @@ else
 fi
 
 # Source package infos
-VERSION=${VERSION:-3.3.0}
+VERSION=${VERSION:-3.3.2}
 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-6.noarch.rpm .
+mv desktop-integration/libreoffice3.3-freedesktop-menus-3.3-202.noarch.rpm .
 for FILE in *.rpm ; do rpm2cpio < $FILE | cpio -imdv ; done
 mkdir -p $PKG
 mv opt usr $PKG
@@ -92,21 +92,11 @@ for FILE in \
 done
 cd -
 
-# Remove DejaVu and Liberation fonts - these are included in other packages
-rm -f opt/libreoffice/basis3.3/share/fonts/truetype/[DL]*.ttf
-
-# Fix Exec commands in the desktop files
-# See http://bugzilla.xfce.org/show_bug.cgi?id=2430 
-#cd $PKG/opt/libreoffice/share/xdg/
-#  for APP in base calc draw impress math writer; do
-#    sed -i 's%Exec=libreoffice -%Exec=s%' $APP.desktop ;
-#  done
-#cd -
-
 # Place docs at the expected locations
 mkdir -p $PKG/usr/doc/$NAMEPKG-$VERSION
 cd $PKG/opt/libreoffice
 mv CREDITS.odt *LICENSE* readmes $PKG/usr/doc/$NAMEPKG-$VERSION
+find $PKG/usr/doc/$NAMEPKG-$VERSION -type f -exec chmod 644 {} \;
 cd -
 
 # Copy slack-desc and doinst.sh file