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

[Eric Bélanger]

    Date: Friday, April 17, 2009 @ 20:10:40
  Author: eric
Revision: 35877

Fixed svn conflict

Added:
  rockdodger/repos/extra-i686/rockdodger.install
    (from rev 35876, rockdodger/trunk/rockdodger.install)
Modified:
  rockdodger/repos/extra-i686/	(properties)
  rockdodger/repos/extra-i686/PKGBUILD

--------------------+
 PKGBUILD           |   33 ++++++++++++++++++++-------------
 rockdodger.install |   15 +++++++++++++++
 2 files changed, 35 insertions(+), 13 deletions(-)


Property changes on: rockdodger/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /rockdodger/trunk:1
   + /rockdodger/trunk:1-35876

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-18 00:08:29 UTC (rev 35876)
+++ extra-i686/PKGBUILD	2009-04-18 00:10:40 UTC (rev 35877)
@@ -4,24 +4,31 @@
 
 pkgname=rockdodger
 pkgver=0.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Space Rocks is a game - Dodge the space rocks, use your shields, fire your thrusters, cross your fingers, and kiss your ship goodbye"
+arch=('i686' 'x86_64')
+url="http://spacerocks.sourceforge.net/"
+license=('GPL')
 depends=('sdl' 'sdl_mixer' 'sdl_image')
+install=rockdodger.install
 source=(http://downloads.sourceforge.net/spacerocks/$pkgname-$pkgver.tar.gz rockdodger-0.6.0a-gcc41.patch)
 md5sums=('a82a564a6530e60e7f041f7d95c4cae8' 'c8b17a6ffaa12f1a116170437b4629c0')
-arch=('i686' 'x86_64')
-url="http://spacerocks.sourceforge.net/"
 
 build() {
- cd $startdir/src/$pkgname-$pkgver
- ./configure --prefix=/usr
+ cd $srcdir/$pkgname-$pkgver
+ patch -Np0 -i ../rockdodger-0.6.0a-gcc41.patch || return 1
+ sed -i 's|/usr/share/rockdodger/.highscore|/var/games/rockdodger.highscore|' main.c || return 1
+ sed -i "s|\./data|/usr/share/rockdodger/data|" main.c || return 1
+ sed -i -e "s:-g:${CFLAGS}:" Makefile || return 1
  make || return 1
- mkdir -p $startdir/pkg/usr/bin
- cp rockdodger $startdir/pkg/usr/bin
- mkdir -p $startdir/pkg/usr/share/rockdodger/data
- cp data/*.{bmp,png,wav,mod} $startdir/pkg/usr/share/rockdodger/data
- chmod a+r $startdir/pkg/usr/share/rockdodger/data/*
- chmod a+r $startdir/pkg/usr/share/rockdodger/data
- touch $startdir/pkg/usr/share/rockdodger/.highscore
- chmod a+rw $startdir/pkg/usr/share/rockdodger/.highscore
+
+ install -D -m755 rockdodger $pkgdir/usr/bin/rockdodger
+ install -d $pkgdir/usr/share/rockdodger/data
+ install -m644 data/*.{bmp,png,wav,mod} $pkgdir/usr/share/rockdodger/data
+
+ chown root:games $pkgdir/usr/bin/rockdodger
+ chmod 2755 $pkgdir/usr/bin/rockdodger
+ install -d $pkgdir/var/games
+ chown root:games $pkgdir/var/games
+ chmod 775 $pkgdir/var/games
 }

Copied: rockdodger/repos/extra-i686/rockdodger.install (from rev 35876, rockdodger/trunk/rockdodger.install)
===================================================================
--- extra-i686/rockdodger.install	                        (rev 0)
+++ extra-i686/rockdodger.install	2009-04-18 00:10:40 UTC (rev 35877)
@@ -0,0 +1,15 @@
+post_install() {
+  touch var/games/rockdodger.highscore
+  chown root:games var/games/rockdodger.highscore
+  chmod 664 var/games/rockdodger.highscore
+}
+
+pre_upgrade() {
+  if [ -e usr/share/rockdodger/.highscore ]; then
+    mv usr/share/rockdodger/.highscore var/games/rockdodger.highscore
+  fi
+}
+
+post_upgrade() {
+  post_install
+}