release 0.16.3.r26.gb6753bd

2 files changed, 22 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index efe400950188..52e4821c1e23 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
 pkgbase = realmd
 	pkgdesc = DBus service for joining hosts to Active Directory and FreeIPA realms
-	pkgver = 0.16.3
-	pkgrel = 2
+	pkgver = 0.16.3.r26.gb6753bd
+	pkgrel = 1
 	url = https://freedesktop.org/software/realmd/
 	arch = i686
 	arch = x86_64
 	license = GPL3
-	checkdepends = python2
 	makedepends = docbook-xsl
+	makedepends = git
 	makedepends = intltool
 	makedepends = python
 	makedepends = xmlto
@@ -19,10 +19,8 @@ pkgbase = realmd
 	depends = polkit
 	optdepends = sssd: Active Directory, FreeIPA, LDAP client
 	optdepends = samba: traditional Active Directory client
-	source = https://www.freedesktop.org/software/realmd/releases/realmd-0.16.3.tar.gz
-	source = https://www.freedesktop.org/software/realmd/releases/realmd-0.16.3.tar.gz.sig
+	source = git+https://gitlab.freedesktop.org/realmd/realmd.git#commit=b6753bd048b4012b11d60c094d1ab6ca181ee50d
 	validpgpkeys = C0F67099B808FB063E2C81117BFB1108D92765AF
-	sha256sums = d8943f66a2a666fee8be026d82a66904c0a5125aab7ef74504456ce269687dda
 	sha256sums = SKIP
 
 pkgname = realmd
diff --git a/PKGBUILD b/PKGBUILD
index 4de6335348fb..454ab2ebcda8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Mantas Mikulėnas <grawity@gmail.com>
 pkgname=realmd
-pkgver=0.16.3
-pkgrel=2
+pkgver=0.16.3.r26.gb6753bd
+pkgrel=1
 pkgdesc="DBus service for joining hosts to Active Directory and FreeIPA realms"
 arch=(i686 x86_64)
 url="https://freedesktop.org/software/realmd/"
@@ -9,21 +9,26 @@ license=(GPL3)
 depends=(adcli dbus krb5 openldap packagekit polkit)
 optdepends=('sssd: Active Directory, FreeIPA, LDAP client'
             'samba: traditional Active Directory client')
-makedepends=(docbook-xsl intltool python xmlto)
-checkdepends=(python2)
-source=("https://www.freedesktop.org/software/realmd/releases/$pkgname-$pkgver.tar.gz"
-        "https://www.freedesktop.org/software/realmd/releases/$pkgname-$pkgver.tar.gz.sig")
-sha256sums=('d8943f66a2a666fee8be026d82a66904c0a5125aab7ef74504456ce269687dda'
-            'SKIP')
+makedepends=(docbook-xsl git intltool python xmlto)
+#source=("https://www.freedesktop.org/software/realmd/releases/$pkgname-$pkgver.tar.gz"
+#        "https://www.freedesktop.org/software/realmd/releases/$pkgname-$pkgver.tar.gz.sig")
+_commit=b6753bd048b4012b11d60c094d1ab6ca181ee50d
+source=("git+https://gitlab.freedesktop.org/realmd/realmd.git#commit=$_commit")
+sha256sums=('SKIP')
 validpgpkeys=('C0F67099B808FB063E2C81117BFB1108D92765AF')
 
+pkgver() {
+  cd "$pkgname"
+  git describe | sed 's/-/.r/; s/-/./g'
+}
+
 prepare() {
-  cd "$pkgname-$pkgver"
-  sed -i '1s/\<python\>/&2/' build/tap-*
+  cd "$pkgname"
+  AUTOMAKE=automake ACLOCAL=aclocal NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd "$pkgname"
   ./configure \
     --prefix=/usr           \
     --sbindir=/usr/bin      \
@@ -34,12 +39,12 @@ build() {
 }
 
 check() {
-  cd "$pkgname-$pkgver"
+  cd "$pkgname"
   make check
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd "$pkgname"
   make DESTDIR="$pkgdir" DBUS_POLICY_DIR="/usr/share/dbus-1/system.d" install
 }