[lilac] updated to 0.5.1-3

2 files changed, 36 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e5f0d46ab9ff..9db0deff8054 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,22 @@
 pkgbase = r-fontawesome
 	pkgdesc = Easily Work with 'Font Awesome' Icons
 	pkgver = 0.5.1
-	pkgrel = 1
+	pkgrel = 3
 	url = https://cran.r-project.org/package=fontawesome
 	arch = any
 	license = MIT
 	checkdepends = r-dplyr
 	checkdepends = r-testthat
-	depends = r-rlang
 	depends = r-htmltools
+	depends = r-rlang
 	depends = ttf-font-awesome
 	optdepends = r-covr
 	optdepends = r-dplyr
 	optdepends = r-knitr
-	optdepends = r-testthat
 	optdepends = r-rsvg
+	optdepends = r-testthat
 	source = https://cran.r-project.org/src/contrib/fontawesome_0.5.1.tar.gz
-	source = CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT
+	md5sums = cacbbeac6797eb71e76665758829ad2b
 	sha256sums = f4ebbbe2ee8d2e2c0342b72095cfe668bd9800ea6c4bf7180300544bde7e566c
-	sha256sums = e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b
 
 pkgname = r-fontawesome
diff --git a/PKGBUILD b/PKGBUILD
index 7d880eedabf7..806cec551be9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,55 @@
 # Maintainer: Pekka Ristola <pekkarr [at] protonmail [dot] com>
+# Contributor: Guoyi Zhang <guoyizhang at malacology dot net>
 # Contributor: Viktor Drobot (aka dviktor) linux776 [at] gmail [dot] com
 
-_cranname=fontawesome
-_cranver=0.5.1
-pkgname=r-${_cranname,,}
-pkgver=${_cranver//[:-]/.}
-pkgrel=1
+_pkgname=fontawesome
+_pkgver=0.5.1
+pkgname=r-${_pkgname,,}
+pkgver=${_pkgver//-/.}
+pkgrel=3
 pkgdesc="Easily Work with 'Font Awesome' Icons"
 arch=(any)
-url="https://cran.r-project.org/package=${_cranname}"
+url="https://cran.r-project.org/package=${_pkgname}"
 license=(MIT)
-depends=(r-rlang r-htmltools ttf-font-awesome)
-checkdepends=(r-dplyr r-testthat)
+depends=(
+  r-htmltools
+  r-rlang
+  ttf-font-awesome
+)
+checkdepends=(
+  r-dplyr
+  r-testthat
+)
 optdepends=(
-    r-covr
-    r-dplyr
-    r-knitr
-    r-testthat
-    r-rsvg
+  r-covr
+  r-dplyr
+  r-knitr
+  r-rsvg
+  r-testthat
 )
-source=("https://cran.r-project.org/src/contrib/${_cranname}_${_cranver}.tar.gz"
-        "CRAN-MIT-TEMPLATE::https://cran.r-project.org/web/licenses/MIT")
-sha256sums=('f4ebbbe2ee8d2e2c0342b72095cfe668bd9800ea6c4bf7180300544bde7e566c'
-            'e76e4aad5d3d9d606db6f8c460311b6424ebadfce13f5322e9bae9d49cc6090b')
+source=("https://cran.r-project.org/src/contrib/${_pkgname}_${_pkgver}.tar.gz")
+md5sums=('cacbbeac6797eb71e76665758829ad2b')
+sha256sums=('f4ebbbe2ee8d2e2c0342b72095cfe668bd9800ea6c4bf7180300544bde7e566c')
 
 build() {
   mkdir -p build
-  R CMD INSTALL "${_cranname}" -l "${srcdir}/build"
+  R CMD INSTALL "$_pkgname" -l build
 }
 
 check() {
-  cd "${_cranname}/tests"
-  R_LIBS="${srcdir}/build" NOT_CRAN=true Rscript --vanilla testthat.R
+  cd "$_pkgname/tests"
+  R_LIBS="$srcdir/build" NOT_CRAN=true Rscript --vanilla testthat.R
 }
 
 package() {
-  install -dm0755 "${pkgdir}/usr/lib/R/library"
-
-  cp -a --no-preserve=ownership "build/${_cranname}" "${pkgdir}/usr/lib/R/library"
+  install -d "$pkgdir/usr/lib/R/library"
+  cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library"
 
-  install -Dm644 CRAN-MIT-TEMPLATE "${pkgdir}/usr/share/licenses/${pkgname}/MIT"
-  install -Dm644 "${_cranname}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -d "$pkgdir/usr/share/licenses/$pkgname"
+  ln -s "/usr/lib/R/library/$_pkgname/LICENSE" "$pkgdir/usr/share/licenses/$pkgname"
 
   # symlink TTF fonts to ttf-font-awesome package
-  cd "$pkgdir/usr/lib/R/library/$_cranname/fontawesome/webfonts"
+  cd "$pkgdir/usr/lib/R/library/$_pkgname/fontawesome/webfonts"
   local _font
   for _font in *.ttf; do
     ln -sf "/usr/share/fonts/TTF/$_font"