From 4ed1487dde01aadd0e511b77fa0e413bf4f4eb01 Mon Sep 17 00:00:00 2001
From: "Ryan P.C. McQuen" <ryan.q@linux.com>
Date: Tue, 6 Dec 2016 00:20:27 -0800
Subject: office/openoffice.org: Updated for version 4.1.3.

Signed-off-by: Ryan P.C. McQuen <ryan.q@linux.com>
---
 office/openoffice.org/openoffice.org.SlackBuild | 11 +++++++----
 office/openoffice.org/openoffice.org.info       | 14 +++++---------
 2 files changed, 12 insertions(+), 13 deletions(-)

(limited to 'office')

diff --git a/office/openoffice.org/openoffice.org.SlackBuild b/office/openoffice.org/openoffice.org.SlackBuild
index 445664fe80..b105460382 100644
--- a/office/openoffice.org/openoffice.org.SlackBuild
+++ b/office/openoffice.org/openoffice.org.SlackBuild
@@ -27,8 +27,8 @@
 
 PRGNAM=openoffice.org
 SRCNAM=openoffice
-VERSION=${VERSION:-4.1.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-4.1.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 SRCSHORT=$(echo $VERSION | cut -f1 -d.)
 
@@ -81,7 +81,8 @@ mkdir -p $PKG/usr/share/applications/
 rm -rf $TMP/$SOURCEDIR
 
 tar xvf $CWD/$TARNAME -C $TMP
-unzip -u $CWD/apache-${SRCNAM}-${VERSION}-patch1-apply-Linux`getconf LONG_BIT`.zip libtl.so -d $TMP
+
+#unzip -u $CWD/apache-${SRCNAM}-${VERSION}-patch1-apply-Linux`getconf LONG_BIT`.zip libtl.so -d $TMP
 
 cd $TMP/$SOURCEDIR/RPMS
 chown -R root:root .
@@ -99,8 +100,10 @@ for FILE in *.rpm ; do rpm2cpio < $FILE | cpio -imdv ; done
 
 rm -rf desktop-integration *.rpm
 mv opt $PKG
+
 ## Apply security patch:
-mv $TMP/libtl.so $PKG/opt/${SRCNAM}${SRCSHORT}/program/libtl.so
+#mv $TMP/libtl.so $PKG/opt/${SRCNAM}${SRCSHORT}/program/libtl.so
+
 cd $PKG
 
 ## Create symlinks in /usr/bin to actual binaries
diff --git a/office/openoffice.org/openoffice.org.info b/office/openoffice.org/openoffice.org.info
index f2d85dece8..d0bbfc2d94 100644
--- a/office/openoffice.org/openoffice.org.info
+++ b/office/openoffice.org/openoffice.org.info
@@ -1,14 +1,10 @@
 PRGNAM="openoffice.org"
-VERSION="4.1.2"
+VERSION="4.1.3"
 HOMEPAGE="https://openoffice.org"
-DOWNLOAD="http://sourceforge.net/projects/openofficeorg.mirror/files/4.1.2/binaries/en-US/Apache_OpenOffice_4.1.2_Linux_x86_install-rpm_en-US.tar.gz \
-  http://archive.apache.org/dist/openoffice/4.1.2-patch1/binaries/Linux32/apache-openoffice-4.1.2-patch1-apply-Linux32.zip"
-MD5SUM="fb3a9d03b16b258c27e46d65d87b6512 \
-  b87ad14e1f5ef732259901975826d247"
-DOWNLOAD_x86_64="http://sourceforge.net/projects/openofficeorg.mirror/files/4.1.2/binaries/en-US/Apache_OpenOffice_4.1.2_Linux_x86-64_install-rpm_en-US.tar.gz \
-  http://archive.apache.org/dist/openoffice/4.1.2-patch1/binaries/Linux64/apache-openoffice-4.1.2-patch1-apply-Linux64.zip"
-MD5SUM_x86_64="bb3c58bec7d1280aae18bafe55e922ee \
-  0cc239e41fb78d8bf299c379ae4cbac9"
+DOWNLOAD="http://sourceforge.net/projects/openofficeorg.mirror/files/4.1.3/binaries/en-US/Apache_OpenOffice_4.1.3_Linux_x86_install-rpm_en-US.tar.gz"
+MD5SUM="af75e671fce11bd0b8d3e91fef5fae13"
+DOWNLOAD_x86_64="http://sourceforge.net/projects/openofficeorg.mirror/files/4.1.3/binaries/en-US/Apache_OpenOffice_4.1.3_Linux_x86-64_install-rpm_en-US.tar.gz"
+MD5SUM_x86_64="d3f71313aaa04cf2b826ea0d9083c3ac"
 REQUIRES=""
 MAINTAINER="Ryan P.C. McQuen"
 EMAIL="ryan.q@linux.com"
-- 
cgit v1.2.3-79-gdb01