diff options
| author | envolution | 2024-11-26 05:26:13 -0500 |
|---|---|---|
| committer | envolution | 2024-11-26 05:26:13 -0500 |
| commit | 0210a9911637aca8e0327eaec80af7666e24a111 (patch) | |
| tree | 5348ae80dd964c89b0d9a0b483bd83ee12ebfeed | |
| parent | 3d1100ce913bc09584a825cd7532a6f5e130003d (diff) | |
| download | aur-0210a9911637aca8e0327eaec80af7666e24a111.tar.gz | |
bump and add MarsSeed fixes
| -rw-r--r-- | .SRCINFO | 15 | ||||
| -rw-r--r-- | .nvchecker.toml | 5 | ||||
| -rw-r--r-- | PKGBUILD | 35 |
3 files changed, 26 insertions, 29 deletions
@@ -1,6 +1,6 @@ -pkgbase = openbabel-git +pkgbase = openbabel pkgdesc = A library designed to interconvert between many file formats used in molecular modeling and computational chemistry (git version, builds Python bindings) - pkgver = 3.0.90.r5774.686ee22f2 + pkgver = 3.1.1+r6091+g7acf50c9d pkgrel = 1 url = https://github.com/openbabel/openbabel arch = x86_64 @@ -14,14 +14,17 @@ pkgbase = openbabel-git makedepends = swig makedepends = maeparser makedepends = rapidjson - provides = openbabel - provides = python-openbabel - conflicts = openbabel - conflicts = python-openbabel source = openbabel::git+https://github.com/openbabel/openbabel.git#branch=master md5sums = SKIP pkgname = openbabel-git depends = wxgtk3 depends = maeparser + provides = openbabel + conflicts = openbabel +pkgname = python-openbabel-git + depends = python + depends = openbabel + provides = python-openbabel + conflicts = python-openbabel diff --git a/.nvchecker.toml b/.nvchecker.toml new file mode 100644 index 000000000000..6a8143eb590e --- /dev/null +++ b/.nvchecker.toml @@ -0,0 +1,5 @@ +[openbabel-git] +source="cmd" +cmd="~/nvchecker/github_version.py openbabel/openbabel --releases -strip openbabel-" +from_pattern="-" +to_pattern="." @@ -1,10 +1,11 @@ -# Maintainer: Eric Berquist <eric dot berquist at gmail dot com> +# Maintainer: envolution +# Contributor: Eric Berquist <eric dot berquist at gmail dot com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgbase=openbabel pkgname=(${pkgbase}-git python-${pkgbase}-git) -pkgver=3.0.90.r5774.686ee22f2 +pkgver=3.1.1+r6091+g7acf50c9d pkgrel=1 pkgdesc='A library designed to interconvert between many file formats used in molecular modeling and computational chemistry (git version, builds Python bindings)' arch=('x86_64') @@ -15,32 +16,19 @@ source=("${pkgbase}::git+https://github.com/openbabel/openbabel.git#branch=maste md5sums=('SKIP') pkgver() { - cd "${srcdir}/${pkgbase}" - _parent_ver=$(git tag --sort=version:refname | tail -n 1 | cut -d "-" -f 2- | tr - .) - _parent_major_ver=$(echo "${_parent_ver}" | cut -d "." -f 1) - _parent_minor_ver=$(echo "${_parent_ver}" | cut -d "." -f 2) - _parent_patch_ver=$(echo "${_parent_ver}" | cut -d "." -f 3) - # Git patch versions always start with 90. Don't use the patch - # version of the parent tag. - _git_patch_ver=90 - printf "%s.%s.%s.r%s.%s" \ - "${_parent_major_ver}" \ - "${_parent_minor_ver}" \ - "${_git_patch_ver}" \ - "$(git rev-list --count HEAD)" \ - "$(git rev-parse --short HEAD)" -} - -prepare() { - mkdir -p build + cd "${pkgbase}" + _version=$(git tag --sort=-v:refname --list | head -n1 | sed 's/-/./g' | grep -o '[0-9.]*' | cut -c2-) + _commits=$(git rev-list --count HEAD) + _short_commit_hash=$(git rev-parse --short=9 HEAD) + echo "${_version}+r${_commits}+g${_short_commit_hash}" } build() { - cd build + mkdir -p build && cd build - cmake "${srcdir}/${pkgbase}" \ + cmake "../${pkgbase}" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3 \ + -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config \ -DRUN_SWIG=ON \ -DPYTHON_BINDINGS=ON @@ -67,3 +55,4 @@ package_python-openbabel-git() { cd build/scripts make DESTDIR="${pkgdir}" install } +# vim:set ts=2 sw=2 et: |