Date: Wednesday, March 16, 2011 @ 06:52:19 Author: ibiru Revision: 114880
upgpkg: at-spi 1.32.0-3 fix conflict with at-spi2 Modified: at-spi/trunk/PKGBUILD ----------+ PKGBUILD | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-03-16 08:27:35 UTC (rev 114879) +++ PKGBUILD 2011-03-16 10:52:19 UTC (rev 114880) @@ -3,11 +3,11 @@ pkgname=at-spi pkgver=1.32.0 -pkgrel=2 +pkgrel=3 pkgdesc="Assistive Technology Service Provider Interface" arch=('i686' 'x86_64') license=('GPL') -depends=('libbonobo>=2.32.0' 'libxtst' 'gtk2>=2.22.0' 'gconf>=2.31.91') +depends=('libbonobo' 'libxtst' 'gtk2' 'gconf') makedepends=('pkgconfig' 'python2' 'intltool' 'libice' 'libsm') options=('!libtool' '!emptydirs') url="http://www.gnome.org" @@ -24,6 +24,9 @@ make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain at-spi ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain at-spi "${pkgdir}"/etc/gconf/schemas/*.schemas + rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas + + #remove conflicting file + rm -f "${pkgdir}/usr/lib/gtk-2.0/modules/libatk-bridge.so" }