diff options
| -rw-r--r-- | office/pandoc/pandoc.SlackBuild | 18 | ||||
| -rw-r--r-- | office/pandoc/pandoc.info | 8 |
2 files changed, 12 insertions, 14 deletions
diff --git a/office/pandoc/pandoc.SlackBuild b/office/pandoc/pandoc.SlackBuild index d4b2a655e7c39..f4b41a92a7cef 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 diff --git a/office/pandoc/pandoc.info b/office/pandoc/pandoc.info index 16d0df43d1716..b601391811e9f 100644 --- a/office/pandoc/pandoc.info +++ b/office/pandoc/pandoc.info @@ -1,10 +1,10 @@ PRGNAM="pandoc" -VERSION="1.11.1" +VERSION="1.13.2" HOMEPAGE="http://johnmacfarlane.net/pandoc/" -DOWNLOAD="http://hackage.haskell.org/packages/archive/pandoc/1.11.1/pandoc-1.11.1.tar.gz" -MD5SUM="e895b22745affba37c0ba5e6e6d0f17c" +DOWNLOAD="http://hackage.haskell.org/packages/archive/pandoc/1.13.2/pandoc-1.13.2.tar.gz" +MD5SUM="74eeee9e7478b69601f2dd565959a77d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="haskell-base64-bytestring haskell-data-default haskell-random haskell-temporary haskell-zip-archive haskell-tagsoup haskell-citeproc-hs haskell-highlighting-kate haskell-texmath haskell-HTTP" +REQUIRES="haskell-aeson haskell-base64-bytestring haskell-blaze-html haskell-blaze-markup haskell-data-default haskell-deepseq-generics haskell-extensible-exceptions haskell-haddock-library haskell-highlighting-kate haskell-hslua haskell-HTTP haskell-http-client haskell-http-client-tls haskell-http-types haskell-JuicyPixels haskell-mtl haskell-network haskell-network-uri haskell-pandoc-types haskell-parsec haskell-random haskell-scientific haskell-SHA haskell-syb haskell-tagsoup haskell-temporary haskell-texmath haskell-text haskell-unordered-containers haskell-vector haskell-xml haskell-yaml haskell-zip-archive haskell-zlib" MAINTAINER="Peter Wang" EMAIL="novalazy@gmail.com" |