[arch-commits] CVS update of extra/office/glabels (PKGBUILD glabels.install)

[Jan de Groot]

    Date: Sunday, April 22, 2007 @ 14:04:51
  Author: jgc
    Path: /home/cvs-extra/extra/office/glabels

Modified: PKGBUILD (1.14 -> 1.15) glabels.install (1.4 -> 1.5)

upgpkg: glabels 2.0.4-2
Move to /usr


-----------------+
 PKGBUILD        |   25 +++++++++++++------------
 glabels.install |    7 +++----
 2 files changed, 16 insertions(+), 16 deletions(-)


Index: extra/office/glabels/PKGBUILD
diff -u extra/office/glabels/PKGBUILD:1.14 extra/office/glabels/PKGBUILD:1.15
--- extra/office/glabels/PKGBUILD:1.14	Sun Jul 16 11:35:59 2006
+++ extra/office/glabels/PKGBUILD	Sun Apr 22 14:04:50 2007
@@ -1,27 +1,28 @@
-# $Id: PKGBUILD,v 1.14 2006/07/16 15:35:59 andyrtr Exp $
-# Contributor: Damir Perisa <damir.perisa at bluewin.ch>
-# Maintainer: damir <damir at archlinux.org>
+# $Id: PKGBUILD,v 1.15 2007/04/22 18:04:50 jgc Exp $
+# Maintainer: Damir Perisa <damir at archlinux.org>
 
 pkgname=glabels
 pkgver=2.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Creating labels and business cards the very easy way"
 arch=(i686 x86_64)
+license=('GPL' 'LGPL')
 url="http://snaught.com/glabels/"
-depends=('libgnomeprintui' 'libgnomeui')
-source=(http://puzzle.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
+depends=('libgnomeprintui>=2.18.0' 'libgnomeui>=2.18.1-2' 'scrollkeeper' 'desktop-file-utils')
+makedepends=('pkgconfig')
+options=('nolibtool')
 install=glabels.install
+source=(http://dl.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd ${startdir}/src/${pkgname}-${pkgver}
   find . -name Makefile.in -exec sed -i -e 's/-scrollkeeper-update.*//' {} \;
   if [ -f omf.make ]; then
     sed -i -e 's/-scrollkeeper-update.*//' omf.make
   fi
-  ./configure 	--prefix=/opt/gnome \
-    		--disable-update-mimedb \
-    		--disable-update-desktopdb
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --localstatedir=/var --disable-static \
+              --disable-update-mimedb --disable-update-desktopdb 
   make || return 1
-  make DESTDIR=$startdir/pkg install
-  find $startdir/pkg -name '*.la' -exec rm {} \;
+  make DESTDIR=${startdir}/pkg install
 }
Index: extra/office/glabels/glabels.install
diff -u extra/office/glabels/glabels.install:1.4 extra/office/glabels/glabels.install:1.5
--- extra/office/glabels/glabels.install:1.4	Wed Feb  2 03:56:20 2005
+++ extra/office/glabels/glabels.install	Sun Apr 22 14:04:50 2007
@@ -1,8 +1,7 @@
 post_install() {
-  echo "updating scrollkeeper catalogue ..."
-  scrollkeeper-update -p var/lib/scrollkeeper  > /dev/null 2>&1
-  update-mime-database opt/gnome/share/mime > /dev/null 2>&1
-  update-desktop-database > /dev/null 2>&1
+  scrollkeeper-update -q -p var/lib/scrollkeeper
+  update-mime-database usr/share/mime
+  update-desktop-database -q
 }
 
 post_upgrade() {