summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorHLFH2021-12-08 10:24:03 +0000
committerHLFH2021-12-08 10:24:03 +0000
commit3665898e5cdf53c819b08441b10c50cefb078398 (patch)
treec56077afb73df2feb84480557524f479666b8b67
parent600fca05062939b28b210f3b978497712099bb7e (diff)
downloadaur-3665898e5cdf53c819b08441b10c50cefb078398.tar.gz
add conflict and update package name
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD7
2 files changed, 8 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index da5bf62d859c..649df66e851f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,16 @@
-pkgbase = dibbler
+pkgbase = dibbler-git
pkgdesc = Dibbler, a portable DHCPv6
- pkgver = RELEASE1.0.1+r129+ga7c6cf58
+ pkgver = 1.0.1.r129.ga7c6cf58
pkgrel = 1
url = http://klub.com.pl/dhcpv6/
arch = i686
arch = x86_64
arch = armv7h
license = GPL
+ conflicts = dibbler
source = git+https://github.com/tomaszmrugalski/dibbler
source = dibbler-client.service
sha512sums = SKIP
sha512sums = c8334be4ac1cf011b2727a72e0f35b12ce063ffd5e517182f5733b6a3d57cf406eed6436f6133b9b1bcd77792a44e6ee52c40b462c253bf1d245f0dbf9791ef3
-pkgname = dibbler
+pkgname = dibbler-git
diff --git a/PKGBUILD b/PKGBUILD
index 47ff3c5560f1..265923271fb9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,12 @@
# Maintainer: Stefan J. Betz <info@stefan-betz.net>
-pkgname=dibbler
-pkgver=RELEASE1.0.1+r129+ga7c6cf58
+pkgname=dibbler-git
+pkgver=1.0.1.r129.ga7c6cf58
pkgrel=1
pkgdesc="Dibbler, a portable DHCPv6"
arch=('i686' 'x86_64' 'armv7h')
url="http://klub.com.pl/dhcpv6/"
license=('GPL')
+conflicts=('dibbler')
source=(git+https://github.com/tomaszmrugalski/dibbler
'dibbler-client.service')
sha512sums=('SKIP'
@@ -13,7 +14,7 @@ sha512sums=('SKIP'
pkgver() {
cd dibbler
- git describe --tags | sed 's#v##;s#-#+#g;s#+#+r#'
+ git describe --long --tags | sed 's/^RELEASE//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
build() {