Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/f98519d6f397f49269eb9a5f7751ada8884ff665)

2 files changed, 9 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3958285644d0..edec82285803 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
-# Generated by makepkg 5.1.3
-# Sun Jun 23 09:34:37 UTC 2019
+# Generated by makepkg 5.2.1
+# Mon May  4 13:49:33 UTC 2020
 pkgbase = vdr-git
-	pkgver = 2.4.1.r0.g32cea9d
-	pkgrel = 2
+	pkgver = 2.4.1.r6.g930c2cd
+	pkgrel = 1
 	url = http://tvdr.de/
 	arch = x86_64
 	arch = i686
@@ -18,7 +18,7 @@ pkgbase = vdr-git
 	makedepends = ttf-font
 	makedepends = systemd
 	makedepends = ncurses
-	source = vdr-git::git+https://github.com/VDR4Arch/vdr.git
+	source = vdr-git::git+http://git.tvdr.de/vdr.git
 	source = https://raw.githubusercontent.com/VDR4Arch/vdr4arch/87d77e000f8067e73e1c2da4d4ba4ace653e766c/vdr/vdr-MainMenuHooks.patch
 	source = https://raw.githubusercontent.com/VDR4Arch/vdr4arch/87d77e000f8067e73e1c2da4d4ba4ace653e766c/vdr/00-vdr.conf
 	source = https://raw.githubusercontent.com/VDR4Arch/vdr4arch/87d77e000f8067e73e1c2da4d4ba4ace653e766c/vdr/50-hello.conf
diff --git a/PKGBUILD b/PKGBUILD
index 5362b03fa849..fbe1dcae5113 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,15 @@
 # Maintainer: Manuel Reimer <manuel.reimer@gmx.de>
 pkgbase=vdr-git
 pkgname=(vdr-git vdr-examples-git)
-pkgver=2.4.1.r0.g32cea9d
+pkgver=2.4.1.r6.g930c2cd
 _vdrapi=2.4.1
-pkgrel=2
+pkgrel=1
 url="http://tvdr.de/"
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h')
 license=('GPL2')
 makedepends=('fontconfig' 'libcap' 'libjpeg-turbo' 'libsystemd' 'perl' 'ttf-font' 'systemd' 'ncurses')
 _vdrrepo="https://raw.githubusercontent.com/VDR4Arch/vdr4arch/87d77e000f8067e73e1c2da4d4ba4ace653e766c/vdr"
-source=("$pkgbase::git+https://github.com/VDR4Arch/vdr.git"
+source=("$pkgbase::git+http://git.tvdr.de/vdr.git"
         "$_vdrrepo/vdr-MainMenuHooks.patch"
         "$_vdrrepo/00-vdr.conf"
         "$_vdrrepo/50-hello.conf"
@@ -36,7 +36,7 @@ md5sums=('SKIP'
 
 pkgver() {
   cd "${srcdir}/${pkgbase}"
-  git describe --long --tags | sed 's/^vdr-//;s/\([^-]*-g\)/r\1/;s/-/./g'
+  git describe --long --tags | sed -r 's/^V(.)(..)(..)/\1.\2.\3/;s/\.0/./g;s/([^-]*-g)/r\1/;s/-/./g'
 }
 
 prepare() {