summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtem Klevtsov2015-09-02 09:48:08 +0700
committerArtem Klevtsov2015-09-02 09:48:08 +0700
commitfc513e6280c1bf4e8532a2f75357050fc5533e81 (patch)
tree2fc68c41c3e8779cf78f661939f79ee6271f50e9
parentcd75929df846f26e6daa28571d6fdda4a87bd9ff (diff)
downloadaur-fc513e6280c1bf4e8532a2f75357050fc5533e81.tar.gz
Update version. Fix conflicts
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD15
2 files changed, 19 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b9c3ba13d7a1..47ac77120b2d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,21 @@
pkgbase = pandoc-bin
pkgdesc = Universal markup converter (Binary build from official deb)
- pkgver = 1.13.2
- pkgrel = 2
+ pkgver = 1.15.0.6
+ pkgrel = 1
url = http://pandoc.org/
arch = x86_64
license = GPL2
depends = gmp
depends = zlib
optdepends = texlive-most: for PDF creation
- source_x86_64 = https://github.com/jgm/pandoc/releases/download/1.13.2/pandoc-1.13.2-1-amd64.deb
- md5sums_x86_64 = 90e22cf8291d7444fb34d0a41c49dcf6
+ provides = pandoc-cabal
+ provides = pandoc-static
+ provides = pandoc-rstudio
+ conflicts = pandoc-cabal
+ conflicts = pandoc-static
+ conflicts = pandoc-rstudio
+ source_x86_64 = https://github.com/jgm/pandoc/releases/download/1.15.0.6/pandoc-1.15.0.6-1-amd64.deb
+ md5sums_x86_64 = 6af83d0fd197e9427f5735b3684b82af
pkgname = pandoc-bin
diff --git a/PKGBUILD b/PKGBUILD
index 48b8e6219f62..cbac32394823 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,22 @@
# Maintainer Keerthan Jaic <jckeerthan at gmail dot com>
+# Contributor Artem Klevtsov <a.a.klevtsov at gmail dot com>
pkgname=pandoc-bin
-pkgver=1.13.2
-pkgrel=2
+pkgver=1.15.0.6
+pkgrel=1
pkgdesc="Universal markup converter (Binary build from official deb)"
-arch=('x86_64')
url="http://pandoc.org/"
license=('GPL2')
+arch=('x86_64')
depends=('gmp' 'zlib')
optdepends=('texlive-most: for PDF creation')
+provides=('pandoc-cabal' 'pandoc-static' 'pandoc-rstudio')
+conflicts=('pandoc-cabal' 'pandoc-static' 'pandoc-rstudio')
source_x86_64=("https://github.com/jgm/pandoc/releases/download/${pkgver}/pandoc-${pkgver}-1-amd64.deb")
-md5sums_x86_64=('90e22cf8291d7444fb34d0a41c49dcf6')
+md5sums_x86_64=('6af83d0fd197e9427f5735b3684b82af')
package() {
- bsdtar -xf data.tar.gz -C "$pkgdir/"
+ bsdtar -xf data.tar.gz -C "${pkgdir}/"
# This folder only has the license
- rm -r "$pkgdir"/usr/share/doc
+ rm -r "${pkgdir}"/usr/share/doc
}