git » modemmanager.git » commit 736b887

diff --git a/PKGBUILD b/PKGBUILD
index 6cfc65e..5875ebc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgbase=modemmanager
 pkgname=(modemmanager libmm-glib)
-pkgver=1.18.4
+pkgver=1.18.6
 pkgrel=1
 pkgdesc="Mobile broadband modem management service"
 arch=(x86_64)
@@ -13,13 +13,13 @@ depends=(systemd libgudev polkit ppp libqmi libmbim
          mobile-broadband-provider-info)
 makedepends=(gtk-doc gobject-introspection vala meson git bash-completion)
 checkdepends=(python-gobject python-dbus)
-_commit=ac6d31e463168e894269d2a7c949de4577026eea  # tags/1.18.4
+_commit=a7bcf2036b34d5043dbc33fee7d98bae5859c4d3  # tags/1.18.6
 source=("git+https://gitlab.freedesktop.org/mobile-broadband/ModemManager.git#commit=$_commit")
 sha256sums=('SKIP')
 
 pkgver() {
   cd ModemManager
-  git describe --tags | sed 's/-rc/rc/;s/-/+/g'
+  git describe --tags | sed 's/-rc/rc/;s/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {
@@ -27,7 +27,7 @@ prepare() {
 }
 
 build() {
-  local meson_args=(
+  local meson_options=(
     -D dbus_policy_dir=/usr/share/dbus-1/system.d
     -D dist_version="\"$pkgver-$pkgrel\""
     -D gtk_doc=true
@@ -36,7 +36,7 @@ build() {
     -D vapi=true
   )
 
-  arch-meson ModemManager build "${meson_args[@]}"
+  arch-meson ModemManager build "${meson_options[@]}"
   meson compile -C build
 }