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

[Andrea Scarpino]

    Date: Wednesday, January 19, 2011 @ 16:48:43
  Author: andrea
Revision: 106969

upgpkg: qscintilla 2.4.6-4
fix conlicts (FS#22514)

Modified:
  qscintilla/trunk/PKGBUILD

----------+
 PKGBUILD |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-19 21:37:10 UTC (rev 106968)
+++ PKGBUILD	2011-01-19 21:48:43 UTC (rev 106969)
@@ -5,7 +5,7 @@
 pkgbase=qscintilla
 pkgname=('qscintilla' 'python-qscintilla')
 pkgver=2.4.6
-pkgrel=3
+pkgrel=4
 license=('GPL')
 arch=('i686' 'x86_64')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
@@ -45,6 +45,9 @@
     
     cd ${srcdir}/QScintilla-gpl-${pkgver}/Python
     make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+    # Provided by python-qscintilla
+    rm ${pkgdir}/usr/lib/python3.1/site-packages/PyQt4/Qsci.so
 }
 
 package_python-qscintilla() {