Version bump 1.0-beta2

2 files changed, 15 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c67acc127d36..128e23c86093 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 pkgbase = dockbarx
 	pkgdesc = TaskBar with groupping and group manipulation
-	pkgver = 1.0beta+r858+d98020e
+	pkgver = 1.0beta2
 	pkgrel = 1
 	epoch = 1
-	url = https://github.com/M7S/dockbarx
+	url = https://github.com/xuzhen/dockbarx
 	install = dockbarx.install
 	arch = i688
 	arch = x86_64
@@ -12,10 +12,9 @@ pkgbase = dockbarx
 	license = GPL3
 	makedepends = python-setuptools
 	makedepends = python-polib
-	makedepends = git
 	depends = libkeybinder3
 	depends = python-cairo
-	depends = python-dbus
+	depends = dbus-python
 	depends = python-gobject
 	depends = python-pillow
 	depends = python-xlib
@@ -26,8 +25,7 @@ pkgbase = dockbarx
 	optdepends = python-pyudev: dockx battery applet
 	optdepends = gconf: export settings from older versions of dockbarx
 	optdepends = python-lxml: import settings script
-	source = dockbarx::git+https://github.com/xuzhen/dockbarx.git#commit=d98020ec49f3e3a5692ab2adbb145bbe5a1e80fe
-	sha256sums = SKIP
+	source = https://github.com/xuzhen/dockbarx/archive/refs/tags/1.0-beta2.tar.gz
+	sha256sums = 418101acb09a4fd4fd94280fa5a313a4fab103fd105ca267ea72fc609f5bb865
 
 pkgname = dockbarx
-
diff --git a/PKGBUILD b/PKGBUILD
index d0dfeb7cc96b..7d75a5437a99 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,35 +2,30 @@
 
 pkgname=dockbarx
 epoch=1
-_pkgver=1.0beta
-pkgver=1.0beta+r858+d98020e
+_pkgver=1.0-beta2
+pkgver=1.0beta2
 pkgrel=1
 pkgdesc="TaskBar with groupping and group manipulation"
 arch=('i688' 'x86_64' 'armv7h' 'aarch64')
-url="https://github.com/M7S/dockbarx"
+#url="https://github.com/M7S/dockbarx"
+url="https://github.com/xuzhen/dockbarx"
 license=('GPL3')
-depends=('libkeybinder3' 'python-cairo' 'python-dbus' 'python-gobject' 'python-pillow'
+depends=('libkeybinder3' 'python-cairo' 'dbus-python' 'python-gobject' 'python-pillow'
          'python-xlib' 'python-xdg')
-makedepends=('python-setuptools' 'python-polib' 'git')
+makedepends=('python-setuptools' 'python-polib')
 optdepends=('mate-panel: mate applet'
             'zeitgeist: recently used file list'
             'xfce4-dockbarx-plugin>=0.6: xfce4-panel plugin'
             'python-pyudev: dockx battery applet'
             'gconf: export settings from older versions of dockbarx'
             'python-lxml: import settings script')
-_commit='d98020ec49f3e3a5692ab2adbb145bbe5a1e80fe'
-source=("${pkgname}::git+https://github.com/xuzhen/dockbarx.git#commit=${_commit}")
-sha256sums=('SKIP')
+source=(${url}/archive/refs/tags/${_pkgver}.tar.gz)
+sha256sums=('418101acb09a4fd4fd94280fa5a313a4fab103fd105ca267ea72fc609f5bb865')
 install="${pkgname}.install"
 
-pkgver() {
-  cd "${srcdir}/${pkgname}"
-  printf "%s+r%s+%s" "${_pkgver}" "$( git rev-list --count HEAD )" "$( git rev-parse --short HEAD )"
-}
-
 package() {
-  cd "${srcdir}/${pkgname}"
+  cd "${srcdir}/${pkgname}-${_pkgver}"
   python setup.py install --root "${pkgdir}" --optimize=1
 
-  install -Dm644 "${srcdir}/${pkgname}"/icons/hicolor/128x128/apps/dockbarx.png "${pkgdir}"/usr/share/pixmaps/dockbarx.png
+  install -Dm644 "${srcdir}/${pkgname}-${_pkgver}"/icons/hicolor/128x128/apps/dockbarx.png "${pkgdir}"/usr/share/pixmaps/dockbarx.png
 }