Replace pandoc-bin with pandoc

2 files changed, 11 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 991dff40196c..5d5772d34516 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = rstudio-desktop-git
 	pkgdesc = A powerful and productive integrated development environment (IDE) for R programming language
-	pkgver = 0.99.632
+	pkgver = 0.99.717
 	pkgrel = 1
 	url = https://www.rstudio.com/products/rstudio/
 	install = rstudio-desktop-git.install
@@ -26,7 +26,7 @@ pkgbase = rstudio-desktop-git
 	depends = qt5-webkit
 	depends = hunspell-en
 	depends = mathjax
-	depends = pandoc-bin
+	depends = pandoc
 	optdepends = git: for git support
 	optdepends = subversion: for subversion suuport
 	optdepends = openssh-askpass: for a git ssh access
diff --git a/PKGBUILD b/PKGBUILD
index a1a5978a5da9..0921ec155e7d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=rstudio-desktop-git
 _gitname=rstudio
-pkgver=0.99.638
+pkgver=0.99.717
 _gwtver=2.7.0
 _ginver=1.5
 pkgrel=1
@@ -10,7 +10,7 @@ pkgdesc="A powerful and productive integrated development environment (IDE) for
 arch=('i686' 'x86_64')
 url="https://www.rstudio.com/products/rstudio/"
 license=('AGPL3')
-depends=('boost-libs>=1.5' 'r>=2.11.1' 'hicolor-icon-theme' 'shared-mime-info' 'qt5-webkit' 'hunspell-en' 'mathjax' 'pandoc-bin')
+depends=('boost-libs>=1.5' 'r>=2.11.1' 'hicolor-icon-theme' 'shared-mime-info' 'qt5-webkit' 'hunspell-en' 'mathjax' 'pandoc')
 makedepends=('git' 'cmake>=2.8' 'boost>=1.5' 'java-runtime' 'apache-ant' 'unzip' 'openssl' 'pango' 'libcups' 'qt5-svg' 'pam' 'wget')
 optdepends=('git: for git support'
 	    'subversion: for subversion suuport'
@@ -33,13 +33,12 @@ pkgver() {
 
 prepare() {
     msg "Extracting dependencies"
-    cd "${srcdir}/${_gitname}"
-    install -d src/gwt/lib/{gin,gwt}
-    install -d src/gwt/lib/gin/${_ginver}
-    install -d src/gwt/lib/gwt/${_gwtver}
-
-    unzip -qo "${srcdir}/gin-${_ginver}.zip" -d "src/gwt/lib/gin/${_ginver}"
-    cp -r "${srcdir}/gwt-${_gwtver}/"* "src/gwt/lib/gwt/${_gwtver}"
+    cd "${srcdir}/${_gitname}/src/gwt"
+    install -d lib/{gin,gwt}
+    install -d lib/gin/${_ginver}
+    install -d lib/gwt/${_gwtver}
+    unzip -qo "${srcdir}/gin-${_ginver}.zip" -d lib/gin/${_ginver}
+    cp -r "${srcdir}/gwt-${_gwtver}/"* lib/gwt/${_gwtver}
 
     cd "${srcdir}/${_gitname}/dependencies/common"
     install -d dictionaries mathjax-23 pandoc libclang/{3.5,builtin-headers}
@@ -70,14 +69,11 @@ package() {
     install -Dm 644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
     # Creaate symlinks
     install -d "${pkgdir}/usr/bin"
+    rm -rf "${pkgdir}/usr/lib/rstudio/resources/"{dictionaries,mathjax-23,libclang}
     ln -sf /usr/lib/rstudio/bin/rstudio "${pkgdir}/usr/bin/rstudio"
-    rm -rf "${pkgdir}/usr/lib/rstudio/resources/dictionaries"
     ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/rstudio/resources/dictionaries"
-    rm -rf "${pkgdir}/usr/lib/rstudio/resources/mathjax-23"
     ln -sf /usr/share/mathjax "${pkgdir}/usr/lib/rstudio/resources/mathjax-23"
     install -d "${pkgdir}/usr/lib/rstudio/bin/pandoc"
     ln -sf /usr/bin/pandoc "${pkgdir}/usr/lib/rstudio/bin/pandoc/pandoc"
     ln -sf /usr/bin/pandoc-citeproc "${pkgdir}/usr/lib/rstudio/bin/pandoc/pandoc-citeproc"
-    # Remove empty directories
-    rm -rf "${pkgdir}/usr/lib/rstudio/resources/libclang"
 }