diff options
| author | Eric Berquist | 2018-03-27 15:22:57 -0400 |
|---|---|---|
| committer | Eric Berquist | 2018-03-27 15:22:57 -0400 |
| commit | e0aa67e69d1d3876937585639c4b0ea12b477315 (patch) | |
| tree | 047526f9e1b25ebe764d34db5807c27f8628722a | |
| parent | 286ce5516a8359534da24842d0f4364db3bd96a0 (diff) | |
| download | aur-e0aa67e69d1d3876937585639c4b0ea12b477315.tar.gz | |
COPYING -> LICENSE, fix versioning
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | PKGBUILD | 8 |
3 files changed, 7 insertions, 8 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sat Jan 14 21:19:48 UTC 2017 +# Tue Mar 27 19:19:25 UTC 2018 pkgbase = avogadro2-git pkgdesc = Avogadro 2: graphical application - pkgver = 1.90.0.r351.be6a31f - pkgrel = 2 + pkgver = 1.90.0.r373.d5e1f82 + pkgrel = 1 url = http://openchemistry.org/projects/avogadro2 install = avogadro2.install arch = i686 diff --git a/.gitignore b/.gitignore index ca2d827c0096..074d0e519f68 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ # makepkg files pkg/ src/ +*.log *.xz # source files @@ -3,7 +3,7 @@ _pkgname=avogadro2 pkgname="${_pkgname}-git" _gitname=avogadroapp -pkgver=1.90.0.r351.be6a31f +pkgver=1.90.0.r373.d5e1f82 pkgrel=2 pkgdesc="Avogadro 2: graphical application" url="http://openchemistry.org/projects/avogadro2" @@ -19,9 +19,8 @@ sha256sums=('SKIP') pkgver() { cd "${srcdir}/${_pkgname}" - _parent_ver=$(git log --tags --simplify-by-decoration --pretty="format:%d" | head -n 1 | cut -d " " -f 3 | tr -d ")") printf "%s.r%s.%s" \ - "${_parent_ver}" \ + "$(git describe --tags --abbrev=0)" \ "$(git rev-list --count HEAD)" \ "$(git rev-parse --short HEAD)" } @@ -32,7 +31,6 @@ build() { -DCMAKE_BUILD_TYPE:STRING=Release \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \ -DCMAKE_INSTALL_LIBDIR:PATH=lib \ - -DENABLE_TESTING:BOOL=OFF \ -DBUILD_SHARED_LIBS:BOOL=ON \ . make @@ -41,5 +39,5 @@ build() { package() { cd "${srcdir}/${_pkgname}" make DESTDIR="${pkgdir}" install - install -D -m 644 COPYING "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" + install -D -m 644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" } |