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

[Eric Bélanger]

    Date: Saturday, August 21, 2010 @ 01:14:19
  Author: eric
Revision: 88207

upgpkg: wxpython 2.8.11.0-2
Rebuilt for python2

Modified:
  wxpython/trunk/ChangeLog
  wxpython/trunk/PKGBUILD

-----------+
 ChangeLog |    5 +++++
 PKGBUILD  |   15 ++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2010-08-21 04:00:06 UTC (rev 88206)
+++ ChangeLog	2010-08-21 05:14:19 UTC (rev 88207)
@@ -1,3 +1,8 @@
+2010-08-21  Eric Belanger  <eric at archlinux.org>
+
+	* wxpython 2.8.11.0-2
+	* Rebuilt for python2
+
 2010-06-03  Eric Belanger  <eric at archlinux.org>
 
 	* wxpython 2.8.11.0-1

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-21 04:00:06 UTC (rev 88206)
+++ PKGBUILD	2010-08-21 05:14:19 UTC (rev 88207)
@@ -4,29 +4,30 @@
 
 pkgname=wxpython
 pkgver=2.8.11.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A wxWidgets GUI toolkit for Python"
 arch=('i686' 'x86_64')
 license=('custom:wxWindows')
 url="http://www.wxpython.org"
-depends=('wxgtk' 'python')
+depends=('wxgtk' 'python2')
 makedepends=('mesa')
+changelog=ChangeLog
 source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 editra-aui.diff)
 md5sums=('63f73aae49e530852db56a31b57529fa' '06c637c34c1570d8c82b870ce19c0622')
 sha1sums=('18982edc236a1d87e4eef018928358c925aa5b17' '077fe341bf8822647934d6b1ea82ce9b0adbf93a')
 
 build() {
   cd "${srcdir}/wxPython-src-${pkgver}"
-  patch -p1 < ../editra-aui.diff || return 1
+  patch -p1 < ../editra-aui.diff
   ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
     --enable-graphics_ctx --with-gnomeprint --disable-optimize --enable-mediactrl \
-    --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys || return 1
+    --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys
   cd "${srcdir}/wxPython-src-${pkgver}/wxPython"
-  python setup.py WXPORT=gtk2 UNICODE=1 build || return 1
+  python2 setup.py WXPORT=gtk2 UNICODE=1 build
 }
 
 package() {
   cd "${srcdir}/wxPython-src-${pkgver}/wxPython"
-  python setup.py WXPORT=gtk2 UNICODE=1 install --root="${pkgdir}" || return 1
-  install -D -m644 ../docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
+  python2 setup.py WXPORT=gtk2 UNICODE=1 install --root="${pkgdir}"
+  install -D -m644 ../docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }