wok rev 6055

slim: Upgrade to 1.3.2
author Matthew Sheets <rcx@zoominternet.net>
date Thu Aug 19 20:55:56 2010 +0000 (2010-08-19)
parents 41ed3c4760c9
children 71f8df5a3811
files slim-pam/receipt slim-theme-default/receipt slim/receipt
line diff
     1.1 --- a/slim-pam/receipt	Wed Aug 18 09:37:20 2010 +0200
     1.2 +++ b/slim-pam/receipt	Thu Aug 19 20:55:56 2010 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="slim-pam"
     1.7 -VERSION="1.3.1"
     1.8 +VERSION="1.3.2"
     1.9  CATEGORY="x-window"
    1.10  SHORT_DESC="Desktop-independent graphical login manager for X11."
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
    1.12 @@ -20,24 +20,23 @@
    1.13  compile_rules()
    1.14  {
    1.15  	cd $src
    1.16 -	patch -p0 < ../../slim/stuff/gcc44.patch || exit 1
    1.17 -	sed -i "s|/usr/X11R6/include|/usr/include/xorg|g" Makefile
    1.18 -	sed -i "s|/usr/X11R6/|/usr/|g" Makefile
    1.19 -	make USE_PAM=1
    1.20 +	make USE_PAM=1 &&
    1.21 +	make DESTDIR=$src/_pkg install
    1.22  }
    1.23  
    1.24  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.25  genpkg_rules()
    1.26  {
    1.27 -	mkdir -p $fs/usr/bin $fs/usr/share/slim
    1.28 -	cp -a $src/slim $fs/usr/bin
    1.29 -
    1.30 -	# Config file and rc script (theme is in slitaz-configs).
    1.31 +	mkdir -p $fs/usr/share/slim
    1.32 +	cp -a ../$SOURCE/stuff/themes $fs/usr/share/slim
    1.33 +	cp -a $_pkg/usr/bin $fs/usr
    1.34 +	
    1.35 +	# Config file and rc script.
    1.36  	cp -a ../$SOURCE/stuff/etc $fs
    1.37  	chown -R root.root $fs
    1.38  }
    1.39  
    1.40 -pre_instal()
    1.41 +pre_install()
    1.42  {
    1.43  	local root
    1.44  	root=$1
     2.1 --- a/slim-theme-default/receipt	Wed Aug 18 09:37:20 2010 +0200
     2.2 +++ b/slim-theme-default/receipt	Thu Aug 19 20:55:56 2010 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="slim-theme-default"
     2.7 -VERSION="1.3.1"
     2.8 +VERSION="1.3.2"
     2.9  CATEGORY="x-window"
    2.10  SHORT_DESC="Slim login manager themes pack."
    2.11  MAINTAINER="pankso@slitaz.org"
    2.12 @@ -13,5 +13,5 @@
    2.13  genpkg_rules()
    2.14  {
    2.15  	mkdir -p $fs/usr/share/slim
    2.16 -	cp -a $src/themes $fs/usr/share/slim
    2.17 +	cp -a $_pkg/usr/share/slim/themes $fs/usr/share/slim
    2.18  }
     3.1 --- a/slim/receipt	Wed Aug 18 09:37:20 2010 +0200
     3.2 +++ b/slim/receipt	Thu Aug 19 20:55:56 2010 +0000
     3.3 @@ -1,14 +1,14 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="slim"
     3.7 -VERSION="1.3.1"
     3.8 +VERSION="1.3.2"
     3.9  CATEGORY="x-window"
    3.10  SHORT_DESC="Desktop-independent graphical login manager for X11."
    3.11  MAINTAINER="pankso@slitaz.org"
    3.12  DEPENDS="glibc-base gcc-lib-base expat fontconfig freetype util-linux-ng-uuid zlib \
    3.13  jpeg libpng xorg-libICE xorg-libSM xorg-libX11 xorg-libXau xorg-libXdmcp \
    3.14  xorg-libXext xorg-libXft xorg-libXmu xorg-libXrender xorg-libXt"
    3.15 -BUILD_DEPENDS="xorg-dev jpeg-dev libpng-dev xorg-libXft-dev \ 
    3.16 +BUILD_DEPENDS="xorg-dev jpeg-dev libpng-dev xorg-libXft-dev \
    3.17  zlib-dev freetype-dev fontconfig-dev"
    3.18  SUGGESTED="slim-theme-default slitaz-configs"
    3.19  TARBALL="$PACKAGE-$VERSION.tar.gz"
    3.20 @@ -21,18 +21,17 @@
    3.21  compile_rules()
    3.22  {
    3.23  	cd $src
    3.24 -	patch -p0 < ../stuff/gcc44.patch || exit 1
    3.25 -	sed -i "s|/usr/X11R6/include|/usr/include/xorg|g" Makefile
    3.26 -	sed -i "s|/usr/X11R6/|/usr/|g" Makefile
    3.27 -	make
    3.28 +	make &&
    3.29 +	make DESTDIR=$src/_pkg install
    3.30  }
    3.31  
    3.32  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.33  genpkg_rules()
    3.34  {
    3.35 -	mkdir -p $fs/usr/bin $fs/usr/share/slim
    3.36 -	cp -a $src/slim $fs/usr/bin
    3.37 +	mkdir -p $fs/usr/share/slim
    3.38  	cp -a stuff/themes $fs/usr/share/slim
    3.39 +	cp -a $_pkg/usr/bin $fs/usr
    3.40 +
    3.41  	# Config file and rc script.
    3.42  	cp -a stuff/etc $fs
    3.43  	chown -R root.root $fs