From 9e156c9739df39150e99aaee78ec32d633341bb7 Mon Sep 17 00:00:00 2001 From: Pekka Ristola Date: Fri, 29 Dec 2023 19:46:12 +0200 Subject: [PATCH] r-samspectral: use metadata checks --- BioArchLinux/r-samspectral/PKGBUILD | 21 +++++++++++---------- BioArchLinux/r-samspectral/lilac.py | 11 ++++++----- BioArchLinux/r-samspectral/lilac.yaml | 7 ++++--- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/BioArchLinux/r-samspectral/PKGBUILD b/BioArchLinux/r-samspectral/PKGBUILD index 78d37f6352..8b43ecac47 100644 --- a/BioArchLinux/r-samspectral/PKGBUILD +++ b/BioArchLinux/r-samspectral/PKGBUILD @@ -3,24 +3,25 @@ _pkgname=SamSPECTRAL _pkgver=1.56.0 pkgname=r-${_pkgname,,} -pkgver=1.56.0 +pkgver=${_pkgver//-/.} pkgrel=1 -pkgdesc='Identifies cell population in flow cytometry data' -arch=('x86_64') -url="https://bioconductor.org/packages/${_pkgname}" -license=('GPL') +pkgdesc="Identifies cell population in flow cytometry data" +arch=(x86_64) +url="https://bioconductor.org/packages/$_pkgname" +license=(GPL) depends=( r ) source=("https://bioconductor.org/packages/release/bioc/src/contrib/${_pkgname}_${_pkgver}.tar.gz") -sha256sums=('49814844e37282fde405c3217ae222637583a0a0ca4f3008194b148f576b74f0') +md5sums=('2724bc54054c093fac88a672a6b173d6') +b2sums=('527fa7185b84b646ce1652967f5a1ce3b47c9dafabad9877aebd3b6addf07f84082a863f28d6122145440c629c4f36560cd3ae7103aec19863b4c8f39a316e53') build() { - R CMD INSTALL ${_pkgname}_${_pkgver}.tar.gz -l "${srcdir}" + mkdir build + R CMD INSTALL -l build "$_pkgname" } package() { - install -dm0755 "${pkgdir}/usr/lib/R/library" - cp -a --no-preserve=ownership "${_pkgname}" "${pkgdir}/usr/lib/R/library" + install -d "$pkgdir/usr/lib/R/library" + cp -a --no-preserve=ownership "build/$_pkgname" "$pkgdir/usr/lib/R/library" } -# vim:set ts=2 sw=2 et: diff --git a/BioArchLinux/r-samspectral/lilac.py b/BioArchLinux/r-samspectral/lilac.py index bd219c037c..b5cdb057c5 100644 --- a/BioArchLinux/r-samspectral/lilac.py +++ b/BioArchLinux/r-samspectral/lilac.py @@ -1,12 +1,13 @@ #!/usr/bin/env python3 from lilaclib import * +import os +import sys +sys.path.append(os.path.normpath(f'{__file__}/../../../lilac-extensions')) +from lilac_r_utils import r_pre_build + def pre_build(): - for line in edit_file('PKGBUILD'): - if line.startswith('_pkgver='): - line = f'_pkgver={_G.newver}' - print(line) - update_pkgver_and_pkgrel(_G.newver.replace(':', '.').replace('-', '.')) + r_pre_build(_G) def post_build(): git_pkgbuild_commit() diff --git a/BioArchLinux/r-samspectral/lilac.yaml b/BioArchLinux/r-samspectral/lilac.yaml index 6af9924e5f..0b25a87dec 100644 --- a/BioArchLinux/r-samspectral/lilac.yaml +++ b/BioArchLinux/r-samspectral/lilac.yaml @@ -3,7 +3,8 @@ maintainers: - github: starsareintherose email: kuoi@bioarchlinux.org update_on: -- regex: SamSPECTRAL_([\d._-]+).tar.gz - source: regex - url: https://bioconductor.org/packages/SamSPECTRAL +- source: rpkgs + pkgname: SamSPECTRAL + repo: bioc + md5: true - alias: r