office/pandoc: Updated for version 2.17.1.1.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 6 insertions, 12 deletions

diff --git a/office/pandoc/pandoc.SlackBuild b/office/pandoc/pandoc.SlackBuild
index bc1fc8ae3e..bd3d27a0a5 100644
--- a/office/pandoc/pandoc.SlackBuild
+++ b/office/pandoc/pandoc.SlackBuild
@@ -9,7 +9,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=pandoc
-VERSION=${VERSION:-2.3.1}
+VERSION=${VERSION:-2.17.1.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -68,9 +68,6 @@ 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 {} \;
 
-# Remove upper version constraint on haddock-library
-sed -i -E 's/(haddock-library *>= *[0-9.]+ *)\&\& *<=? *[0-9.]+/\1/' $PRGNAM.cabal
-
 # --enable-executable-dynamic seems to only add the build directory to the
 # rpath but not /usr/lib*/ghc-*/pandoc-*, so libHSpandoc cannot be loaded if
 # the build directory is removed.  For now, we build a static executable.
@@ -94,14 +91,11 @@ PKGID=$( grep -E "^id: " $PRGNAM-$VERSION.conf | cut -d" " -f2 )
 mkdir -p $PKG/$PKGCONFD
 mv $PRGNAM-$VERSION.conf $PKG/$PKGCONFD/$PKGID.conf
 
-mv $PKG/usr/share/man $PKG/usr
 rmdir --ignore-fail-on-non-empty $PKG/usr/share
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS.md BUGS changelog CONTRIBUTING.md COPYING.md COPYRIGHT MANUAL.txt README.md \
+  AUTHORS.md BUGS CONTRIBUTING.md COPYING.md COPYRIGHT INSTALL.md MANUAL.txt README.md changelog.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/office/pandoc/pandoc.info b/office/pandoc/pandoc.info
index 2f0853d155..60eb5bcc11 100644
--- a/office/pandoc/pandoc.info
+++ b/office/pandoc/pandoc.info
@@ -1,10 +1,10 @@
 PRGNAM="pandoc"
-VERSION="2.3.1"
+VERSION="2.17.1.1"
 HOMEPAGE="https://pandoc.org/"
-DOWNLOAD="https://hackage.haskell.org/package/pandoc-2.3.1/pandoc-2.3.1.tar.gz"
-MD5SUM="46be88df494a63060de9ead9632ecd58"
+DOWNLOAD="https://hackage.haskell.org/package/pandoc-2.17.1.1/pandoc-2.17.1.1.tar.gz"
+MD5SUM="758fbcf3d9b25dfc31b4d6a5d4a92443"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="haskell-Glob haskell-HsYAML haskell-aeson-pretty haskell-cmark-gfm haskell-doctemplates haskell-haddock-library haskell-hslua-module-text haskell-safe haskell-skylighting haskell-aeson haskell-base64-bytestring haskell-blaze-html haskell-blaze-markup haskell-cmark haskell-data-default haskell-deepseq-generics haskell-extensible-exceptions haskell-filemanip haskell-haddock-library haskell-highlighting-kate haskell-hslua haskell-HTTP haskell-http-client haskell-http-client-tls haskell-http-types haskell-JuicyPixels haskell-network haskell-network-uri haskell-pandoc-types haskell-random haskell-scientific haskell-SHA haskell-syb haskell-tagsoup haskell-temporary haskell-texmath haskell-unordered-containers haskell-vector haskell-xml haskell-yaml haskell-zip-archive haskell-zlib"
+REQUIRES="haskell-Glob haskell-aeson-pretty haskell-cmark-gfm haskell-doctemplates haskell-haddock-library haskell-hslua-module-text haskell-skylighting haskell-cmark haskell-filemanip haskell-haddock-library haskell-highlighting-kate haskell-HTTP haskell-http-client-tls haskell-JuicyPixels haskell-SHA haskell-tagsoup haskell-texmath haskell-yaml haskell-zip-archive haskell-citeproc haskell-jira-wiki-markup haskell-ipynb haskell-hslua-module-version haskell-hslua-module-path haskell-hslua-module-system haskell-hslua-aeson haskell-pandoc-lua-marshal haskell-lpeg haskell-commonmark-pandoc"
 MAINTAINER="Peter Wang"
 EMAIL="novalazy@gmail.com"