From fe6dc99352fe2b801d251e55b2b8baa71441908e Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Sat, 7 May 2011 22:35:21 +0000
Subject: Sat May  7 22:35:21 UTC 2011

---
 extra/fyre/PKGBUILD     | 30 +++++++++++++++---------------
 extra/fyre/fyre.install | 10 ++++++----
 2 files changed, 21 insertions(+), 19 deletions(-)

(limited to 'extra/fyre')

diff --git a/extra/fyre/PKGBUILD b/extra/fyre/PKGBUILD
index cb1a914af..a34415046 100644
--- a/extra/fyre/PKGBUILD
+++ b/extra/fyre/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 18314 2008-11-04 04:33:02Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
+# $Id: PKGBUILD 122717 2011-05-06 07:59:29Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=fyre
 pkgver=1.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Rendering of the Peter de Jong map"
-arch=("i686" "x86_64")
+arch=('i686' 'x86_64')
 url="http://fyre.navi.cx/"
 license=('GPL')
-depends=('openexr>=1.6' 'libglade' 'gnet' 'shared-mime-info')
-install=${pkgname}.install
+depends=('openexr' 'libglade' 'gnet' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils')
+install=fyre.install
 source=(http://flapjack.navi.cx/releases/fyre/fyre-${pkgver}.tar.gz)
 md5sums=('44d5830c527325c1ee6fa6ea92b4ba03')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make prefix=${pkgdir}/usr install || return 1
-  rm ${pkgdir}/usr/share/mime/{XMLnamespaces,globs,magic,aliases,subclasses} || return 1
-  rm ${pkgdir}/usr/share/mime/{generic-icons,globs2,icons,treemagic,types} || return 1
-  rm ${pkgdir}/usr/share/mime/mime.cache || return 1
-  rm ${pkgdir}/usr/share/icons/hicolor/icon-theme.cache || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make update_xdgmime=/bin/false update_fdodesktop=/bin/false gtk_update_icon_cache=/bin/false \
+    prefix="${pkgdir}/usr" install
 }
diff --git a/extra/fyre/fyre.install b/extra/fyre/fyre.install
index 0f4a73633..388efbb11 100644
--- a/extra/fyre/fyre.install
+++ b/extra/fyre/fyre.install
@@ -1,11 +1,13 @@
 post_install() {
-  usr/bin/update-mime-database /usr/share/mime > /dev/null 2>&1
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-mime-database usr/share/mime &> /dev/null
+  update-desktop-database -q
 }
 
 post_upgrade() {
-  usr/bin/update-mime-database /usr/share/mime > /dev/null 2>&1
+  post_install
 }
 
-pre_remove() {
-  usr/bin/update-mime-database /usr/share/mime > /dev/null 2>&1
+post_remove() {
+  post_install
 }
-- 
cgit v1.2.3-54-g00ecf