3 files changed, 28 insertions, 21 deletions
diff --git a/community/dvdisaster/PKGBUILD b/community/dvdisaster/PKGBUILD
index 15dcb0a07..494b615bf 100644
--- a/community/dvdisaster/PKGBUILD
+++ b/community/dvdisaster/PKGBUILD
@@ -1,21 +1,27 @@
-# $Id: PKGBUILD 70165 2012-05-01 03:12:33Z ebelanger $
+# $Id: PKGBUILD 97061 2013-09-12 03:38:41Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=dvdisaster
 pkgver=0.72.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Provides a margin of safety against data loss on CD and DVD media caused by aging or scratches"
 arch=('i686' 'x86_64')
 url="http://www.dvdisaster.com/"
 license=('GPL')
-depends=('gtk2')
+depends=('gtk2' 'hicolor-icon-theme')
 options=('!makeflags')
-source=(http://dvdisaster.net/downloads/${pkgname}-${pkgver}.tar.bz2 dvdisaster.desktop)
+install=dvdisaster.install
+source=(http://dvdisaster.net/downloads/${pkgname}-${pkgver}.tar.bz2{,.gpg})
 sha1sums=('2b47fb5a5535d90641f24a599cd8ae8ffd86b972'
-          'a802dfcee3aa35bdc4b0b5ecabcf32760cd8b992')
+          'SKIP')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  sed -i 's/dvdisaster48/dvdisaster/' contrib/dvdisaster.desktop
+}
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \
     --mandir=/usr/share/man --docdir=/usr/share/doc \
     --localedir=/usr/share/locale \
@@ -24,12 +30,12 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
 
   make BUILDROOT="${pkgdir}" install
   rm -f "${pkgdir}/usr/bin/dvdisaster-uninstall.sh"
-  install -D -m 644 "${srcdir}/dvdisaster.desktop" \
-    "${pkgdir}/usr/share/applications/dvdisaster.desktop"
-  install -D -m 644 icons/create.png \
-    "${pkgdir}/usr/share/pixmaps/dvdisaster.png"
+  install -D -m 644 contrib/dvdisaster.desktop "${pkgdir}/usr/share/applications/dvdisaster.desktop"
+  for i in 16 24 32 48 64 ; do
+    install -D -m 644 contrib/dvdisaster${i}.png "${pkgdir}/usr/share/icons/hicolor/${i}x${i}/dvdisaster.png"
+  done
 }
diff --git a/community/dvdisaster/dvdisaster.desktop b/community/dvdisaster/dvdisaster.desktop
deleted file mode 100644
index 061a53846..000000000
--- a/community/dvdisaster/dvdisaster.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=dvdisaster
-GenericName=DVD Recovery Tool
-Icon=dvdisaster
-Name=dvdisaster
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=AudioVideo;GTK;
diff --git a/community/dvdisaster/dvdisaster.install b/community/dvdisaster/dvdisaster.install
new file mode 100644
index 000000000..1a05f573e
--- /dev/null
+++ b/community/dvdisaster/dvdisaster.install
@@ -0,0 +1,11 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}