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

[Jonathan Steel]

    Date: Sunday, February 9, 2014 @ 12:46:34
  Author: jsteel
Revision: 105502

Fix FS#38846

Modified:
  scratch/trunk/PKGBUILD
  scratch/trunk/scratch.install

-----------------+
 PKGBUILD        |   20 ++++++++++++++------
 scratch.install |    4 ++++
 2 files changed, 18 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-02-09 11:01:22 UTC (rev 105501)
+++ PKGBUILD	2014-02-09 11:46:34 UTC (rev 105502)
@@ -1,25 +1,29 @@
 # $Id$
-# Maintainer: Jonathan Steel <mail at jsteel dot org>
+# Maintainer: Jonathan Steel <jsteel at aur.archlinux.org>
 # Contributor: Muhammed Uluyol <muhammedu at gmail.com>
 
 pkgname=scratch
 pkgver=1.4.0.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Create and share your own interactive stories, games, music and art"
 arch=('i686' 'x86_64')
 url="http://scratch.mit.edu"
 license=('GPL2')
 install=$pkgname.install
-depends=('squeak-vm' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils' 'pango'
-	 'gtk-update-icon-cache')
+depends=('squeak-vm' 'shared-mime-info' 'desktop-file-utils' 'pango'
+         'gtk-update-icon-cache')
 source=(http://download.scratch.mit.edu/$pkgname-$pkgver.src.tar.gz)
 md5sums=('f948e9e6de3ec9c7c7b4cc2a1975eb5a')
 
-build() {
+prepare() {
   cd "$srcdir"/$pkgname-$pkgver.src
 
   sed -i 's/-vm-sound-pulse/-vm-sound-ALSA/' src/$pkgname
+}
 
+build() {
+  cd "$srcdir"/$pkgname-$pkgver.src
+
   make build
 }
 
@@ -35,6 +39,10 @@
   install -dm755 "$pkgdir"/usr/share/{$pkgname,icons/hicolor}
 
   cp -rp Help locale Media Projects README "$pkgdir"/usr/share/$pkgname/
-  cp -rp src/icons/* "$pkgdir"/usr/share/icons/hicolor/
   cp -rp Plugins "$pkgdir"/usr/lib/$pkgname/
+
+  for res in 32 48 128; do
+    install -D -m644 src/icons/${res}x${res}/$pkgname.png \
+      "$pkgdir"/usr/share/icons/hicolor/${res}x${res}/apps/$pkgname.png
+  done
 }

Modified: scratch.install
===================================================================
--- scratch.install	2014-02-09 11:01:22 UTC (rev 105501)
+++ scratch.install	2014-02-09 11:46:34 UTC (rev 105502)
@@ -4,6 +4,10 @@
     gtk-update-icon-cache -qf /usr/share/icons/hicolor
 }
 
+post_upgrade() {
+    post_install
+}
+
 post_remove() {
     post_install
 }