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

[Ionut Biru]

    Date: Tuesday, April 26, 2011 @ 10:25:06
  Author: ibiru
Revision: 120762

fix conflicts with pyatspi. FS#23707

Modified:
  at-spi/trunk/PKGBUILD

----------+
 PKGBUILD |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-04-26 11:04:35 UTC (rev 120761)
+++ PKGBUILD	2011-04-26 14:25:06 UTC (rev 120762)
@@ -3,7 +3,7 @@
 
 pkgname=at-spi
 pkgver=1.32.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Assistive Technology Service Provider Interface"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -19,14 +19,17 @@
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/at-spi
+      --libexecdir=/usr/lib/at-spi \
+      --enable-relocate
   make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
   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
-
-  #remove conflicting file
-  rm -f "${pkgdir}/usr/lib/gtk-2.0/modules/libatk-bridge.so"
 }