2 files changed, 13 insertions, 8 deletions
diff --git a/python/python3-formencode/python3-formencode.SlackBuild b/python/python3-formencode/python3-formencode.SlackBuild
index f88f44c6d6..2134545296 100644
--- a/python/python3-formencode/python3-formencode.SlackBuild
+++ b/python/python3-formencode/python3-formencode.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=python3-formencode
 SRCNAM=FormEncode
-VERSION=${VERSION:-2.0.1}
+VERSION=${VERSION:-2.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -66,11 +66,16 @@ find -L . \
  -exec chmod 644 {} \;
 
 python3 setup.py install --root=$PKG
-./regen-docs || true
+sh ./regen-docs || NODOC=1
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
-cp -a docs/_build/* $PKG/usr/doc/$PRGNAM-$VERSION/html || \
-  cp -a docs $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/
+if [ -z "$NODOC" ]; then
+	cp -a docs/_build $PKG/usr/doc/$PRGNAM-$VERSION/html
+else
+	cp -a docs $PKG/usr/doc/$PRGNAM-$VERSION
+	rmdir --ignore-fail-on-non-empty $PKG/usr/doc/$PRGNAM-$VERSION/docs/_build
+	rm $PKG/usr/doc/$PRGNAM-$VERSION/docs/make.bat
+fi
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/python/python3-formencode/python3-formencode.info b/python/python3-formencode/python3-formencode.info
index 59f47704f9..e2b3697bda 100644
--- a/python/python3-formencode/python3-formencode.info
+++ b/python/python3-formencode/python3-formencode.info
@@ -1,8 +1,8 @@
 PRGNAM="python3-formencode"
-VERSION="2.0.1"
+VERSION="2.1.0"
 HOMEPAGE="http://FormEncode.org/"
-DOWNLOAD="https://pypi.python.org/packages/source/F/FormEncode/FormEncode-2.0.1.tar.gz"
-MD5SUM="65a9ba7220890c3d26904bdafe3a5a35"
+DOWNLOAD="https://pypi.python.org/packages/source/F/FormEncode/FormEncode-2.1.0.tar.gz"
+MD5SUM="088ba6620c6ff9133ee95874e2eb8a88"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3-setuptools_scm_git_archive"