[arch-commits] Commit in xmoto/repos/extra-i686 (ChangeLog PKGBUILD xmoto.install)

[Ronald van Haren]

    Date: Wednesday, July 30, 2008 @ 07:20:57
  Author: ronald
Revision: 7330

fix ode 0.10 incompatibility

Modified:
  xmoto/repos/extra-i686/ChangeLog
  xmoto/repos/extra-i686/PKGBUILD
  xmoto/repos/extra-i686/xmoto.install

---------------+
 ChangeLog     |    4 ++++
 PKGBUILD      |   28 +++++++++++++++++++---------
 xmoto.install |   12 ------------
 3 files changed, 23 insertions(+), 21 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2008-07-30 10:59:02 UTC (rev 7329)
+++ ChangeLog	2008-07-30 11:20:57 UTC (rev 7330)
@@ -1,3 +1,7 @@
+2008-07-29 Ronald van Haren <ronald.archlinux.org>
+	* 0.4.2-2
+	fix incompatibility with ode 0.10
+
 2008-04-13 Travis Willard <travis at archlinux.org>
 
 	* 0.4.2-1

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-07-30 10:59:02 UTC (rev 7329)
+++ PKGBUILD	2008-07-30 11:20:57 UTC (rev 7330)
@@ -1,10 +1,11 @@
 # $Id$
-# Maintainer: Travis Willard <travisw at wmpub.ca> 
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Travis Willard <travisw at wmpub.ca> 
 # Contributor: Denis (dtonator at gmail.com)
 
 pkgname=xmoto
 pkgver=0.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A challenging 2D motocross platform game, where physics play an important role."
 arch=('i686' 'x86_64')
 url="http://xmoto.tuxfamily.org"
@@ -12,18 +13,27 @@
 depends=('bzip2' 'libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode' 'curl>=7.16.2' 
 	 'mesa' 'libxdamage' 'libxfixes' 'sqlite3' 'sdl_ttf' 'desktop-file-utils')
 install=xmoto.install
-source=(http://download.tuxfamily.org/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver-src.tar.gz)
+source=(http://download.tuxfamily.org/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver-src.tar.gz \
+	ode-0.10.patch )
+md5sums=('15368b282641a225b71c279fe4dc0dc4'
+         'b495d067fa7375099c8d30ebf11ee973')
 
 build() {
-  cd $startdir/src/xmoto-$pkgver
-  ./configure --prefix=/usr
+  cd $srcdir/xmoto-$pkgver
+
+# patch to build with 0de 0.10
+  patch -Np1 < $srcdir/ode-0.10.patch || return 1
+
+  ./configure --prefix=/usr || return 1
   make || return 1
-  make DESTDIR=$startdir/pkg mangdir=/usr/share/man/man6 install
+  make DESTDIR=$startdir/pkg mangdir=/usr/share/man/man6 install || return 1
 
   #install desktop file
-  install -Dm0644 $startdir/src/xmoto-${pkgver}/extra/xmoto.desktop $startdir/pkg/usr/share/applications/xmoto.desktop
+  install -Dm0644 $srcdir/xmoto-${pkgver}/extra/xmoto.desktop \
+	$pkgdir/usr/share/applications/xmoto.desktop
+
   #install icon for desktop file
-  install -Dm0644 $startdir/src/xmoto-${pkgver}/extra/xmoto.xpm $startdir/pkg/usr/share/pixmaps/xmoto.xpm
+  install -Dm0644 $srcdir/xmoto-${pkgver}/extra/xmoto.xpm \
+	$pkgdir/usr/share/pixmaps/xmoto.xpm
 }
 
-md5sums=('15368b282641a225b71c279fe4dc0dc4')

Modified: xmoto.install
===================================================================
--- xmoto.install	2008-07-30 10:59:02 UTC (rev 7329)
+++ xmoto.install	2008-07-30 11:20:57 UTC (rev 7330)
@@ -1,23 +1,11 @@
-# This is a default template for a post-install scriptlet.  You can
-# remove any functions you don't need (and this header).
-
-# arg 1:  the new package version
-pre_install() {
-  /bin/true
-}
-
-# arg 1:  the new package version
 post_install() {
   /usr/bin/update-desktop-database 
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
   /usr/bin/update-desktop-database 
 }
 
-# arg 1:  the old package version
 post_remove() {
   /usr/bin/update-desktop-database 
 }