summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Schwartz2020-09-04 01:14:20 -0400
committerEli Schwartz2020-09-04 01:14:20 -0400
commit045da1732f6905db989ad5da4c0c26769c146bb3 (patch)
treee8cae13cd95fd5ab7c440c9b6f1f50a076ef8176
parent5880411fd8ad0cf61d3075b3838cb0214f5cb70d (diff)
downloadaur-045da1732f6905db989ad5da4c0c26769c146bb3.tar.gz
upgpkg: zfs-utils-git 2:2.0.0rc1.r38.gcd80273909-1
bump to -rc1 and make sure the pkgver is correctly generated in line with pacman/vercmp requirements; requires bumping epoch again
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD7
2 files changed, 6 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 92ebe29f578..e71b6d4ddd7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
pkgbase = zfs-utils-git
pkgdesc = Userspace utilities for the Zettabyte File System.
- pkgver = 0.8.0.r709.g5a42ef04f
+ pkgver = 2.0.0rc1.r38.gcd80273909
pkgrel = 1
- epoch = 1
+ epoch = 2
url = https://zfsonlinux.org/
arch = i686
arch = x86_64
license = CDDL
makedepends = git
optdepends = python: for arcstat/arc_summary/dbufstat
- provides = zfs-utils=0.8.0.r709.g5a42ef04f
+ provides = zfs-utils=2.0.0rc1.r38.gcd80273909
conflicts = zfs-utils
source = git+https://github.com/zfsonlinux/zfs.git
source = zfs.initcpio.install
diff --git a/PKGBUILD b/PKGBUILD
index 1066df4daa1..481e8a1382d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,9 @@
# All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds
pkgname=zfs-utils-git
-pkgver=0.8.0.r709.g5a42ef04f
+pkgver=2.0.0rc1.r38.gcd80273909
pkgrel=1
-epoch=1
+epoch=2
pkgdesc="Userspace utilities for the Zettabyte File System."
arch=("i686" "x86_64")
url="https://zfsonlinux.org/"
@@ -28,8 +28,7 @@ b2sums=('SKIP'
pkgver() {
cd "${srcdir}"/zfs
- git describe --long | sed 's/^zfs-//;s/\([^-]*-g\)/r\1/;s/-/./g'
-
+ git describe --long | sed 's/^zfs-//;s/-rc/rc/;s/\([^-]*-g\)/r\1/;s/-/./g'
}
prepare() {