From 560562e36a27da267f2f4f7989806790192888ef Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Mon, 31 Oct 2011 23:14:48 +0000
Subject: Mon Oct 31 23:14:48 UTC 2011

---
 community/dia/PKGBUILD    | 15 +++++++++------
 community/dia/dia.install |  6 +++---
 2 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'community/dia')

diff --git a/community/dia/PKGBUILD b/community/dia/PKGBUILD
index 954be7621..54da1eeae 100644
--- a/community/dia/PKGBUILD
+++ b/community/dia/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 49059 2011-06-10 08:42:06Z spupykin $
+# $Id: PKGBUILD 57536 2011-10-30 12:24:25Z ttopper $
+# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
 
 pkgname=dia
 pkgver=0.97.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A GTK+ based diagram creation program"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -25,7 +26,7 @@ build() {
 
   export PYTHON=/usr/bin/python2
   sed -i 's#python2\.1#python2 python2.1#' configure
-  patch -p1 <$srcdir/dia-overflow-fix.patch || true
+  patch -p1 <$srcdir/dia-overflow-fix.patch
 
   ./configure --prefix=/usr \
     --with-cairo \
@@ -34,12 +35,14 @@ build() {
     --with-hardbooks
   sed -i 's#SUBDIRS = lib objects plug-ins shapes app bindings samples po sheets data doc tests installer#SUBDIRS = lib objects plug-ins shapes app bindings samples po sheets data tests installer#' Makefile
   make
-  cd doc && make html
+  cd doc
+  make html
 }
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  cd doc && make DESTDIR="${pkgdir}" install-html
-  ln -sf ../doc/dia/html $pkgdir/usr/share/dia/help
+  cd doc
+  make DESTDIR="${pkgdir}" install-html
+  ln -sf dia/html "${pkgdir}"/usr/share/dia/help
 }
diff --git a/community/dia/dia.install b/community/dia/dia.install
index 499f00ea1..a49438e1f 100644
--- a/community/dia/dia.install
+++ b/community/dia/dia.install
@@ -1,7 +1,7 @@
 post_install() {
-  which update-desktop-database >/dev/null && update-desktop-database -q
-  which update-mime-database >/dev/null && update-mime-database usr/share/mime > /dev/null
-  which gtk-update-icon-cache >/dev/null && gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  update-desktop-database -q
+  update-mime-database usr/share/mime > /dev/null
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {
-- 
cgit v1.2.3-54-g00ecf