[arch-commits] Commit in zeitgeist/trunk (PKGBUILD)

[Jan de Groot]

    Date: Thursday, March 2, 2017 @ 12:21:38
  Author: jgc
Revision: 289885

upgpkg: zeitgeist 1.0+1+g1bcc8585-1

Update to git snapshot to fix FS#53053

Modified:
  zeitgeist/trunk/PKGBUILD

----------+
 PKGBUILD |   28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-02 10:56:03 UTC (rev 289884)
+++ PKGBUILD	2017-03-02 12:21:38 UTC (rev 289885)
@@ -4,7 +4,7 @@
 # Contributor: György Balló <ballogy at freestart.hu>
 
 pkgname=zeitgeist
-pkgver=1.0
+pkgver=1.0+1+g1bcc8585
 pkgrel=1
 pkgdesc="Service logging user activities and events"
 arch=(i686 x86_64)
@@ -11,18 +11,28 @@
 url="https://launchpad.net/zeitgeist/"
 license=(GPL2 LGPL2.1)
 depends=(json-glib telepathy-glib gtk3 xapian-core sqlite)
-makedepends=(gobject-introspection vala raptor python2-rdflib)
+makedepends=(gobject-introspection vala raptor python2-rdflib git)
 provides=(zeitgeist-datahub)
 conflicts=(zeitgeist-datahub)
 replaces=(zeitgeist-datahub)
-source=(https://launchpad.net/zeitgeist/${pkgver:0:3}/${pkgver}/+download/zeitgeist-${pkgver}.tar.xz{,.asc})
-sha256sums=('5ff508508f7a7b46acc9fbf1cf73fecb1aec214e18d9d22325aae8c2c2e8ddc8'
-            'SKIP')
+_commit=1bcc8585275b4a8a9d47652cfe2ee4d64d155c1f  # master
+source=("git+https://anongit.freedesktop.org/git/zeitgeist/zeitgeist#commit=$_commit")
+sha256sums=('SKIP')
 validpgpkeys=('E4884AEEDE4CC02043C3D8045DECDBA89270E723') #Rico Tzschichholz <ricotz at ubuntu.com>
 
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed 's/^v//;s/-/+/g'
+}
+
 prepare() {
-  cd $pkgname-$pkgver
+  cd $pkgname
+  NOCONFIGURE=1 ./autogen.sh
+}
 
+prepare() {
+  cd $pkgname
+
   sed -i 's/python -/$PYTHON -/' configure.ac
   sed -i '1s/python$/python2/' data/ontology2code
 
@@ -30,7 +40,7 @@
 }
 
 build() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   export PYTHON=/usr/bin/python2
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --libexecdir=/usr/lib --enable-fts
@@ -39,12 +49,12 @@
 }
 
 check() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   # Log test fails in chroot, as we have no X and no proper dbus
   make -k check || :
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname
   make DESTDIR="$pkgdir" install
 }