diff options
author | Ted Alff | 2020-01-10 21:06:47 -0500 |
---|---|---|
committer | Ted Alff | 2020-01-10 21:06:47 -0500 |
commit | 23782dfc30741e17be24357f29a9864420454b63 (patch) | |
tree | 7c42f780d4a05c92ef1b1cba62ae8cd141ef9c5d | |
parent | e8a1a11f0084dfe64f1bbe611cd4202eb1afcac8 (diff) | |
download | aur-23782dfc30741e17be24357f29a9864420454b63.tar.gz |
Change version formatting.
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 12 |
2 files changed, 7 insertions, 13 deletions
@@ -1,8 +1,6 @@ -# Generated by mksrcinfo v8 -# Sat Dec 16 16:38:56 UTC 2017 pkgbase = xfdesktop-git pkgdesc = A desktop manager for Xfce (git version) - pkgver = 4.13.1.r117.g10473391 + pkgver = 4.14.0+89+g85368af1 pkgrel = 1 url = http://www.xfce.org/ arch = i686 @@ -16,8 +14,8 @@ pkgbase = xfdesktop-git depends = garcon>=0.6.0 depends = hicolor-icon-theme depends = libwnck3 - depends = thunar>=1.7.0 - provides = xfdesktop=4.13.1 + depends = thunar + provides = xfdesktop=4.14.0 conflicts = xfce4-menueditor conflicts = xfdesktop replaces = xfce4-menueditor @@ -2,29 +2,25 @@ _pkgname=xfdesktop pkgname=${_pkgname}-git -pkgver=4.13.1.r117.g10473391 +pkgver=4.14.0+89+g85368af1 pkgrel=1 pkgdesc="A desktop manager for Xfce (git version)" arch=('i686' 'x86_64') url="http://www.xfce.org/" license=('GPL2') groups=('xfce4') -depends=('libxfce4ui>=4.13.0' 'garcon>=0.6.0' 'hicolor-icon-theme' 'libwnck3') # 'thunar') +depends=('libxfce4ui>=4.13.0' 'garcon>=0.6.0' 'hicolor-icon-theme' 'libwnck3' 'thunar') makedepends=('intltool' 'git' 'xfce4-dev-tools') conflicts=('xfce4-menueditor' "${_pkgname}") -provides=("${_pkgname}=${pkgver%%.r*}") +provides=("${_pkgname}=${pkgver%%+*}") replaces=('xfce4-menueditor') options=('!libtool') source=("${_pkgname}::git://git.xfce.org/xfce/xfdesktop") sha256sums=('SKIP') -# Desktop plugin has been ported to thunarx-3. If thunar-git is installed, it will be built so -# add to dependencies, otherwise add missing dependencies that thunar would otherwise satisfy. -[[ "`pkg-config --modversion thunarx-3 2>/dev/null`" != '' && $( vercmp '1.7.0' "`pkg-config --modversion thunarx-3 2>/dev/null`" ) -ge 0 ]] && depends+=('thunar>=1.7.0') || depends+=('exo>=0.11.0' 'libnotify') - pkgver() { cd "${srcdir}/${_pkgname}" - git describe --long --tags | sed -r "s/^${_pkgname}.//;s/([^-]*-g)/r\1/;s/-/./g" + git describe --long --tags | sed -r "s:^${_pkgname}.::;s/^v//;s/^xfce-//;s/-/+/g" } build() { |