[arch-commits] Commit in frozen-bubble/repos (extra-i686 extra-i686/PKGBUILD)

[Allan McRae]

    Date: Wednesday, December 10, 2008 @ 02:30:16
  Author: allan
Revision: 21136

fix conflict

Modified:
  frozen-bubble/repos/extra-i686/	(properties)
  frozen-bubble/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)


Property changes on: frozen-bubble/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /frozen-bubble/trunk:1
   + /frozen-bubble/trunk:1-21135

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-12-10 07:24:04 UTC (rev 21135)
+++ extra-i686/PKGBUILD	2008-12-10 07:30:16 UTC (rev 21136)
@@ -1,31 +1,26 @@
 # $Id$
-# Maintainer: Thomas Baechler <thomas at archlinux.org>
-# Contributer: Brandon Niemczyk <maccorin at cfl.rr.com>
+# Maintainer: Allan McRae <allan at archlinux.org>
+# Contributor: Brandon Niemczyk <maccorin at cfl.rr.com>
 
 pkgname=frozen-bubble
-pkgver=2.1.0
-pkgrel=2
+pkgver=2.2.0
+pkgrel=1
 pkgdesc="A game in which you throw colorful bubbles and build groups to destroy the bubbles"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://www.frozen-bubble.org"
+license=('GPL2')
 depends=('sdl_perl' 'sdl_mixer' 'perl-locale-gettext' 'sdl_pango')
-makedepends=('imagemagick')
 source=(http://www.frozen-bubble.org/data/${pkgname}-${pkgver}.tar.bz2 \
         frozen-bubble.desktop)
-md5sums=('f5eb984897e1ccd52a0d8820d8359861' '3e0755836580e374e0911653f8cd33e2')
+md5sums=('f7987201470d6755ed309762d348e0dd' '3e0755836580e374e0911653f8cd33e2')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}/gfx/balls
-  # Fix missing files for colourblind
-  for g in bubble-colourblind-?.gif; do
-    convert -depth 8 -scale 16x16 ${g} ${g/%.gif/-mini.png}
-  done
-  cd ../..
+  cd ${srcdir}/${pkgname}-${pkgver}
   make OPTIMIZE="${CFLAGS}" \
        CFLAGS="$(pkg-config glib-2.0 --cflags)" INSTALLDIRS=vendor \
        PREFIX=/usr || return 1
  
-  make DESTDIR=${startdir}/pkg PREFIX=/usr install || return 1
-  install -D -m644 icons/frozen-bubble-icon-64x64.png ${startdir}/pkg/usr/share/pixmaps/frozen-bubble.png || return 1
-  install -D -m644 ${startdir}/src/frozen-bubble.desktop ${startdir}/pkg/usr/share/applications/frozen-bubble.desktop || return 1
+  make DESTDIR=${pkgdir} PREFIX=/usr install || return 1
+  install -D -m644 icons/frozen-bubble-icon-64x64.png ${pkgdir}/usr/share/pixmaps/frozen-bubble.png || return 1
+  install -D -m644 ${srcdir}/frozen-bubble.desktop ${pkgdir}/usr/share/applications/frozen-bubble.desktop || return 1
 }