Release 18.10

2 files changed, 13 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d4f3d93e66f9..cf60331c3429 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
 # Generated by mksrcinfo v8
-# Wed Jul 25 10:32:27 UTC 2018
+# Wed Jul 25 12:12:02 UTC 2018
 pkgbase = yaru
 	pkgdesc = Yaru default ubuntu theme
-	pkgver = b589893d
-	pkgrel = 4
+	pkgver = 18.10
+	pkgrel = 1
 	url = https://github.com/ubuntu/yaru
 	arch = any
 	license = GPL3
 	makedepends = meson
 	makedepends = sassc
 	makedepends = git
-	conflicts = yaru
+	conflicts = yaru-git
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = yaru::git://github.com/ubuntu/yaru
+	source = git+https://github.com/ubuntu/yaru#commit=684f3d3f9cf9f7fd793f80e2fcf38dde7f970a43
 	sha256sums = SKIP
 
 pkgname = yaru-sound-theme
diff --git a/PKGBUILD b/PKGBUILD
index 1b082e003974..2a5e8e51e104 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,8 @@
 # Maintainer: drakkan <nicola.murino at gmail dot com>
 pkgbase=yaru
 pkgname=('yaru-sound-theme' 'yaru-gtk-theme' 'yaru-gnome-shell-theme' 'yaru-icon-theme')
-pkgver=b589893d
-pkgrel=4
-_gitname=yaru
+pkgver=18.10
+pkgrel=1
 pkgdesc="Yaru default ubuntu theme"
 arch=(any)
 url="https://github.com/ubuntu/yaru"
@@ -11,18 +10,19 @@ license=('GPL3')
 
 makedepends=('meson' 'sassc' 'git')
 options=('!strip' '!buildflags' 'staticlibs')
-conflicts=('yaru')
+conflicts=('yaru-git')
+_commit=684f3d3f9cf9f7fd793f80e2fcf38dde7f970a43  # 18.10
 
-source=("$_gitname::git://github.com/ubuntu/$_gitname")
+source=("git+https://github.com/ubuntu/${pkgbase}#commit=$_commit")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd "$srcdir/${_gitname}"
-  printf "%s" "$(git describe --always --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
+  cd ${pkgbase}
+  git describe --tags | sed 's/-/+/g'
 }
 
 build() {
-  arch-meson ${_gitname} build
+  arch-meson ${pkgbase} build
   ninja -C build
 }