Thu Nov 3 23:14:47 UTC 2011

2 files changed, 32 insertions, 40 deletions

diff --git a/extra/xfce4-session/PKGBUILD b/extra/xfce4-session/PKGBUILD
index b8d7b5de0..1d17cce0c 100644
--- a/extra/xfce4-session/PKGBUILD
+++ b/extra/xfce4-session/PKGBUILD
@@ -1,60 +1,50 @@
-# $Id: PKGBUILD 138127 2011-09-17 02:26:42Z allan $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# $Id: PKGBUILD 141722 2011-11-02 15:10:56Z foutrelis $
+# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfce4-session
 pkgver=4.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A session manager for Xfce"
 arch=('i686' 'x86_64')
-license=('GPL2')
 url="http://www.xfce.org/"
+license=('GPL2')
 groups=('xfce4')
- # keep xorg-server-utils for https://bugs.archlinux.org/task/21096  'xorg-server-utils'
- # upower and consolekit for reboot/shutdown/hibernate/suspend
-depends=('xfce4-panel' 'gconf' 'libgnome-keyring' 'libwnck' 'libsm' 'xorg-iceauth' 'upower' 'consolekit' 'hicolor-icon-theme' )
+# keep xorg-server-utils for https://bugs.archlinux.org/task/21096
+# upower and consolekit for reboot/shutdown/hibernate/suspend
+depends=('xfce4-panel' 'gconf' 'libgnome-keyring' 'libwnck' 'libsm'
+         'xorg-iceauth' 'upower' 'consolekit' 'hicolor-icon-theme')
 makedepends=('intltool')
 optdepends=('fortune-mod: for xfce4-tips')
 replaces=('xfce4-toys')
-backup=(etc/polkit-1/localauthority/50-local.d/org.freedesktop.consolekit.pkla
-	etc/polkit-1/localauthority/50-local.d/org.freedesktop.upower.pkla)
 options=('!libtool')
-install=${pkgname}.install
-source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2
-	org.freedesktop.consolekit.pkla
-	org.freedesktop.upower.pkla)
-md5sums=('48780cbcf784ab64debc9312f17765f2'
-         '2e2519950d8c591dc9440ed8957a49ed'
-         '5fa270637b5e685f033863d8664795a2')
+install=$pkgname.install
+source=(http://archive.xfce.org/src/xfce/$pkgname/4.8/$pkgname-$pkgver.tar.bz2)
+sha256sums=('31bca2a559e05a8a859f150394a901517e5842414ef171a85c5da234e344c0d0')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd "$srcdir/$pkgname-$pkgver"
 
   ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib/xfce4 \
-	--localstatedir=/var \
-	--disable-static \
-	--disable-hal \
-	--enable-gnome \
-	--enable-libgnome-keyring \
-	--enable-session-screenshots \
-	--enable-upower \
-	--enable-consolekit \
-	--enable-polkit \
-	--enable-panel-plugin \
-	--disable-debug
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/xfce4 \
+    --localstatedir=/var \
+    --disable-static \
+    --disable-hal \
+    --enable-gnome \
+    --enable-libgnome-keyring \
+    --enable-session-screenshots \
+    --enable-upower \
+    --enable-consolekit \
+    --enable-polkit \
+    --enable-panel-plugin \
+    --disable-debug
   make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  
-  # install polkit/consolekit permission file needed for usage without a display manager
-  install -dm700 ${pkgdir}/etc/polkit-1/localauthority
-  install -dm755 ${pkgdir}/etc/polkit-1/localauthority/50-local.d
-  install -m644 ${srcdir}/org.freedesktop.consolekit.pkla ${pkgdir}/etc/polkit-1/localauthority/50-local.d/
-  install -m644 ${srcdir}/org.freedesktop.upower.pkla ${pkgdir}/etc/polkit-1/localauthority/50-local.d/
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
 
+# vim:set ts=2 sw=2 et:
diff --git a/extra/xfce4-session/xfce4-session.install b/extra/xfce4-session/xfce4-session.install
index 21b79d2d4..e4f8fd06c 100644
--- a/extra/xfce4-session/xfce4-session.install
+++ b/extra/xfce4-session/xfce4-session.install
@@ -3,9 +3,11 @@ post_install() {
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }
+
+# vim:set ts=2 sw=2 et: