wok 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 5a982ae26b2e
children e5c178038a0e
files xfce4-session-dev/receipt xfce4-session/receipt
line diff
     1.1 --- a/xfce4-session-dev/receipt	Wed Jul 17 15:26:45 2013 +0200
     1.2 +++ b/xfce4-session-dev/receipt	Wed Jul 17 15:47:34 2013 +0200
     1.3 @@ -5,17 +5,19 @@
     1.4  CATEGORY="x-window"
     1.5  SHORT_DESC="Xfce session manager dev files"
     1.6  MAINTAINER="erjo@slitaz.org"
     1.7 -DEPENDS="xfce4-session"
     1.8 +LICENCE="GPL2"
     1.9  WANTED="xfce4-session"
    1.10  WEB_SITE="http://www.xfce.org/"
    1.11  
    1.12 +DEPENDS="xfce4-session"
    1.13 +
    1.14  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.15  genpkg_rules()
    1.16  {
    1.17  	mkdir -p $fs/usr 
    1.18  	
    1.19 -	cp -a $_pkg/usr/include $fs/usr
    1.20 -	cp -a $_pkg/usr/lib $fs/usr
    1.21 +	cp -a $install/usr/include $fs/usr
    1.22 +	cp -a $install/usr/lib $fs/usr
    1.23  	
    1.24  	# Remove unecessary files
    1.25  	find $fs/ -name "*.so*" -exec rm -f {} \;
     2.1 --- a/xfce4-session/receipt	Wed Jul 17 15:26:45 2013 +0200
     2.2 +++ b/xfce4-session/receipt	Wed Jul 17 15:47:34 2013 +0200
     2.3 @@ -5,13 +5,15 @@
     2.4  CATEGORY="x-window"
     2.5  SHORT_DESC="Xfce session manager"
     2.6  MAINTAINER="erjo@slitaz.org"
     2.7 -DEPENDS="libxfce4util libxfce4ui libwnck dbus-glib libglade xorg-iceauth"
     2.8 -SUGGESTED="perl-xml-parser"
     2.9 -BUILD_DEPENDS="libxfce4util-dev libxfce4ui-dev xfconf-dev libglade-dev dbus-dev  \
    2.10 -dbus-glib-dev xorg-iceauth libwnck-dev pkg-config intltool util-linux-uuid-dev"
    2.11 +LICENCE="GPL2"
    2.12  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    2.13  WEB_SITE="http://www.xfce.org/"
    2.14  WGET_URL="http://archive.xfce.org/src/xfce/$PACKAGE/${VERSION%.*}/$TARBALL"
    2.15 +SUGGESTED="perl-xml-parser"
    2.16 +
    2.17 +DEPENDS="libxfce4util libxfce4ui libwnck dbus-glib libglade xorg-iceauth"
    2.18 +BUILD_DEPENDS="libxfce4util-dev libxfce4ui-dev xfconf-dev libglade-dev dbus-dev  \
    2.19 +dbus-glib-dev xorg-iceauth libwnck-dev pkg-config intltool util-linux-uuid-dev"
    2.20  
    2.21  # Rules to configure and make the package.
    2.22  compile_rules()
    2.23 @@ -23,8 +25,9 @@
    2.24  		--disable-gnome \
    2.25  		--disable-debug \
    2.26  		--libexecdir=/usr/lib/$PACKAGE \
    2.27 -		--mandir=/usr/share/man $CONFIGURE_ARGS && \
    2.28 -	make && make DESTDIR=$PWD/_pkg install
    2.29 +		--mandir=/usr/share/man $CONFIGURE_ARGS &&
    2.30 +	make 2>&1 | grep -v libtoolT &&
    2.31 +	make DESTDIR=$DESTDIR install
    2.32  }
    2.33  
    2.34  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.35 @@ -34,15 +37,15 @@
    2.36  		$fs/usr/share/locale \
    2.37  		$fs/sbin
    2.38  			
    2.39 -	cp -a $_pkg/etc $fs/	
    2.40 -	cp -a $_pkg/usr/bin $fs/usr
    2.41 -	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
    2.42 -	cp -a $_pkg/usr/lib/xfce4 $fs/usr/lib
    2.43 -	cp -a $_pkg/usr/share/locale/fr $fs/usr/share/locale
    2.44 -	cp -a $_pkg/usr/share/applications $fs/usr/share
    2.45 -	cp -a $_pkg/usr/share/icons $fs/usr/share
    2.46 -	cp -a $_pkg/usr/share/themes $fs/usr/share
    2.47 -	#cp -a $_pkg/usr/share/xfce4 $fs/usr/share
    2.48 +	cp -a $install/etc $fs/	
    2.49 +	cp -a $install/usr/bin $fs/usr
    2.50 +	cp -a $install/usr/lib/*.so* $fs/usr/lib
    2.51 +	cp -a $install/usr/lib/xfce4 $fs/usr/lib
    2.52 +	cp -a $install/usr/share/locale/fr $fs/usr/share/locale
    2.53 +	cp -a $install/usr/share/applications $fs/usr/share
    2.54 +	cp -a $install/usr/share/icons $fs/usr/share
    2.55 +	cp -a $install/usr/share/themes $fs/usr/share
    2.56 +	#cp -a $install/usr/share/xfce4 $fs/usr/share
    2.57  	
    2.58  	# xfce4-session-logout workarround
    2.59  	cp stuff/shutdown $fs/sbin