diff options
| author | Marcell Meszaros | 2022-05-06 00:25:25 +0200 |
|---|---|---|
| committer | Marcell Meszaros | 2022-05-06 00:38:22 +0200 |
| commit | bc8ced90a642983bedc0330221dd12cbd37bdd5a (patch) | |
| tree | e076b588fd0eeb3f2c33124bb89adf824067ec3c | |
| parent | 1cd14edd19121258b4691ce79b58a24ff8ea2aad (diff) | |
| download | aur-bc8ced90a642983bedc0330221dd12cbd37bdd5a.tar.gz | |
fix URL, adjust dependencies, use git tag for pkgver
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | .gitignore | 6 | ||||
| -rw-r--r-- | PKGBUILD | 23 |
3 files changed, 28 insertions, 13 deletions
@@ -1,6 +1,6 @@ pkgbase = ark-git pkgdesc = Archiving Tool - pkgver = r3038.f42c580 + pkgver = 22.04.0.r13.g3981425a pkgrel = 1 url = http://kde.org/applications/utilities/ark/ arch = i686 @@ -10,9 +10,11 @@ pkgbase = ark-git makedepends = git makedepends = kdoctools-git makedepends = python + depends = kparts-git depends = kpty-git - depends = khtml-git - depends = libarchive + depends = libarchive-git + depends = libzip + depends = kitemmodels-git depends = hicolor-icon-theme optdepends = p7zip optdepends = zip @@ -20,9 +22,7 @@ pkgbase = ark-git optdepends = unrar provides = ark conflicts = ark - conflicts = kdeutils-ark - source = git://anongit.kde.org/ark.git + source = git+https://invent.kde.org/utilities/ark.git md5sums = SKIP pkgname = ark-git - diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..6264719ed9d8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +* +!.gitignore +!.SRCINFO +!PKGBUILD +!ark-git.install + @@ -1,24 +1,33 @@ -# Maintainer: Alexey D. <lq07829icatm at rambler.ru> +# Contributor: Marcell Meszaros < marcell.meszaros AT runbox.eu > +# Contributor: Alexey D. <lq07829icatm at rambler.ru> # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=ark-git -pkgver=r3038.f42c580 +pkgver=22.04.0.r13.g3981425a pkgrel=1 pkgdesc="Archiving Tool" arch=(i686 x86_64) url='http://kde.org/applications/utilities/ark/' license=(GPL) -depends=(kpty-git khtml-git libarchive hicolor-icon-theme) +depends=(kparts-git kpty-git libarchive-git libzip kitemmodels-git hicolor-icon-theme) makedepends=(extra-cmake-modules-git git kdoctools-git python) optdepends=(p7zip zip unzip unrar) provides=(ark) -conflicts=(ark kdeutils-ark) -source=('git://anongit.kde.org/ark.git') +conflicts=(ark) +source=('git+https://invent.kde.org/utilities/ark.git') md5sums=('SKIP') pkgver() { - cd ark - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + cd ${pkgname%-git} + + # Generate git tag based version. Count only proper v#.#* [#=number] tags. + local _gitversion=$(git describe --long --tags --match 'v[0-9][0-9.][0-9.]*' | sed -e 's|^v||' | tr '[:upper:]' '[:lower:]') + + # Format git-based version for pkgver + echo "${_gitversion}" | sed \ + -e 's|^\([0-9][0-9.]*\)-\([a-zA-Z]\+\)|\1\2|' \ + -e 's|\([0-9]\+-g\)|r\1|' \ + -e 's|-|.|g' } prepare() { |