bump

4 files changed, 21 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a80dbcbc2846..df8500efd9e2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = kodi-addon-pvr-hts
 	pkgdesc = Tvheadend HTSP PVR client addon for Kodi
-	pkgver = 2.1.13
-	pkgrel = 3
+	pkgver = 2.1.18
+	pkgrel = 1
 	url = https://github.com/kodi-pvr/pvr.hts
 	arch = i686
 	arch = x86_64
@@ -13,7 +13,7 @@ pkgbase = kodi-addon-pvr-hts
 	makedepends = kodi-platform
 	makedepends = libplatform
 	depends = kodi
-	source = https://github.com/kodi-pvr/pvr.hts/archive/1d1f409f1963f88870314181a29ab81b11c5589c.tar.gz
+	source = git+https://github.com/kodi-pvr/pvr.hts.git#branch=Isengard
 	md5sums = SKIP
 
 pkgname = kodi-addon-pvr-hts
diff --git a/Makefile b/Makefile
index d7f0acd40a12..d2dfc9511f24 100644
--- a/Makefile
+++ b/Makefile
@@ -7,14 +7,16 @@ all: PKGBUILD src
 clean:
 	rm -rf .SRCINFO \
 	  ${PKG}.git    \
+	  ${PKG}.git    \
 	  PKGBUILD      \
 	  src
 
 upload: .${PKG}.git .SRCINFO
-	cd $<                       && \
-	cp -lR ../* ../.SRCINFO ./  && \
-	git commit -am 'bump'       && \
-	true git push origin master
+	rm -f .git
+	ln -s $</.git .
+	git commit -am 'bump'
+	git push origin master
+	rm .git
 
 .%.git:
 	git clone ssh://aur@aur.archlinux.org/$* $@
diff --git a/PKGBUILD b/PKGBUILD
index cc25f8c3c3c5..f5a4f260e1bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,9 +5,9 @@
 pkgname=kodi-addon-pvr-hts
 pkgbase=${pkgname}
 _gitname=pvr.hts
-pkgver=2.1.13
-_gitver=1d1f409f1963f88870314181a29ab81b11c5589c
-pkgrel=3
+pkgver=2.1.18
+_gitver=branch=Isengard
+pkgrel=1
 pkgdesc='Tvheadend HTSP PVR client addon for Kodi'
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url="https://github.com/kodi-pvr/$_gitname"
@@ -15,7 +15,7 @@ license=('GPL')
 groups=('kodi-addons')
 makedepends=('cmake' 'kodi-platform' 'libplatform')
 depends=('kodi')
-source=("https://github.com/kodi-pvr/$_gitname/archive/$_gitver.tar.gz")
+source=("git+https://github.com/kodi-pvr/${_gitname}.git#${_gitver}")
 md5sums=('SKIP')
 
 _prefix='/usr'
@@ -23,7 +23,7 @@ _prefix='/usr'
 build() {
   msg "Starting make..."
 
-  cd "$srcdir/$_gitname-$_gitver"
+  cd "$srcdir/$_gitname"
   mkdir -p build && pushd build
   cmake \
     -DCMAKE_INSTALL_PREFIX=$_prefix \
@@ -34,6 +34,6 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_gitname-$_gitver/build"
+  cd "$srcdir/$_gitname/build"
   make DESTDIR="$pkgdir" install
 }
diff --git a/PKGBUILD.in b/PKGBUILD.in
index be9b5c58d9a9..8236f51b9fe4 100644
--- a/PKGBUILD.in
+++ b/PKGBUILD.in
@@ -1,6 +1,6 @@
 define(`GIT_NAME', `pvr.hts')dnl
-define(`GIT_VERSION', `1d1f409f1963f88870314181a29ab81b11c5589c')dnl
-define(`SRC_DIR', `src/GIT_NAME-GIT_VERSION')dnl
+define(`GIT_VERSION', `branch=Isengard')dnl
+define(`SRC_DIR', `src/GIT_NAME')dnl
 define(`ADDON_XML', `SRC_DIR/GIT_NAME/addon.xml')dnl
 define(`HTS_VERSION', `esyscmd(xmllint --xpath "string(/addon/@version)" ADDON_XML || echo 0)')dnl
 # Maintainer: Daniel Albers <daniel@lbe.rs>
@@ -12,7 +12,7 @@ pkgbase=${pkgname}
 _gitname=GIT_NAME
 pkgver=HTS_VERSION
 _gitver=GIT_VERSION
-pkgrel=3
+pkgrel=1
 pkgdesc='Tvheadend HTSP PVR client addon for Kodi'
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url="https://github.com/kodi-pvr/$_gitname"
@@ -20,7 +20,7 @@ license=('GPL')
 groups=('kodi-addons')
 makedepends=('cmake' 'kodi-platform' 'libplatform')
 depends=('kodi')
-source=("https://github.com/kodi-pvr/$_gitname/archive/$_gitver.tar.gz")
+source=("git+https://github.com/kodi-pvr/${_gitname}.git#${_gitver}")
 md5sums=('SKIP')
 
 _prefix='/usr'
@@ -28,7 +28,7 @@ _prefix='/usr'
 build() {
   msg "Starting make..."
 
-  cd "$srcdir/$_gitname-$_gitver"
+  cd "$srcdir/$_gitname"
   mkdir -p build && pushd build
   cmake \
     -DCMAKE_INSTALL_PREFIX=$_prefix \
@@ -39,6 +39,6 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_gitname-$_gitver/build"
+  cd "$srcdir/$_gitname/build"
   make DESTDIR="$pkgdir" install
 }