Update to 1.8.0

3 files changed, 12 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e4a658b3dedd..ad8832717157 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = r-commonmark
 	pkgdesc = High Performance CommonMark and Github Markdown Rendering in R
-	pkgver = 1.7
-	pkgrel = 3
+	pkgver = 1.8.0
+	pkgrel = 1
 	url = https://cran.r-project.org/package=commonmark
 	arch = i686
 	arch = x86_64
@@ -13,11 +13,11 @@ pkgbase = r-commonmark
 	optdepends = r-curl
 	optdepends = r-testthat
 	optdepends = r-xml2
-	source = https://cran.r-project.org/src/contrib/commonmark_1.7.tar.gz
+	source = https://cran.r-project.org/src/contrib/commonmark_1.8.0.tar.gz
 	source = system-cmark-gfm.patch
-	source = R-BSD_2_clause-TEMPLATE::https://cran.r-project.org/web/licenses/BSD_2_clause
-	sha256sums = d14a767a3ea9778d6165f44f980dd257423ca6043926e3cd8f664f7171f89108
-	sha256sums = 42f29d26c067e84859c90bee49613043e4425d086f430a95da6077dfc41be1b4
+	source = CRAN-BSD_2_clause-TEMPLATE::https://cran.r-project.org/web/licenses/BSD_2_clause
+	sha256sums = 7d07e72937b1cf158e69f183722bf79dbb91b8967a9dd29f4fa145500c2be668
+	sha256sums = 1a9ca36bb1823edcd887e7dcc160bb939e05afea201d833f8cfb8cbf64ad54cb
 	sha256sums = 19a23bcfa6515217ca3bd3b99c27fe425f41817a034e3279b570a60fed27c499
 
 pkgname = r-commonmark
diff --git a/PKGBUILD b/PKGBUILD
index 39df3044bbf0..c52ba1c5c067 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,10 +4,10 @@
 # Contributor: Alex Branham <alex.branham@gmail.com>
 
 _cranname=commonmark
-_cranver=1.7
+_cranver=1.8.0
 pkgname=r-${_cranname,,}
 pkgver=${_cranver//[:-]/.}
-pkgrel=3
+pkgrel=1
 pkgdesc="High Performance CommonMark and Github Markdown Rendering in R"
 arch=(i686 x86_64)
 url="https://cran.r-project.org/package=${_cranname}"
@@ -17,9 +17,9 @@ checkdepends=(r-testthat r-xml2)
 optdepends=(r-curl r-testthat r-xml2)
 source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz"
         "system-cmark-gfm.patch"
-        "R-BSD_2_clause-TEMPLATE::https://cran.r-project.org/web/licenses/BSD_2_clause")
-sha256sums=('d14a767a3ea9778d6165f44f980dd257423ca6043926e3cd8f664f7171f89108'
-            '42f29d26c067e84859c90bee49613043e4425d086f430a95da6077dfc41be1b4'
+        "CRAN-BSD_2_clause-TEMPLATE::https://cran.r-project.org/web/licenses/BSD_2_clause")
+sha256sums=('7d07e72937b1cf158e69f183722bf79dbb91b8967a9dd29f4fa145500c2be668'
+            '1a9ca36bb1823edcd887e7dcc160bb939e05afea201d833f8cfb8cbf64ad54cb'
             '19a23bcfa6515217ca3bd3b99c27fe425f41817a034e3279b570a60fed27c499')
 
 prepare() {
@@ -43,6 +43,6 @@ package() {
 
   cp -a --no-preserve=ownership "build/${_cranname}" "${pkgdir}/usr/lib/R/library"
 
-  install -Dm644 R-BSD_2_clause-TEMPLATE "${pkgdir}/usr/share/licenses/${pkgname}/BSD_2_clause"
+  install -Dm644 CRAN-BSD_2_clause-TEMPLATE "${pkgdir}/usr/share/licenses/${pkgname}/BSD_2_clause"
   install -Dm644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/system-cmark-gfm.patch b/system-cmark-gfm.patch
index dd4b242cdbe3..56c44cdd0365 100644
--- a/system-cmark-gfm.patch
+++ b/system-cmark-gfm.patch
@@ -21,16 +21,3 @@ index cad9d54..e07d4ab 100644
  
  clean:
  	rm -f $(LIBCMARK) $(OBJECTS) $(SHLIB) $(STATLIB)
-diff --git a/tests/testthat/test-extensions.R b/tests/testthat/test-extensions.R
-index d0eb354..fa922fe 100644
---- a/tests/testthat/test-extensions.R
-+++ b/tests/testthat/test-extensions.R
-@@ -1,7 +1,7 @@
- context("test-extensions")
- 
- test_that("list extensions", {
--  expect_equal(list_extensions(), c("table", "strikethrough", "autolink", "tagfilter"))
-+  expect_equal(list_extensions(), c("table", "strikethrough", "autolink", "tagfilter", "tasklist"))
- })
- 
- test_that("strikethrough", {