4 files changed, 37 insertions, 54 deletions
diff --git a/office/gnucash-docs/README b/office/gnucash-docs/README
index cb542cedc1c9..0a983f77287e 100644
--- a/office/gnucash-docs/README
+++ b/office/gnucash-docs/README
@@ -19,12 +19,10 @@ de for German
 it for Italian
 pt for Portugese
 ja for Japanese (guide only, no help - defaults to C)
-ru for Russian (guide only, no help - defaults to C)
+NOTE: the Russian translation has been dropped
 
-Note 1: This script builds the internal guides in all available
+Note: This script builds the internal guides in all available
 languages, but the HTML guides are only in the spacified language
 to save space and avoid excessive package bloat.
 
-Note 2: This builds the docs for version 4.x of Gnucash.  If you
-need the old stable 2.6 branch, use gnucash-legacy-docs, also
-available on SBo.
+Runtime dependencies are yelp and rarian.
diff --git a/office/gnucash-docs/gnucash-docs.SlackBuild b/office/gnucash-docs/gnucash-docs.SlackBuild
index f9ec5802b5a3..d0b4916d6050 100644
--- a/office/gnucash-docs/gnucash-docs.SlackBuild
+++ b/office/gnucash-docs/gnucash-docs.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for gnucash-docs
 
-# Copyright 2018, 2019, 2020 Lenard Spencer  <lenardrspencer@gmail.com>
+# Copyright 2018, 2019, 2020,2021 Lenard Spencer  <lenardrspencer@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=gnucash-docs
 DESTNAM=gnucash
-VERSION=${VERSION:-4.5}
+VERSION=${VERSION:-4.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -46,8 +46,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-ARCH=noarch # does not install any binary files
-
 DOCLANG=${DOCLANG:-"C"}
 
 set -e
@@ -65,49 +63,36 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-./configure \
-  --prefix=/usr \
-  --docdir=/usr/doc/$DESTNAM-$VERSION
-
-make
-make -j1 install DESTDIR=$PKG docdir=/usr/doc/$DESTNAM-$VERSION
-
-# Build and install the HTML docs for the specified language (default to C)
-
-if [ "$HTML" = "yes" ]; then
-  mkdir -p $PKG/usr/doc/$DESTNAM-$VERSION/html
-  cd guide/$DOCLANG || cd guide/C
-  make html
-  cp -vR gnucash-guide $PKG/usr/doc/$DESTNAM-$VERSION/html
-  cd ../../help/$DOCLANG || cd ../../help/C
-  make html
-  cp -vR gnucash-help $PKG/usr/doc/$DESTNAM-$VERSION/html
-  cd ../..
-fi
-
-if [ -x /opt/fop/fop ]; then
-  if [ "$PDF" = "yes" ]; then
-    mkdir -p $PKG/usr/doc/$DESTNAM-$VERSION
-    cd guide/$DOCLANG || cd guide/C
-    make pdf
-    cp -vR gnucash-guide.pdf $PKG/usr/doc/$DESTNAM-$VERSION
-    cd ../../help/$DOCLANG || cd ../../help/C
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  if [ "${HTML:-no}" = "yes" ]; then
+    make html
+  fi
+  if [ "${EPUB:-no}" = "yes" ]; then
+    make epub
+  fi
+  if [ "${PDF:-no}" = "yes" ]; then
     make pdf
-    cp -vR gnucash-help.pdf $PKG/usr/doc/$DESTNAM-$VERSION
-    cd ../..
   fi
-fi
 
-if [ "$EPUB" = "yes" ]; then
+  make install DESTDIR=$PKG
+
+# Move the files to where they belong:
   mkdir -p $PKG/usr/doc/$DESTNAM-$VERSION
-  cd guide/$DOCLANG || cd guide/C
-  make epub
-  cp -vR gnucash-guide.epub $PKG/usr/doc/$DESTNAM-$VERSION
-  cd ../../help/$DOCLANG || cd ../../help/C
-  make epub
-  cp -vR gnucash-help.epub $PKG/usr/doc/$DESTNAM-$VERSION
-  cd ../..
-fi
+  cp -Rv share/doc/$DOCLANG/* $PKG/usr/doc/$DESTNAM-$VERSION
+# There is no help system for Japanese, so:
+  if [ "$DOCLANG" = "ja" ]; then
+    cp -Rv share/doc/C/gnucash-help* $PKG/usr/doc/$DESTNAM-$VERSION
+  fi
+  mv $PKG/usr/share/$PRGNAM $PKG/usr/doc
+  mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
+# get rid of unused folders:
+  rm -rf $PKG/usr/share/doc
+cd ..
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/office/gnucash-docs/gnucash-docs.info b/office/gnucash-docs/gnucash-docs.info
index 70e1323e10f1..2f07e690167b 100644
--- a/office/gnucash-docs/gnucash-docs.info
+++ b/office/gnucash-docs/gnucash-docs.info
@@ -1,10 +1,10 @@
 PRGNAM="gnucash-docs"
-VERSION="4.5"
-HOMEPAGE="http://www.gnucash.org"
-DOWNLOAD="http://downloads.sourceforge.net/gnucash/gnucash-docs-4.5.tar.gz"
-MD5SUM="cb619592f5ac25e2d1d1312c1a43e32d"
+VERSION="4.9"
+HOMEPAGE="https://www.gnucash.org"
+DOWNLOAD="https://downloads.sourceforge.net/gnucash/gnucash-docs-4.9.tar.gz"
+MD5SUM="6584ed80f0088f3c04822b6fcbf05132"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="gnucash yelp"
+REQUIRES="gnucash rarian yelp"
 MAINTAINER="Lenard Spencer"
 EMAIL="lenardrspencer@gmail.com"
diff --git a/office/gnucash-docs/slack-desc b/office/gnucash-docs/slack-desc
index 68b503bcae40..62e06d01705e 100644
--- a/office/gnucash-docs/slack-desc
+++ b/office/gnucash-docs/slack-desc
@@ -8,7 +8,7 @@
             |-----handy-ruler------------------------------------------------------|
 gnucash-docs: gnucash-docs (Gnucash help and user guides)
 gnucash-docs:
-gnucash-docs: Documentation files for Gnucash 3.x
+gnucash-docs: Documentation files for Gnucash 4.x
 gnucash-docs:
 gnucash-docs: http://www.gnucash.org
 gnucash-docs: