[arch-commits] Commit in pyqt/repos (extra-i686 extra-i686/PKGBUILD)

[Giovanni Scafora]

    Date: Monday, October 12, 2009 @ 22:25:09
  Author: giovanni
Revision: 55473

Merged revisions 55471 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/pyqt/trunk

........
  r55471 | giovanni | 2009-10-12 19:01:31 -0700 (lun, 12 ott 2009) | 1 line
........

Modified:
  pyqt/repos/extra-i686/	(properties)
  pyqt/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)


Property changes on: pyqt/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /pyqt/trunk:1-55459
   + /pyqt/trunk:1-55472

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-10-13 02:02:12 UTC (rev 55472)
+++ extra-i686/PKGBUILD	2009-10-13 02:25:09 UTC (rev 55473)
@@ -6,9 +6,9 @@
 pkgname=pyqt
 pkgver=4.6.0
 _pkgver=4.6
-pkgrel=2
+pkgrel=3
 pkgdesc="A set of Python bindings for the Qt toolkit."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 depends=('sip>=4.9.0' 'qscintilla>=2.4.0' 'qt>=4.5.3' 'dbus-python' 'openssl')
 license=('GPL')
@@ -20,7 +20,7 @@
 
 build() {
   cd ${srcdir}/PyQt-x11-gpl-${_pkgver}
-
+  
   python configure.py --confirm-license -b /usr/bin \
   -d /usr/lib/python2.6/site-packages \
   -v /usr/share/sip
@@ -29,9 +29,7 @@
   find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
 
   make || return 1
-  make DESTDIR=${pkgdir} install
 
-  # FS#16599
-  install -d ${pkgdir}/usr/lib/qt/plugins/designer/
-  install -m755 libpythonplugin.so ${pkgdir}/usr/lib/qt/plugins/designer/
-} 
+  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
+  make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install
+}