Merge remote-tracking branch 'origin/gnome-unstable'

* origin/gnome-unstable:
  1:46.0-1
  upgpkg: 1:46beta-1: gnome-unstable

.SRCINFO

 pkgbase = gnome-music
 	pkgdesc = Music player and management application
-	pkgver = 45.1
+	pkgver = 46.0
 	pkgrel = 1
 	epoch = 1
 	url = https://wiki.gnome.org/Apps/Music
@@ -25,7 +25,7 @@ pkgbase = gnome-music
 	optdepends = gst-libav: Extra media codecs
 	optdepends = gst-plugins-bad: Extra media codecs
 	optdepends = gst-plugins-ugly: Extra media codecs
-	source = git+https://gitlab.gnome.org/GNOME/gnome-music.git#commit=0ef72c924b88af3968e9888a11cd87531c33d79b
-	b2sums = SKIP
+	source = git+https://gitlab.gnome.org/GNOME/gnome-music.git#commit=1748d79846bfde7b9234f14da99c98eaf21e1e69
+	b2sums = d94428118d36a79408af0eed873131e738b2a7923c0106c6e7a1c7e9703bd0f5af0fc2f105c1df91c4c8f3ea8c17ec0046286d8af29ff20a4d9f59763cdbf9bf
 
 pkgname = gnome-music

PKGBUILD

-# Maintainer: Fabian Bornschein <fabiscafe-at-mailbox-dot-org>
+# Maintainer: Fabian Bornschein <fabiscafe@archlinux.org>
 # Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnome-music
-pkgver=45.1
+pkgver=46.0
 pkgrel=1
 epoch=1
 pkgdesc="Music player and management application"
@@ -35,13 +35,13 @@ optdepends=(
   'gst-plugins-ugly: Extra media codecs'
 )
 groups=(gnome)
-_commit=0ef72c924b88af3968e9888a11cd87531c33d79b  # tags/45.1^0
+_commit=1748d79846bfde7b9234f14da99c98eaf21e1e69  # tags/46.0^0
 source=("git+https://gitlab.gnome.org/GNOME/gnome-music.git#commit=$_commit")
-b2sums=('SKIP')
+b2sums=('d94428118d36a79408af0eed873131e738b2a7923c0106c6e7a1c7e9703bd0f5af0fc2f105c1df91c4c8f3ea8c17ec0046286d8af29ff20a4d9f59763cdbf9bf')
 
 pkgver() {
   cd $pkgname
-  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+  git describe --tags | sed -r 's/\.([a-z])/\1/;s/([a-z])\./\1/;s/[^-]*-g/r&/;s/-/+/g'
 }
 
 prepare() {