Bump package + fixes.

Signed-off-by: Edu4rdSHL <edu4rdshl@protonmail.com>

2 files changed, 10 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a358294a8159..cb184a06566e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = gajim-plugin-omemo-git
 	pkgdesc = Gajim plugin for OMEMO Multi-End Message and Object Encryption.
-	pkgver = omemo_2.5.8.r498.ge3d75d8
+	pkgver = 2.5.10.r769.g0bc3091
 	pkgrel = 1
 	url = https://dev.gajim.org/gajim/gajim-plugins/wikis/OmemoGajimPlugin
 	arch = any
 	license = GPL
 	makedepends = git
 	depends = gajim
+	depends = python
 	depends = python-qrcode
 	depends = python-setuptools
 	depends = python-cryptography
diff --git a/PKGBUILD b/PKGBUILD
index d7db401e6f3a..e35e00c3db5b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Tommaso Sardelli <lacapannadelloziotom AT gmail DOT com>
 
 pkgname=gajim-plugin-omemo-git
-pkgver=omemo_2.5.8.r498.ge3d75d8
+pkgver=2.5.10.r769.g0bc3091
 pkgrel=1
 pkgdesc='Gajim plugin for OMEMO Multi-End Message and Object Encryption.'
 arch=(any)
 url='https://dev.gajim.org/gajim/gajim-plugins/wikis/OmemoGajimPlugin'
 license=('GPL')
-depends=('gajim' 'python-qrcode' 'python-setuptools' 'python-cryptography' 'python-axolotl')
+depends=('gajim' 'python' 'python-qrcode' 'python-setuptools' 'python-cryptography' 'python-axolotl')
 makedepends=('git')
 provides=('gajim-plugin-omemo')
 conflicts=('gajim-plugin-omemo')
@@ -15,22 +15,18 @@ source=('git+https://dev.gajim.org/gajim/gajim-plugins.git')
 sha512sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/gajim-plugins/omemo"
-  ( set -o pipefail
-    git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
-    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-  )
+  cd "$srcdir/gajim-plugins/omemo"
+
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/omemo_//;s/-/./g'
 }
 
 package() {
-  cd "${srcdir}/gajim-plugins/omemo"
+  cd "$srcdir/gajim-plugins/omemo"
+
   _site="$(python -c 'import site; print(site.getsitepackages()[0])')"
+  install -dm 755 "${pkgdir}${_site}/gajim/data/plugins/omemo"
 
-  # Remove unnecessary files
   rm -r CHANGELOG COPYING
-
-  # Install the plugin
-  install -d "${pkgdir}${_site}/gajim/data/plugins/omemo"
   cp -r * "${pkgdir}${_site}/gajim/data/plugins/omemo/"
 }