1 files changed, 8 insertions, 10 deletions
diff --git a/office/pandoc/pandoc.SlackBuild b/office/pandoc/pandoc.SlackBuild
index d4b2a655e7..f4b41a92a7 100644
--- a/office/pandoc/pandoc.SlackBuild
+++ b/office/pandoc/pandoc.SlackBuild
@@ -6,7 +6,7 @@
 # Public domain.
 
 PRGNAM=pandoc
-VERSION=${VERSION:-1.11.1}
+VERSION=${VERSION:-1.13.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -28,12 +28,15 @@ OUTPUT=${OUTPUT:-/tmp}
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
+  TARARCH=i386
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
+  TARARCH=i386
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+  TARARCH="x86_64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -70,24 +73,19 @@ runghc Setup.hs haddock
 runghc Setup.hs copy --destdir=$PKG
 runghc Setup.hs register --gen-pkg-config
 
-mv $PKG/usr/share/man $PKG/usr/man
-# Fix man page permissions as they are wrong.
-find $PKG/usr/man -type f \
-    -exec chmod 644 {} \; \
-    -exec gzip -9 {} \;
-for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-
 PKGCONFD=/usr/lib${LIBDIRSUFFIX}/ghc-${GHC_VERSION}/package.conf.d
 PKGID=$( grep -E "^id: " $PRGNAM-$VERSION.conf | cut -d" " -f2 )
 mkdir -p $PKG/$PKGCONFD
 mv $PRGNAM-$VERSION.conf $PKG/$PKGCONFD/$PKGID.conf
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/$PRGNAM-$VERSION/{BUGS,COPYRIGHT,README,changelog} \
+cp -a BUGS CONTRIBUTING.md COPYING COPYRIGHT README \
   $PKG/usr/doc/$PRGNAM-$VERSION
-rm $PKG/usr/share/$PRGNAM-$VERSION/INSTALL
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# Remove duplicate files in usr/share/$ARCH-linux-ghc-$GHC_VERSION/$PRGNAM-$VERSION
+rm $PKG/usr/share/$TARARCH-linux-ghc-$GHC_VERSION/$PRGNAM-$VERSION/{COPYRIGHT,README}
+
 mkdir -p $PKG/install
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc