[arch-commits] Commit in lib32-systemd/trunk (PKGBUILD)

[Christian Hesse]

    Date: Friday, November 29, 2019 @ 19:55:58
  Author: eworm
Revision: 534528

upgpkg: lib32-systemd 244-1

new upstream release

Modified:
  lib32-systemd/trunk/PKGBUILD

----------+
 PKGBUILD |   24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-29 19:26:21 UTC (rev 534527)
+++ PKGBUILD	2019-11-29 19:55:58 UTC (rev 534528)
@@ -4,10 +4,9 @@
 
 pkgname=lib32-systemd
 _pkgbasename=systemd
-# Can be from either systemd or systemd-stable
-_commit='e51d9bf9e5ac5a6618c175cd9b5cfdc6733cd5d1'
-pkgver=243.162
-pkgrel=2
+_tag='ec298e702b87e2859f7f7864f51eef3360daf163' # git rev-parse v${pkgver}
+pkgver=244
+pkgrel=1
 pkgdesc='system and service manager (32-bit)'
 arch=('x86_64')
 url='https://www.github.com/systemd/systemd'
@@ -20,8 +19,7 @@
 options=('strip')
 validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4'  # Lennart Poettering <lennart at poettering.net>
               '5C251B5FC54EB2F80F407AAAC54CA336CFEB557E') # Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
-source=(# fragment is latest tag for source verification, final merge in prepare()
-        "git+https://github.com/systemd/systemd-stable#tag=v${pkgver%.*}?signed"
+source=("git+https://github.com/systemd/systemd-stable#tag=${_tag}?signed"
         "git+https://github.com/systemd/systemd#tag=v${pkgver%.*}?signed")
 sha512sums=('SKIP'
             'SKIP')
@@ -37,9 +35,6 @@
 
   # add upstream repository for cherry-picking
   git remote add -f upstream ../systemd
-  # merge the latest stable commit (fast-foward only to make sure
-  # the verified tag is in)
-  git merge --ff-only "${_commit}"
 
   local _c
   for _c in "${_backports[@]}"; do
@@ -50,17 +45,6 @@
   done
 }
 
-pkgver() {
-  cd "$_pkgbasename-stable"
-
-  # TODO: Switch to upstream versioning post v243!
-
-  local _version _count
-  _version='v243'
-  _count="$(git rev-list --count ${_version}..)"
-  printf '%s.%s' "${_version#v}" "${_count}"
-}
-
 build() {
   export CC="gcc -m32"
   export CXX="g++ -m32"