wok diff xfce4-session/receipt @ rev 14835

xfce4-session: remove wrong trigger
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Jul 17 15:47:34 2013 +0200 (2013-07-17)
parents 2f4098672066
children e5c178038a0e
line diff
     1.1 --- a/xfce4-session/receipt	Wed Jul 17 13:51:45 2013 +0200
     1.2 +++ b/xfce4-session/receipt	Wed Jul 17 15:47:34 2013 +0200
     1.3 @@ -5,13 +5,15 @@
     1.4  CATEGORY="x-window"
     1.5  SHORT_DESC="Xfce session manager"
     1.6  MAINTAINER="erjo@slitaz.org"
     1.7 -DEPENDS="libxfce4util libxfce4ui libwnck dbus-glib libglade xorg-iceauth"
     1.8 -SUGGESTED="perl-xml-parser"
     1.9 -BUILD_DEPENDS="libxfce4util-dev libxfce4ui-dev xfconf-dev libglade-dev dbus-dev  \
    1.10 -dbus-glib-dev xorg-iceauth libwnck-dev pkg-config intltool util-linux-uuid-dev"
    1.11 +LICENCE="GPL2"
    1.12  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    1.13  WEB_SITE="http://www.xfce.org/"
    1.14  WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
    1.15 +SUGGESTED="perl-xml-parser"
    1.16 +
    1.17 +DEPENDS="libxfce4util libxfce4ui libwnck dbus-glib libglade xorg-iceauth"
    1.18 +BUILD_DEPENDS="libxfce4util-dev libxfce4ui-dev xfconf-dev libglade-dev dbus-dev  \
    1.19 +dbus-glib-dev xorg-iceauth libwnck-dev pkg-config intltool util-linux-uuid-dev"
    1.20  
    1.21  # Rules to configure and make the package.
    1.22  compile_rules()
    1.23 @@ -23,8 +25,9 @@
    1.24  		--disable-gnome \
    1.25  		--disable-debug \
    1.26  		--libexecdir=/usr/lib/$PACKAGE \
    1.27 -		--mandir=/usr/share/man $CONFIGURE_ARGS && \
    1.28 -	make && make DESTDIR=$PWD/_pkg install
    1.29 +		--mandir=/usr/share/man $CONFIGURE_ARGS &&
    1.30 +	make 2>&1 | grep -v libtoolT &&
    1.31 +	make DESTDIR=$DESTDIR install
    1.32  }
    1.33  
    1.34  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.35 @@ -34,15 +37,15 @@
    1.36  		$fs/usr/share/locale \
    1.37  		$fs/sbin
    1.38  			
    1.39 -	cp -a $_pkg/etc $fs/	
    1.40 -	cp -a $_pkg/usr/bin $fs/usr
    1.41 -	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
    1.42 -	cp -a $_pkg/usr/lib/xfce4 $fs/usr/lib
    1.43 -	cp -a $_pkg/usr/share/locale/fr $fs/usr/share/locale
    1.44 -	cp -a $_pkg/usr/share/applications $fs/usr/share
    1.45 -	cp -a $_pkg/usr/share/icons $fs/usr/share
    1.46 -	cp -a $_pkg/usr/share/themes $fs/usr/share
    1.47 -	#cp -a $_pkg/usr/share/xfce4 $fs/usr/share
    1.48 +	cp -a $install/etc $fs/	
    1.49 +	cp -a $install/usr/bin $fs/usr
    1.50 +	cp -a $install/usr/lib/*.so* $fs/usr/lib
    1.51 +	cp -a $install/usr/lib/xfce4 $fs/usr/lib
    1.52 +	cp -a $install/usr/share/locale/fr $fs/usr/share/locale
    1.53 +	cp -a $install/usr/share/applications $fs/usr/share
    1.54 +	cp -a $install/usr/share/icons $fs/usr/share
    1.55 +	cp -a $install/usr/share/themes $fs/usr/share
    1.56 +	#cp -a $install/usr/share/xfce4 $fs/usr/share
    1.57  	
    1.58  	# xfce4-session-logout workarround
    1.59  	cp stuff/shutdown $fs/sbin