From 78af1dbf5a27a80f24d39064a84c8376b8ac6ab6 Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Sun, 14 May 2017 16:17:03 -0500
Subject: office/abiword: Updated for version 3.0.2.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 office/abiword/abiword.SlackBuild |  9 +++++----
 office/abiword/abiword.info       | 10 +++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'office/abiword')

diff --git a/office/abiword/abiword.SlackBuild b/office/abiword/abiword.SlackBuild
index 883cbc0181..9f52457ee6 100644
--- a/office/abiword/abiword.SlackBuild
+++ b/office/abiword/abiword.SlackBuild
@@ -27,8 +27,9 @@
 # Now maintained by Robby Workman <rworkman@slackbuilds.org>
 
 PRGNAM=abiword
-VERSION=${VERSION:-3.0.1}
+VERSION=${VERSION:-3.0.2}
 DOCSVER=$VERSION	# version of abiword-docs
+DOCTAR=3.0.1		# sigh, the tarball contains abiword-docs-3.0.1 still
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -67,7 +68,7 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-rm -rf abiword-docs-$DOCSVER
+rm -rf abiword-docs-$DOCTAR
 tar xvf $CWD/abiword-docs-$DOCSVER.tar.gz
 chown -R root:root .
 find -L . \
@@ -78,7 +79,7 @@ find -L . \
 
 CPPFLAGS="-I$TMP/$PRGNAM-$VERSION" \
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -std=c++11" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
@@ -97,7 +98,7 @@ make
 make install DESTDIR=$PKG
 
 # Now install the separate abiword-docs
-cd abiword-docs-$DOCSVER
+cd abiword-docs-$DOCTAR
   PATH="$PKG/usr/bin:$PATH" \
   PKG_CONFIG_PATH="$PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig:$PKG_CONFIG_PATH" \
   ./configure \
diff --git a/office/abiword/abiword.info b/office/abiword/abiword.info
index 3eb2982699..45f7615d73 100644
--- a/office/abiword/abiword.info
+++ b/office/abiword/abiword.info
@@ -1,10 +1,10 @@
 PRGNAM="abiword"
-VERSION="3.0.1"
+VERSION="3.0.2"
 HOMEPAGE="http://www.abisource.com"
-DOWNLOAD="http://abisource.com/downloads/abiword/3.0.1/source/abiword-3.0.1.tar.gz \
-          http://abisource.com/downloads/abiword/3.0.1/source/abiword-docs-3.0.1.tar.gz"
-MD5SUM="f3f8052e7b4979a43b75775a381e6cb8 \
-        c9b78cb5f9c415ed63ce1cf9874fa8a4"
+DOWNLOAD="http://abisource.com/downloads/abiword/3.0.2/source/abiword-3.0.2.tar.gz \
+          http://abisource.com/downloads/abiword/3.0.2/source/abiword-docs-3.0.2.tar.gz"
+MD5SUM="cda6dd58c747c133b421cc7eb18f5796 \
+        c92c0e1e2081db20757231a53d80c338"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="wv"
-- 
cgit v1.2.3