diff --git a/BioArchLinux/udunits/PKGBUILD b/BioArchLinux/udunits/PKGBUILD index 5e63ff2037..92237eeab4 100644 --- a/BioArchLinux/udunits/PKGBUILD +++ b/BioArchLinux/udunits/PKGBUILD @@ -1,4 +1,5 @@ -# Maintainer: Martin C. Doege +# Maintainer: Pekka Ristola +# Contributor: Martin C. Doege # Contributor: TDY # Contributor: Kaiting Chen # Contributor: Anton Bazhenov @@ -7,28 +8,26 @@ pkgname=udunits pkgver=2.2.28 pkgrel=5 pkgdesc="A tool for calculations of physical quantities" -arch=('i686' 'x86_64') +arch=(x86_64) url="http://www.unidata.ucar.edu/software/udunits/" -license=('MIT') -depends=('expat') -options=('!libtool') -install=udunits.install -source=(https://artifacts.unidata.ucar.edu/repository/downloads-udunits/$pkgver/$pkgname-$pkgver.tar.gz) +license=(custom) +depends=(expat) +source=("https://artifacts.unidata.ucar.edu/repository/downloads-udunits/$pkgver/$pkgname-$pkgver.tar.gz") sha256sums=('590baec83161a3fd62c00efa66f6113cec8a7c461e3f61a5182167e0cc5d579e') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" ./configure --prefix=/usr --disable-static make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install - ln -s libudunits2.so "$pkgdir/usr/lib/libudunits.so" - ln -s libudunits2.so.0 "$pkgdir/usr/lib/libudunits.so.0" - ln -s libudunits2.so.0.1.0 "$pkgdir/usr/lib/libudunits.so.0.1.0" - install -Dm0644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname" COPYRIGHT + cd "$pkgdir/usr/lib" + local _lib + for _lib in libudunits2.so*; do + ln -s "$_lib" "${_lib/#libudunits2/libudunits}" + done } - -# vim:set ts=2 sw=2 et: diff --git a/BioArchLinux/udunits/lilac.py b/BioArchLinux/udunits/lilac.py old mode 100755 new mode 100644 index 19737b8d62..972c0d45d2 --- a/BioArchLinux/udunits/lilac.py +++ b/BioArchLinux/udunits/lilac.py @@ -1,12 +1,9 @@ #!/usr/bin/env python3 - from lilaclib import * - def pre_build(): - update_pkgver_and_pkgrel(_G.newver.lstrip('v')) + update_pkgver_and_pkgrel(_G.newver) + run_cmd(['updpkgsums']) def post_build(): - git_pkgbuild_commit() -# vim:set ts=2 sw=2 et: - + git_pkgbuild_commit() diff --git a/BioArchLinux/udunits/lilac.yaml b/BioArchLinux/udunits/lilac.yaml old mode 100755 new mode 100644 index 5982357745..a43c5145cd --- a/BioArchLinux/udunits/lilac.yaml +++ b/BioArchLinux/udunits/lilac.yaml @@ -1,10 +1,13 @@ -maintainers: - - github: starsareintherose - email: kuoi@bioarchlinux.org build_prefix: extra-x86_64 +maintainers: +- github: pekkarr + email: pekkarr@protonmail.com update_on: - - source: regex - url: "https://artifacts.unidata.ucar.edu/service/rest/repository/browse/downloads-udunits/" - regex: href="(\d+.\d+.\d+)/" -# vim:set ts=2 sw=2 et: - +- source: regex + url: "https://artifacts.unidata.ucar.edu/service/rest/repository/browse/downloads-udunits/" + regex: href="(\d+.\d+.\d+)/" +- source: alpm + alpm: expat + repo: core + provided: libexpat.so + strip_release: true diff --git a/BioArchLinux/udunits/udunits.install b/BioArchLinux/udunits/udunits.install deleted file mode 100644 index f73e2ea7fc..0000000000 --- a/BioArchLinux/udunits/udunits.install +++ /dev/null @@ -1,22 +0,0 @@ -infodir=/usr/share/info -filelist=(udunits2.info udunits2lib.info udunits2prog.info) - -post_install() { - [[ -x usr/bin/install-info ]] || return 0 - for file in "${filelist[@]}"; do - install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null - done -} - -post_upgrade() { - post_install "$1" -} - -pre_remove() { - [[ -x usr/bin/install-info ]] || return 0 - for file in "${filelist[@]}"; do - install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null - done -} - -# vim:set ts=2 sw=2 et: