[arch-commits] Commit in xfce-utils/trunk (PKGBUILD xfce-utils.install)

[andyrtr at archlinux.org]

    Date: Sunday, February 1, 2009 @ 07:29:46
  Author: andyrtr
Revision: 25914

upgpkg: xfce-utils 4.5.99.1-1
    new verions 4.5.99.1(=4.6rc1)

Modified:
  xfce-utils/trunk/PKGBUILD
  xfce-utils/trunk/xfce-utils.install

--------------------+
 PKGBUILD           |   24 +++++++++++-------------
 xfce-utils.install |    7 ++-----
 2 files changed, 13 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-02-01 12:16:57 UTC (rev 25913)
+++ PKGBUILD	2009-02-01 12:29:46 UTC (rev 25914)
@@ -1,29 +1,27 @@
 # $Id$
-# Maintainer: aurelien <aurelien at archlinux.org>
+# Maintainer: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfce-utils
-pkgver=4.4.3
+pkgver=4.5.99.1
 pkgrel=1
 pkgdesc="Utilities for Xfce"
 arch=(i686 x86_64)
 license=('GPL2')
 url="http://www.xfce.org/"
 groups=('xfce4')
-depends=('libxfcegui4>=4.4.3' 'libxfce4mcs>=4.4.3' 'bash' 'dbh' 'hicolor-icon-theme')
-makedepends=('xfce-mcs-manager>=4.4.3' 'dbus-glib' 'pkgconfig')
-optdepends=('dbus-glib:		to work with xfrun4'
-            'xlock:		to work with xflock4 or'
-            'xscreensaver:	to work with xflock4')
+depends=("libxfcegui4>=$pkgver" 'hicolor-icon-theme')
+makedepends=('pkgconfig')
+optdepends=('perl:	enables migration script for 4.4 configuration files')
 options=('!libtool')
 install=${pkgname}.install
 source=(http://www.xfce.org/archive/xfce-${pkgver}/src/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('6d6ae1f048e1dc1348ad050498af5a18')
+md5sums=('bb605ee9aff15abcc7a7eb2d3d24b227')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/xfce4 \
-    --localstatedir=/var --disable-static
+  cd ${startdir}/src/${pkgname}-${pkgver}
+  sed -i -e "s/share\/xsessions/sessions/g" Makefile.in || return 1
+  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
+    --localstatedir=/var --disable-static --with-xsession-prefix=/etc/X11/
   make || return 1
-  make DESTDIR=${pkgdir} install
-  install -D -m644 gdm/xfce.desktop ${pkgdir}/etc/X11/sessions/xfce4.desktop
+  make DESTDIR=${startdir}/pkg install
 }

Modified: xfce-utils.install
===================================================================
--- xfce-utils.install	2009-02-01 12:16:57 UTC (rev 25913)
+++ xfce-utils.install	2009-02-01 12:29:46 UTC (rev 25914)
@@ -1,22 +1,19 @@
 post_install() {
   cat << EOF
-
 NOTE
 ----
  ==> xfce can run on top of a framebuffer. However, for most users it is
  ==> best to install xorg as an x-server. Please install either xorg-xinit
  ==> as minimal environment or the xorg meta package.
-
  pacman -S xorg-xinit
       -- or --
- pacman -s xorg
-
+ pacman -S xorg
 EOF
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {
-  post_install $1
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_remove() {