# HG changeset patch
# User Matthew Sheets <rcx@zoominternet.net>
# Date 1282251356 0
# Node ID a0fa6235faca3858f8e993ec5793659849d79905
# Parent  41ed3c4760c9313a2d9d45d2fb7cf2c790d94614
slim: Upgrade to 1.3.2

diff -r 41ed3c4760c9 -r a0fa6235faca slim-pam/receipt
--- a/slim-pam/receipt	Wed Aug 18 09:37:20 2010 +0200
+++ b/slim-pam/receipt	Thu Aug 19 20:55:56 2010 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="slim-pam"
-VERSION="1.3.1"
+VERSION="1.3.2"
 CATEGORY="x-window"
 SHORT_DESC="Desktop-independent graphical login manager for X11."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -20,24 +20,23 @@
 compile_rules()
 {
 	cd $src
-	patch -p0 < ../../slim/stuff/gcc44.patch || exit 1
-	sed -i "s|/usr/X11R6/include|/usr/include/xorg|g" Makefile
-	sed -i "s|/usr/X11R6/|/usr/|g" Makefile
-	make USE_PAM=1
+	make USE_PAM=1 &&
+	make DESTDIR=$src/_pkg install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/bin $fs/usr/share/slim
-	cp -a $src/slim $fs/usr/bin
-
-	# Config file and rc script (theme is in slitaz-configs).
+	mkdir -p $fs/usr/share/slim
+	cp -a ../$SOURCE/stuff/themes $fs/usr/share/slim
+	cp -a $_pkg/usr/bin $fs/usr
+	
+	# Config file and rc script.
 	cp -a ../$SOURCE/stuff/etc $fs
 	chown -R root.root $fs
 }
 
-pre_instal()
+pre_install()
 {
 	local root
 	root=$1
diff -r 41ed3c4760c9 -r a0fa6235faca slim-theme-default/receipt
--- a/slim-theme-default/receipt	Wed Aug 18 09:37:20 2010 +0200
+++ b/slim-theme-default/receipt	Thu Aug 19 20:55:56 2010 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="slim-theme-default"
-VERSION="1.3.1"
+VERSION="1.3.2"
 CATEGORY="x-window"
 SHORT_DESC="Slim login manager themes pack."
 MAINTAINER="pankso@slitaz.org"
@@ -13,5 +13,5 @@
 genpkg_rules()
 {
 	mkdir -p $fs/usr/share/slim
-	cp -a $src/themes $fs/usr/share/slim
+	cp -a $_pkg/usr/share/slim/themes $fs/usr/share/slim
 }
diff -r 41ed3c4760c9 -r a0fa6235faca slim/receipt
--- a/slim/receipt	Wed Aug 18 09:37:20 2010 +0200
+++ b/slim/receipt	Thu Aug 19 20:55:56 2010 +0000
@@ -1,14 +1,14 @@
 # SliTaz package receipt.
 
 PACKAGE="slim"
-VERSION="1.3.1"
+VERSION="1.3.2"
 CATEGORY="x-window"
 SHORT_DESC="Desktop-independent graphical login manager for X11."
 MAINTAINER="pankso@slitaz.org"
 DEPENDS="glibc-base gcc-lib-base expat fontconfig freetype util-linux-ng-uuid zlib \
 jpeg libpng xorg-libICE xorg-libSM xorg-libX11 xorg-libXau xorg-libXdmcp \
 xorg-libXext xorg-libXft xorg-libXmu xorg-libXrender xorg-libXt"
-BUILD_DEPENDS="xorg-dev jpeg-dev libpng-dev xorg-libXft-dev \ 
+BUILD_DEPENDS="xorg-dev jpeg-dev libpng-dev xorg-libXft-dev \
 zlib-dev freetype-dev fontconfig-dev"
 SUGGESTED="slim-theme-default slitaz-configs"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
@@ -21,18 +21,17 @@
 compile_rules()
 {
 	cd $src
-	patch -p0 < ../stuff/gcc44.patch || exit 1
-	sed -i "s|/usr/X11R6/include|/usr/include/xorg|g" Makefile
-	sed -i "s|/usr/X11R6/|/usr/|g" Makefile
-	make
+	make &&
+	make DESTDIR=$src/_pkg install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/bin $fs/usr/share/slim
-	cp -a $src/slim $fs/usr/bin
+	mkdir -p $fs/usr/share/slim
 	cp -a stuff/themes $fs/usr/share/slim
+	cp -a $_pkg/usr/bin $fs/usr
+
 	# Config file and rc script.
 	cp -a stuff/etc $fs
 	chown -R root.root $fs