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

[Eric Bélanger]

    Date: Friday, May 6, 2011 @ 03:59:29
  Author: eric
Revision: 122717

upgpkg: fyre 1.0.1-4
Updated install scriptlet, Added missing depends

Modified:
  fyre/trunk/PKGBUILD
  fyre/trunk/fyre.install
Deleted:
  fyre/trunk/ChangeLog

--------------+
 ChangeLog    |    7 -------
 PKGBUILD     |   28 ++++++++++++++--------------
 fyre.install |   10 ++++++----
 3 files changed, 20 insertions(+), 25 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2011-05-06 07:29:37 UTC (rev 122716)
+++ ChangeLog	2011-05-06 07:59:29 UTC (rev 122717)
@@ -1,7 +0,0 @@
-2008-11-03  Eric Belanger  <eric at archlinux.org>
-
-	* fyre 1.0.1-3
-	* Fixed mime file conflict
-	* Fixed install scriptlet
-	* Added shared-mime-info depends
-	* Added ChangeLog	

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-06 07:29:37 UTC (rev 122716)
+++ PKGBUILD	2011-05-06 07:59:29 UTC (rev 122717)
@@ -1,26 +1,26 @@
 # $Id$
-# Maintainer: Eric Belanger <eric at archlinux.org>
-# Contributor: damir <damir at archlinux.org>
+# Maintainer: Eric Bélanger <eric at 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
+}

Modified: fyre.install
===================================================================
--- fyre.install	2011-05-06 07:29:37 UTC (rev 122716)
+++ fyre.install	2011-05-06 07:59:29 UTC (rev 122717)
@@ -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
 }