[arch-commits] Commit in pyqt/repos (3 files)

[Giovanni Scafora]

    Date: Sunday, April 12, 2009 @ 02:16:04
  Author: giovanni
Revision: 35309

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

........
  r35286 | douglas | 2009-04-11 14:28:24 -0700 (sab, 11 apr 2009) | 2 lines
  
  upgpkg: pyqt 4.4.4-3
      Fixes the rpath issue, thanks a lot Gerardo
........

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

-----------+
 ChangeLog |    4 ++++
 PKGBUILD  |    7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)


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

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2009-04-12 03:29:25 UTC (rev 35308)
+++ extra-x86_64/ChangeLog	2009-04-12 06:16:04 UTC (rev 35309)
@@ -1,4 +1,8 @@
 
+2009-04-11  Douglas Soares de Andrade  <douglas at archlinux.org>
+
+	* Fixing the rpath issue, thanks Gerardo
+
 2008-11-22  Douglas Soares de Andrade  <douglas at archlinux.org>
 
 	* Updated for i686: 4.4.4

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-04-12 03:29:25 UTC (rev 35308)
+++ extra-x86_64/PKGBUILD	2009-04-12 06:16:04 UTC (rev 35309)
@@ -4,7 +4,7 @@
 
 pkgname=pyqt
 pkgver=4.4.4
-pkgrel=2
+pkgrel=3
 pkgdesc="PyQt is a set of Python bindings for the Qt toolkit."
 arch=(i686 x86_64)
 url="http://riverbankcomputing.co.uk/pyqt/"
@@ -13,7 +13,7 @@
 provides=('pyqt4')
 replaces=('pyqt4')
 conflicts=('pyqt4')
-pkgurl="http://www.riverbankcomputing.com/Downloads/PyQt4/GPL/"
+pkgurl="http://riverbankcomputing.com/software/pyqt/download"
 source=(http://riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-$pkgver.tar.gz)
 
 build() {
@@ -23,6 +23,9 @@
   -d /usr/lib/python2.6/site-packages \
   -v /usr/share/sip
 
+  # Thanks Gerardo for the rpath fix
+  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
   make || return 1
   make DESTDIR=${startdir}/pkg install
 }