Bugfixes

2 files changed, 21 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cd80944f9a9b..37b090cc12d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = kodi-addon-pvr-iptvsimple
 	pkgdesc = IPTV Simple PVR client addon for Kodi
 	pkgver = 19.2.2
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/kodi-pvr/pvr.iptvsimple
 	arch = armv6h
 	arch = armv7h
diff --git a/PKGBUILD b/PKGBUILD
index bcf62775d99c..aedcd812e4a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: thepasto <thepasto@gmail.com>
 pkgname=kodi-addon-pvr-iptvsimple
 pkgver=19.2.2
-pkgrel=1
+pkgrel=2
 pkgdesc='IPTV Simple PVR client addon for Kodi'
 _koditarget=Matrix
 _gitname=pvr.iptvsimple
@@ -15,36 +15,33 @@ conflicts=('kodi-addon-pvr-iptvsimple-git');
 depends=('kodi')
 source=("https://github.com/kodi-pvr/${_gitname}/archive/${pkgver}-${_koditarget}.tar.gz"
         "https://github.com/xbmc/xbmc/archive/${_kodiver}-${_koditarget}.tar.gz"
-)
+        )
 sha256sums=('57710d3add72301d47a9eef016916ee5f61b7b8604c73450d67b9ba962eff60c'
             'cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da'
             )
 
-prepare() {
-        cd xbmc-${_kodiver}-${_koditarget}
-        #patch -p1 cmake/scripts/common/HandleDepends.cmake ${srcdir}/8f714dcc7f1a1dfa9b57ef18c3f4accc62cb0652.diff
-        #sed -i "s|-p1 -i|--binary -p1 -i|" cmake/scripts/common/HandleDepends.cmake
-        #sed -i 's/GIT_SHALLOW 1/GIT_SHALLOW ""/g' cmake/scripts/common/HandleDepends.cmake
-}
+#prepare() {
+    #cd xbmc-${_kodiver}-${_koditarget}
+    #patch -p1 cmake/scripts/common/HandleDepends.cmake ${srcdir}/8f714dcc7f1a1dfa9b57ef18c3f4accc62cb0652.diff
+    #sed -i "s|-p1 -i|--binary -p1 -i|" cmake/scripts/common/HandleDepends.cmake
+    #sed -i 's/GIT_SHALLOW 1/GIT_SHALLOW ""/g' cmake/scripts/common/HandleDepends.cmake
+#}
 
 build() {
-        mkdir -p "pvr.iptvsimple-${pkgver}-${_koditarget}/build"
-        cd "pvr.iptvsimple-${pkgver}-${_koditarget}/build"
+    mkdir -p "${_gitname}-${pkgver}-${_koditarget}/build"
+    cd "${_gitname}-${pkgver}-${_koditarget}/build"
 
-        cmake \
-                -DCMAKE_INSTALL_PREFIX=/usr \
-                -DCMAKE_INSTALL_LIBDIR=/usr/lib/kodi \
-                -DCMAKE_BUILD_TYPE=Release \
-                -DBUILD_SHARED_LIBS=1 \
-                -DADDONS_TO_BUILD=pvr.iptvsimple \
-                -DADDONS_SRC_PREFIX=../.. \
-                ../../xbmc-${_kodiver}-${_koditarget}/cmake/addons
-        make
+    cmake \
+            -DCMAKE_INSTALL_PREFIX=/usr \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DADDONS_TO_BUILD=${_gitname} \
+            -DPACKAGE_ZIP=1 \
+            ../../xbmc-${_kodiver}-${_koditarget}/cmake/addons
+    make
 }
         
 package() {
-        cd "pvr.iptvsimple-${pkgver}-${_koditarget}/build"
-        install -d "${pkgdir}/usr"
-        mv .install/lib "${pkgdir}/usr/"
-        mv .install/share "${pkgdir}/usr/"
+    cd "${_gitname}-${pkgver}-${_koditarget}/build"
+    install -d "${pkgdir}/usr/share/kodi/addons"
+    mv .install/${_gitname} "${pkgdir}/usr/share/kodi/addons"
 }