[arch-commits] Commit in wesnoth/trunk (PKGBUILD wesnoth.install)

[Jan de Groot]

    Date: Sunday, August 22, 2010 @ 11:39:54
  Author: jgc
Revision: 88338

upgpkg: wesnoth 1.8.4-1
Update to 1.8.4, move data to wesnoth-data

Modified:
  wesnoth/trunk/PKGBUILD
  wesnoth/trunk/wesnoth.install

-----------------+
 PKGBUILD        |   24 ++++++++++--------------
 wesnoth.install |    6 ------
 2 files changed, 10 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-22 14:43:53 UTC (rev 88337)
+++ PKGBUILD	2010-08-22 15:39:54 UTC (rev 88338)
@@ -1,32 +1,28 @@
 # $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Tobias Powalowski <tpowa at archlinux.org>
 # Contributor: Jacobo Arvelo <unix4all at ya.com>
 # Contributor: Douglas Soares de Andrade <douglas at archlinux.org>
 
 pkgname=wesnoth
-pkgver=1.8.2
-pkgrel=2
+pkgver=1.8.4
+pkgrel=1
 pkgdesc="A turn-based strategy game on a fantasy world"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.wesnoth.org/"
-depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'libvorbis' 'fribidi' 'freetype2' 'gcc-libs' 'boost-libs' 'pango' 'lua')
+depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pango' 'lua' "wesnoth-data=${pkgver}" 'dbus-core')
 makedepends=('boost')
 install=wesnoth.install
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         wesnoth-libpng-1.4.0.patch)
-md5sums=('5dd150057da9f5048826f16452ab0346'
+md5sums=('2dce83f835ecce1d505ea60e46b7356f'
          'ca7412ffc4682ef55ddf82d56b0e2f08')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i ../wesnoth-libpng-1.4.0.patch || return 1
-  ./autogen.sh || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ../wesnoth-libpng-1.4.0.patch
+  ./autogen.sh
   ./configure --prefix=/usr --localstatedir=/var --enable-tools --enable-editor --enable-server
-  make || return 1
+  make DESTDIR="${pkgdir}" install-exec
 }
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}

Modified: wesnoth.install
===================================================================
--- wesnoth.install	2010-08-22 14:43:53 UTC (rev 88337)
+++ wesnoth.install	2010-08-22 15:39:54 UTC (rev 88338)
@@ -7,9 +7,3 @@
 ==> If "dma" doesn't work,other options are: dsp,alsa,artsc,esd,nas try to find the right output.
 EOF
 }
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}