From f8b6d6cc973d1bdb26cb3fae34825ceb9571da5b Mon Sep 17 00:00:00 2001
From: "Cezary M. Kruk" <c.kruk@bigfoot.com>
Date: Sat, 21 May 2022 01:12:36 +0100
Subject: [PATCH] office/catdoc: Updated for version 0.95.

Simplify man zip lines.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 office/catdoc/catdoc.SlackBuild | 17 +++++++----------
 office/catdoc/catdoc.info       |  6 +++---
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/office/catdoc/catdoc.SlackBuild b/office/catdoc/catdoc.SlackBuild
index d679224a1b..26ea8fa777 100644
--- a/office/catdoc/catdoc.SlackBuild
+++ b/office/catdoc/catdoc.SlackBuild
@@ -8,14 +8,14 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=catdoc
-VERSION=${VERSION:-0.94.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.95}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -33,8 +33,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -96,14 +96,11 @@ cd -
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  CODING.STD COPYING CREDITS INSTALL INSTALL.dos NEWS README TODO \
+  CODING.STD COPYING NEWS README TODO \
     $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/office/catdoc/catdoc.info b/office/catdoc/catdoc.info
index 0f61762e32..b45f152e84 100644
--- a/office/catdoc/catdoc.info
+++ b/office/catdoc/catdoc.info
@@ -1,8 +1,8 @@
 PRGNAM="catdoc"
-VERSION="0.94.2"
+VERSION="0.95"
 HOMEPAGE="http://www.wagner.pp.ru/~vitus/software/catdoc/"
-DOWNLOAD="http://ftp.wagner.pp.ru/pub/catdoc/catdoc-0.94.2.tar.gz"
-MD5SUM="243e1680bb3e703616f5adecfee24491"
+DOWNLOAD="http://ftp.wagner.pp.ru/pub/catdoc/catdoc-0.95.tar.gz"
+MD5SUM="4ece2f43b140fab6a2c3a9d6436d7779"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""