wok-current diff slim/receipt @ rev 13661

ccid: fix genpkg_rules
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Nov 21 21:52:14 2012 +0100 (2012-11-21)
parents 73641efed1cc
children d0948455b365
line diff
     1.1 --- a/slim/receipt	Mon Apr 23 16:30:27 2012 +0200
     1.2 +++ b/slim/receipt	Wed Nov 21 21:52:14 2012 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="slim"
     1.7 -VERSION="1.3.2"
     1.8 +VERSION="1.3.3" # 1.3.4
     1.9  CATEGORY="x-window"
    1.10  SHORT_DESC="Desktop-independent graphical login manager for X11."
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12 @@ -12,16 +12,16 @@
    1.13  CONFIG_FILES="/etc/slim.conf"
    1.14  
    1.15  DEPENDS="glibc-base gcc-lib-base expat fontconfig freetype util-linux-uuid \
    1.16 -zlib jpeg libpng xorg-libICE xorg-libSM xorg-libX11 xorg-libXau xorg-libXdmcp \
    1.17 -xorg-libXext xorg-libXft xorg-libXmu xorg-libXrender xorg-libXt"
    1.18 -BUILD_DEPENDS="xorg-dev jpeg-dev libpng-dev"
    1.19 +zlib jpeg libpng xorg-libXft xorg-libXmu"
    1.20 +BUILD_DEPENDS="xorg-libXft-dev xorg-libXmu-dev jpeg-dev libpng-dev cmake"
    1.21  
    1.22  # Rules to configure and make the package.
    1.23  compile_rules()
    1.24  {
    1.25  	cd $src
    1.26 -	patch -p1 < $stuff/NoPwdForCmd.patch || return 1
    1.27 -	make && make DESTDIR=$WOK/$PACKAGE/install install
    1.28 +	#patch -p1 < $stuff/NoPwdForCmd.patch || return 1
    1.29 +	cmake -DCMAKE_INSTALL_PREFIX=/usr . &&
    1.30 +	make && make DESTDIR=$DESTDIR install
    1.31  }
    1.32  
    1.33  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.34 @@ -29,7 +29,7 @@
    1.35  {
    1.36  	mkdir -p $fs/usr/share/slim
    1.37  	cp -a $stuff/themes $fs/usr/share/slim
    1.38 -	cp -a $_pkg/usr/bin $fs/usr
    1.39 +	cp -a $install/usr/bin $fs/usr
    1.40  
    1.41  	# Config file and rc script.
    1.42  	cp -a $stuff/etc $fs