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

[Eric Bélanger]

    Date: Tuesday, April 24, 2012 @ 22:04:27
  Author: eric
Revision: 157145

upgpkg: zeitgeist 0.9.0-1

Upstream update, Add arch dependency, Add xapian-core depends, Remove unnecessary patch

Modified:
  zeitgeist/trunk/PKGBUILD
Deleted:
  zeitgeist/trunk/python2.patch

---------------+
 PKGBUILD      |   29 ++++++++++++-----------------
 python2.patch |   22 ----------------------
 2 files changed, 12 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-24 23:57:43 UTC (rev 157144)
+++ PKGBUILD	2012-04-25 02:04:27 UTC (rev 157145)
@@ -4,33 +4,28 @@
 # Contributor: György Balló <ballogy at freestart.hu>
 
 pkgname=zeitgeist
-pkgver=0.8.2
-pkgrel=2
+pkgver=0.9.0
+pkgrel=1
 pkgdesc="A service which logs the users's activities and events and makes relevant information available to other applications"
-arch=('any')
+arch=('i686' 'x86_64')
 url="http://zeitgeist-project.com/"
 license=('GPL')
-depends=('dbus-python' 'python2-gobject2' 'pyxdg')
+depends=('dbus-python' 'python2-gobject2' 'pyxdg' 'xapian-core')
 makedepends=('intltool' 'raptor' 'python2-rdflib')
-source=("http://launchpad.net/$pkgname/0.8/$pkgver/+download/$pkgname-$pkgver.tar.gz"
-        'python2.patch')
-md5sums=('589e7de784d21177491780bffd11097d'
-         '2c8b0fa6a228088a556601128dfbbb3b')
+source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.bz2{,.asc})
+md5sums=('fc2706611f435a027cd520f0da0982d7'
+         '96e74a5050bf0daa961dd56b0f73fd5d')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-
-  # Fix python2 path
-  sed -i 's|/usr/bin/python|/usr/bin/python2|' extra/rdfxml2py
-  patch -Np1 -i "${srcdir}/python2.patch"
-
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var
+  sed -i 's/python -/$PYTHON -/' configure
+  PYTHON=/usr/bin/python2 LIBS+="-lgmodule-2.0" ./configure --prefix=/usr \
+    --sysconfdir=/etc --libexecdir=/usr/lib/zeitgeist --localstatedir=/var
   make
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" zeitgeistdocdir=/usr/share/doc/zeitgeist install
+  install -D -m644 data/zeitgeist-daemon.bash_completion "$pkgdir/usr/share/bash-completion/completions/zeitgeist-daemon"
 }

Deleted: python2.patch
===================================================================
--- python2.patch	2012-04-24 23:57:43 UTC (rev 157144)
+++ python2.patch	2012-04-25 02:04:27 UTC (rev 157145)
@@ -1,22 +0,0 @@
---- zeitgeist-0.8.2/configure~	2011-10-29 10:11:50.009654352 +0000
-+++ zeitgeist-0.8.2/configure	2011-10-29 10:08:55.204860261 +0000
-@@ -5612,7 +5612,7 @@
- # check for python-rdflib
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for python-rdflib" >&5
- $as_echo_n "checking for python-rdflib... " >&6; }
--echo "import rdflib" | python - 2>/dev/null
-+echo "import rdflib" | $PYTHON - 2>/dev/null
- if test $? -ne 0 ; then
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
---- zeitgeist-0.8.2/configure.ac~	2011-10-29 10:09:01.078242642 +0000
-+++ zeitgeist-0.8.2/configure.ac	2011-10-29 10:09:20.901741533 +0000
-@@ -39,7 +39,7 @@
- 
- # check for python-rdflib
- AC_MSG_CHECKING([for python-rdflib])
--echo "import rdflib" | python - 2>/dev/null
-+echo "import rdflib" | $PYTHON - 2>/dev/null
- if test $? -ne 0 ; then
-   AC_MSG_FAILURE([failed.  Please install the python-rdflib package.])
- else