summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Reimer2017-09-08 22:41:21 +0200
committerChristopher Reimer2017-09-08 22:41:21 +0200
commit31c39c745edbb2f324984428f67176bc515be291 (patch)
treed74eaf6922ff5157ce6c30cfa5e585bd5eed95e8
parent6896eaa35478338455f00e4d7b8fabf4bca73f2f (diff)
downloadaur-31c39c745edbb2f324984428f67176bc515be291.tar.gz
Sync from VDR4Arch (https://github.com/VDR4Arch/vdr4arch/commit/570f9f8122dd444fbb6198b66f7efbe48f6a6e90)
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD19
2 files changed, 10 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e95f27b7473b..f30a6e872a8f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by makepkg 5.0.2
+# Fri Sep 8 20:41:21 UTC 2017
pkgbase = vdr-epgsearch
pkgdesc = Searchtimer and replacement of the VDR program menu
- pkgver = 1.0.1.beta5.r12.ga908daa
+ pkgver = 2.2.0.r5.g9a88fe3
pkgrel = 1
epoch = 1
url = http://winni.vdr-developer.org/epgsearch
@@ -27,7 +29,7 @@ pkgbase = vdr-epgsearch
backup = var/lib/vdr/plugins/epgsearch/epgsearchmenu.conf
backup = var/lib/vdr/plugins/epgsearch/epgsearchupdmail-html.templ
backup = var/lib/vdr/plugins/epgsearch/epgsearchupdmail.templ
- source = git://projects.vdr-developer.org/vdr-plugin-epgsearch.git#commit=a908daa4c5c6edd6c560ed96939358b4352e9b42
+ source = git://projects.vdr-developer.org/vdr-plugin-epgsearch.git#commit=9a88fe383b470066bc5ff9376cbac674dd556874
source = 50-epgsearch.conf
md5sums = SKIP
md5sums = 9a936790ce844d011d8bbb3bf13ec336
diff --git a/PKGBUILD b/PKGBUILD
index 41a03daf2794..a8c4520c50a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,11 @@
# Maintainer: Christopher Reimer <mail+vdr4arch[at]c-reimer[dot]de>
pkgname=vdr-epgsearch
-pkgver=1.0.1.beta5.r12.ga908daa
-_gitver=a908daa4c5c6edd6c560ed96939358b4352e9b42
+pkgver=2.2.0.r5.g9a88fe3
+# Note: Only use commits from branch "vdr-2.2.x" here.
+# VDR 2.3.x needs commits from "master" branch!
+# Don't mix between them! There is no "universal" version any more!
+_gitver=9a88fe383b470066bc5ff9376cbac674dd556874
_vdrapi=2.2.0
epoch=1
pkgrel=1
@@ -35,17 +38,7 @@ md5sums=('SKIP'
pkgver() {
cd "${srcdir}/vdr-plugin-${_plugname}"
- _last_release=1.0.1.beta5
- _last_release_commit=7fea7fca409bf75cba18ba5f07c4fe8a3bd72e75
-
- _count=$((`git rev-list --count HEAD` - `git rev-list --count $_last_release_commit`))
- if [ $_count -gt 0 ]; then
- printf "%s.r%s.g%s" $_last_release \
- $_count \
- `git rev-parse --short HEAD`
- else
- printf "%s" $_last_release
- fi
+ git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//'
}
prepare() {