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

[Giovanni Scafora]

    Date: Monday, October 12, 2009 @ 22:02:12
  Author: giovanni
Revision: 55472

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

........
  r55459 | andrea | 2009-10-12 16:00:25 -0700 (lun, 12 ott 2009) | 2 lines
  
  upgpkg: pyqt 4.6.0-2
      FS#16599
........
  r55471 | giovanni | 2009-10-12 19:01:31 -0700 (lun, 12 ott 2009) | 1 line
........

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

----------+
 PKGBUILD |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)


Property changes on: pyqt/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /pyqt/trunk:1-54164
   + /pyqt/trunk:1-55471

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-10-13 02:01:31 UTC (rev 55471)
+++ extra-x86_64/PKGBUILD	2009-10-13 02:02:12 UTC (rev 55472)
@@ -6,9 +6,9 @@
 pkgname=pyqt
 pkgver=4.6.0
 _pkgver=4.6
-pkgrel=1
+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,5 +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
-} 
+
+  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
+  make DESTDIR=${pkgdir} INSTALL_ROOT=${pkgdir} install
+}