Wed Apr 25 00:01:35 UTC 2012

2 files changed, 20 insertions, 42 deletions

diff --git a/extra/gnome-disk-utility/PKGBUILD b/extra/gnome-disk-utility/PKGBUILD
index d9de3d900..211f1ddac 100644
--- a/extra/gnome-disk-utility/PKGBUILD
+++ b/extra/gnome-disk-utility/PKGBUILD
@@ -1,52 +1,30 @@
-# $Id: PKGBUILD 139202 2011-10-01 17:02:00Z heftig $
+# $Id: PKGBUILD 157100 2012-04-23 20:43:27Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Silvio Knizek (killermoehre)
 
-pkgbase=gnome-disk-utility
-pkgname=(gnome-disk-utility libgdu)
-pkgver=3.0.2
-pkgrel=2
-pkgdesc="GNOME libraries and applications for dealing with storage devices"
+pkgname=gnome-disk-utility
+pkgver=3.4.1
+pkgrel=1
+pkgdesc="Disk Management Utility for GNOME"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.gnome.org"
-makedepends=('dbus-glib' 'libgnome-keyring' 'udisks' 'libunique3' 'libnotify' 'avahi'
-             'hicolor-icon-theme' 'gtk-doc' 'intltool')
+groups=('gnome-extra')
+depends=('gtk3' 'udisks2' 'hicolor-icon-theme')
+makedepends=('intltool')
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz
-       fix-freeze.patch)
-sha256sums=('7983f12ba04e84f164d0cae54bb06ed9b3ebe6c0a1c606d63d067fc395aeb0a5'
-            '818b70360978968457d2c50738347c6726ed8d0c007eb57074881a7e33652526')
+install=gnome-disk-utility.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('54c60a3215a144a353f78742cf14221a011641244421170d7169da39f82b0129')
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  patch -Np1 -i "${srcdir}/fix-freeze.patch"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/gnome-disk-utility \
-      --disable-scrollkeeper --disable-nautilus --disable-static
-  make
-}
-
-package_gnome-disk-utility() {
-  depends=("libgdu=$pkgver-$pkgrel" 'libunique3' 'libnotify' 'hicolor-icon-theme' 'avahi')
-  groups=('gnome-extra')
-  install=gnome-disk-utility.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  cd "$pkgname-$pkgver"
+  ./configure --prefix=/usr --sysconfdir=/etc
 
-### Split libgdu
-
-  mkdir -p "$srcdir"/libgdu/usr/{include/gnome-disk-utility,lib/pkgconfig}
-
-  mv "$pkgdir"/usr/lib/libgdu.so* "$srcdir/libgdu/usr/lib"
-  mv {"$pkgdir","$srcdir/libgdu"}/usr/include/gnome-disk-utility/gdu
-  mv {"$pkgdir","$srcdir/libgdu"}/usr/lib/pkgconfig/gdu.pc
+  make
 }
 
-package_libgdu() {
-  pkgdesc="$pkgdesc (library)"
-  depends=('dbus-glib' 'libgnome-keyring' 'udisks')
-
-  mv "$srcdir"/libgdu/* "$pkgdir"
+package() {
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
diff --git a/extra/gnome-disk-utility/gnome-disk-utility.install b/extra/gnome-disk-utility/gnome-disk-utility.install
index 43ed0a554..71d138f2d 100644
--- a/extra/gnome-disk-utility/gnome-disk-utility.install
+++ b/extra/gnome-disk-utility/gnome-disk-utility.install
@@ -1,11 +1,11 @@
 post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
 }
 
 post_upgrade() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+    post_install
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+    post_install
 }