git » qscintilla.git » commit 96c5ef3

fix conlicts (FS#22514)

author Andrea Scarpino
2011-01-19 21:48:43 UTC
committer Andrea Scarpino
2011-01-19 21:48:43 UTC
parent 407d294101665122f03a34649df58487c88b6d37

fix conlicts (FS#22514)

PKGBUILD +4 -1

diff --git a/PKGBUILD b/PKGBUILD
index 3028909..e34a4f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,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"
@@ -44,6 +44,9 @@ package_qscintilla() {
     
     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() {