[arch-commits] Commit in fyre/repos (4 files)

[Eric Belanger]

    Date: Tuesday, November 4, 2008 @ 00:12:23
  Author: eric
Revision: 18328

Merged revisions 18313 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/fyre/trunk

........
  r18313 | eric | 2008-11-03 23:32:29 -0500 (Mon, 03 Nov 2008) | 2 lines
  
  upgpkg: fyre 1.0.1-3
      Fixed mime file conflict, Fixed install scriptlet, Added shared-mime-info depends, Added ChangeLog
........

Added:
  fyre/repos/extra-i686/ChangeLog
    (from rev 18313, fyre/trunk/ChangeLog)
Modified:
  fyre/repos/extra-i686/	(properties)
  fyre/repos/extra-i686/PKGBUILD
  fyre/repos/extra-i686/fyre.install

--------------+
 ChangeLog    |    7 +++++++
 PKGBUILD     |   31 ++++++++++++++++---------------
 fyre.install |   19 +++----------------
 3 files changed, 26 insertions(+), 31 deletions(-)


Property changes on: fyre/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /fyre/trunk:1-17672
   + /fyre/trunk:1-18327

Copied: fyre/repos/extra-i686/ChangeLog (from rev 18313, fyre/trunk/ChangeLog)
===================================================================
--- extra-i686/ChangeLog	                        (rev 0)
+++ extra-i686/ChangeLog	2008-11-04 05:12:23 UTC (rev 18328)
@@ -0,0 +1,7 @@
+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: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-04 05:10:12 UTC (rev 18327)
+++ extra-i686/PKGBUILD	2008-11-04 05:12:23 UTC (rev 18328)
@@ -1,25 +1,26 @@
 # $Id$
-# Maintainer: damir <damir at archlinux.org>
+# Maintainer: Eric Belanger <eric at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
 
 pkgname=fyre
 pkgver=1.0.1
-pkgrel=2
-pkgdesc="rendering of the Peter de Jong map"
+pkgrel=3
+pkgdesc="Rendering of the Peter de Jong map"
 arch=("i686" "x86_64")
-license=('GPL2')
 url="http://fyre.navi.cx/"
-depends=('openexr>=1.6' 'libglade' 'gnet')
-source=("http://flapjack.navi.cx/releases/fyre/fyre-$pkgver.tar.gz")
-install=$pkgname.install
+license=('GPL')
+depends=('openexr>=1.6' 'libglade' 'gnet' 'shared-mime-info')
+install=${pkgname}.install
+source=(http://flapjack.navi.cx/releases/fyre/fyre-${pkgver}.tar.gz)
+md5sums=('44d5830c527325c1ee6fa6ea92b4ba03')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr || return 1
   make || return 1
-  make prefix=$startdir/pkg/usr install
-  rm $startdir/pkg/usr/share/mime/{XMLnamespaces,globs,magic,aliases,subclasses}
-  rm $startdir/pkg/usr/share/mime/mime.cache
-  rm $startdir/pkg/usr/share/icons/hicolor/icon-theme.cache
+  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
 }
-
-md5sums=('44d5830c527325c1ee6fa6ea92b4ba03')

Modified: extra-i686/fyre.install
===================================================================
--- extra-i686/fyre.install	2008-11-04 05:10:12 UTC (rev 18327)
+++ extra-i686/fyre.install	2008-11-04 05:12:23 UTC (rev 18328)
@@ -1,24 +1,11 @@
-# arg 1:  the new package version
 post_install() {
-  /usr/bin/update-mime-database /usr/share/mime
+  usr/bin/update-mime-database /usr/share/mime > /dev/null 2>&1
 }
 
-# arg 1:  the new package version
-# arg 2:  the old package version
 post_upgrade() {
-  /usr/bin/update-mime-database /usr/share/mime
+  usr/bin/update-mime-database /usr/share/mime > /dev/null 2>&1
 }
 
-# arg 1:  the old package version
 pre_remove() {
-  /usr/bin/update-mime-database /usr/share/mime
+  usr/bin/update-mime-database /usr/share/mime > /dev/null 2>&1
 }
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-$op $*