From 54f7492a3f73a58f5f4efe65080a5811d1a684ac Mon Sep 17 00:00:00 2001
From: Yurii Kolesnykov <root@yurikoles.com>
Date: Fri, 3 Jun 2022 08:04:19 +0300
Subject: fix pkgver

Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>
---
 .SRCINFO |  5 ++---
 PKGBUILD | 14 +++++---------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index a8407a3..8fe10d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lib32-systemd-git
 	pkgdesc = system and service manager (32-bit git version)
-	pkgver = 251.r65.g620ecc9c4b
+	pkgver = 251.r58161.311f57a402
 	pkgrel = 1
 	url = https://www.github.com/systemd/systemd
 	arch = x86_64
@@ -29,9 +29,8 @@ pkgbase = lib32-systemd-git
 	depends = lib32-xz
 	depends = lib32-zstd
 	depends = systemd-git
-	provides = lib32-systemd=251.r65.g620ecc9c4b
+	provides = lib32-systemd=251.r58161.311f57a402
 	conflicts = lib32-systemd
-	options = !ccache
 	source = git+https://github.com/systemd/systemd
 	sha512sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index f916397..adfd4c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=lib32-systemd-git
 _pkgbasename=systemd
-pkgver=251.r65.g620ecc9c4b
+pkgver=251.r58161.311f57a402
 pkgrel=1
 pkgdesc='system and service manager (32-bit git version)'
 arch=('x86_64')
@@ -17,13 +17,13 @@ makedepends=('git' 'gperf' 'intltool' 'lib32-acl' 'lib32-bzip2'
              'lib32-curl' 'lib32-dbus' 'lib32-gcc-libs' 'lib32-glib2'
              'lib32-gnutls' 'lib32-libelf' 'lib32-libidn2' 'lib32-pcre2'
              'libxslt' 'meson' 'python-jinja')
-options=(!ccache)
 source=('git+https://github.com/systemd/systemd')
 sha512sums=('SKIP')
 
 pkgver() {
   cd "$_pkgbasename"
-  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  local _major=`grep -m1 version meson.build | cut -d\' -f2`
+  printf "%s.r%s.%s" "${_major}" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
@@ -50,12 +50,6 @@ build() {
     --libexecdir  /usr/lib32
     --libdir    /usr/lib32
 
-    # internal version comparison is incompatible with pacman:
-    #   249~rc1 < 249 < 249.1 < 249rc
-    -Dversion-tag="${pkgver/-/\~}-${pkgrel}-arch"
-    -Dshared-lib-tag="${pkgver/-/\~}-${pkgrel}-arch"
-    -Dmode=release
-
     # features
     -Daudit=false
     -Dblkid=false
@@ -126,6 +120,8 @@ build() {
     -Drpmmacrosdir=no
     -Dsysvinit-path=
     -Dsysvrcnd-path=
+
+    -Dtests=false
   )
 
   arch-meson "$_pkgbasename" build "${_meson_options[@]}"
-- 
cgit v1.2.3-70-g09d2