Date: Sunday, November 28, 2010 @ 08:08:43 Author: jgc Revision: 101145
Fix build with python 3.x installed, remove LD_PRELOAD hack and use package() instead Modified: deskbar-applet/trunk/PKGBUILD ----------+ PKGBUILD | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-11-28 13:08:42 UTC (rev 101144) +++ PKGBUILD 2010-11-28 13:08:43 UTC (rev 101145) @@ -19,16 +19,19 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" sed '/^modulesdir=/ s/@libdir@/@libexecdir@/' -i data/deskbar-applet.pc.in - LD_PRELOAD="" PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc \ + PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --libexecdir=/usr/lib \ --disable-scrollkeeper --enable-evolution \ --disable-schemas-install + make +} - make +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" \ - $pkgdir/usr/lib/deskbar-applet/deskbar-applet + "$pkgdir/usr/lib/deskbar-applet/deskbar-applet" install -m755 -d "${pkgdir}/usr/share/gconf/schemas" gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain deskbar-applet ${pkgdir}/etc/gconf/schemas/*.schemas