Merge remote branch 'nutyx-2009/master'

10 files changed, 47 insertions, 23 deletions

diff --git a/base/device-mapper/.footprint b/base/device-mapper/.footprint
index a0d581f74..8f9c44701 100644
--- a/base/device-mapper/.footprint
+++ b/base/device-mapper/.footprint
@@ -1,5 +1,6 @@
-drwxr-xr-x	root/root	sbin/
--rwxr-xr-x	root/root	sbin/dmsetup.static
+drwxr-xr-x	root/root	lib/
+lrwxrwxrwx	root/root	lib/libdevmapper.so -> libdevmapper.so.1.02
+-rwxr-xr-x	root/root	lib/libdevmapper.so.1.02
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/libdevmapper.h
diff --git a/base/device-mapper/.md5sum b/base/device-mapper/.md5sum
index ba597e8a0..dc22ca8a6 100644
--- a/base/device-mapper/.md5sum
+++ b/base/device-mapper/.md5sum
@@ -1 +1 @@
-c9ae0776994a419f9e1ba842164bb626  device-mapper.1.02.28.tgz
+0fdac768c78d96525d47b5a3df4c67de  LVM2.2.02.61.tgz
diff --git a/base/device-mapper/Pkgfile b/base/device-mapper/Pkgfile
index aa1d3ce54..e7163ed3a 100644
--- a/base/device-mapper/Pkgfile
+++ b/base/device-mapper/Pkgfile
@@ -4,24 +4,22 @@
 # Maintainer:   thierryn1 at hispeed dot ch
 
 name=device-mapper
-version=1.02.28
+version=2.02.61
 release=1
-source=(ftp://sources.redhat.com/pub/dm/device-mapper.$version.tgz)
+source=(ftp://sources.redhat.com/pub/lvm2/LVM2.$version.tgz)
 
 build() {
-	cd device-mapper.$version
+	cd LVM2.$version
 	./configure \
 	        --prefix=/usr \
         	--libdir=/lib \
 	        --mandir=/usr/share/man \
         	--sbindir=/sbin \
 	        --enable-pkgconfig \
-        	--disable-nls \
-	        --with-optimisation="$CFLAGS" \
-		--enable-static_link # Required for dmraid
-	make
-	make DESTDIR=$PKG install
+	        --with-optimisation="$CFLAGS"
+	make device-mapper
+	make DESTDIR=$PKG install_device-mapper
 	find $PKG -type f -exec chmod u+w {} \;
 	# Suppression des binaires, lib et man
-	rm -r $PKG/{lib,sbin/dmsetup,usr/share}
+	rm -r $PKG/{sbin,usr/share}
 }
diff --git a/base/lvm2/.footprint b/base/lvm2/.footprint
index 51555196b..fbe043cd9 100644
--- a/base/lvm2/.footprint
+++ b/base/lvm2/.footprint
@@ -8,18 +8,17 @@ drwx------	root/root	etc/rc.d/init.d/
 -rwxr-xr-x	root/root	etc/rc.d/init.d/lvmnodes
 drwx------	root/root	etc/rc.d/rcsysinit.d/
 lrwxrwxrwx	root/root	etc/rc.d/rcsysinit.d/S19lvmnodes -> ../init.d/lvmnodes
-drwxr-xr-x	root/root	lib/
-lrwxrwxrwx	root/root	lib/libdevmapper.so -> libdevmapper.so.1.02
--r-xr-xr-x	root/root	lib/libdevmapper.so.1.02
 drwxr-xr-x	root/root	sbin/
--r-xr-xr-x	root/root	sbin/dmsetup
+lrwxrwxrwx	root/root	sbin/dmsetup -> dmsetup.static
+-r-xr-xr-x	root/root	sbin/dmsetup.static
 -r-xr-xr-x	root/root	sbin/fsadm
 lrwxrwxrwx	root/root	sbin/lvchange -> lvm
 lrwxrwxrwx	root/root	sbin/lvconvert -> lvm
 lrwxrwxrwx	root/root	sbin/lvcreate -> lvm
 lrwxrwxrwx	root/root	sbin/lvdisplay -> lvm
 lrwxrwxrwx	root/root	sbin/lvextend -> lvm
--r-xr-xr-x	root/root	sbin/lvm
+lrwxrwxrwx	root/root	sbin/lvm -> lvm.static
+-r-xr-xr-x	root/root	sbin/lvm.static
 lrwxrwxrwx	root/root	sbin/lvmchange -> lvm
 lrwxrwxrwx	root/root	sbin/lvmdiskscan -> lvm
 -r-xr-xr-x	root/root	sbin/lvmdump
diff --git a/base/lvm2/Pkgfile b/base/lvm2/Pkgfile
index 7342b7996..1122e709c 100644
--- a/base/lvm2/Pkgfile
+++ b/base/lvm2/Pkgfile
@@ -2,11 +2,10 @@
 # URL: http://sourceware.org/lvm2/
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on:
 
 name=lvm2
 version=2.02.61
-release=1
+release=2
 source=(ftp://sources.redhat.com/pub/lvm2/LVM2.$version.tgz\
 	lvmnodes)
 build() {
@@ -15,6 +14,7 @@ build() {
 	./configure \
 		--prefix=/usr \
 		--exec-prefix= \
+		--enable-static-link \
 		--mandir=/usr/share/man \
 		--enable-lvm1_fallback \
 		--disable-readline
@@ -28,7 +28,10 @@ build() {
 	install -d -m 1777 $PKG/var/lock
 	install -d -m 0700 $PKG/var/lock/lvm
 	# devel in device-mapper
-	rm -r $PKG/usr/include
+	rm -r $PKG/{lib,usr/include}
+	rm $PKG/sbin/{lvm,dmsetup}
+	ln -s lvm.static $PKG/sbin/lvm
+	ln -s dmsetup.static $PKG/sbin/dmsetup
 }
 
 
diff --git a/extra/gparted/Pkgfile b/extra/gparted/Pkgfile
index 6cec55450..57692970f 100755
--- a/extra/gparted/Pkgfile
+++ b/extra/gparted/Pkgfile
@@ -6,7 +6,7 @@
 
 name=gparted
 version=0.5.1
-release=1
+release=2
 source=(http://downloads.sourceforge.net/$name/$name-$version.tar.bz2\
 	gparted.desktop)
 
diff --git a/extra/slim/Pkgfile b/extra/slim/Pkgfile
index 90b7cb015..c76a136e7 100644
--- a/extra/slim/Pkgfile
+++ b/extra/slim/Pkgfile
@@ -6,7 +6,7 @@
 
 name=slim
 version=1.3.1
-release=2
+release=3
 source=(http://download.berlios.de/$name/$name-$version.tar.gz\
 	http://kiao.no-ip.info/NuTyX/files/slimnutyx-2009.2.tar.gz
 	stdlib.patch xinitrc gcc44.patch \
diff --git a/extra/slim/xinitrc b/extra/slim/xinitrc
index fdd8e0673..62f4d752d 100644
--- a/extra/slim/xinitrc
+++ b/extra/slim/xinitrc
@@ -20,7 +20,7 @@ openbox)
                 eval `dbus-launch --sh-syntax --exit-with-session`
                 export DBUS_SESSION_BUS_ADDRESS
         fi
-	exec openbox
+	exec openbox-session
 	;;
 lxde)
         if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
diff --git a/test/awn-extras-applets/.md5sum b/test/awn-extras-applets/.md5sum
new file mode 100644
index 000000000..9adc86455
--- /dev/null
+++ b/test/awn-extras-applets/.md5sum
@@ -0,0 +1 @@
+100699188f2157346cecd0dce0ddab03  awn-extras-applets-0.3.2.2.tar.gz
diff --git a/test/awn-extras-applets/Pkgfile b/test/awn-extras-applets/Pkgfile
new file mode 100644
index 000000000..0c866a50d
--- /dev/null
+++ b/test/awn-extras-applets/Pkgfile
@@ -0,0 +1,22 @@
+# Description: Avant Window Navigator, a dock-like navigation bar for the X desktop.
+# URL: http://wiki.awn-project.org/
+# Maintainer: geantbrun at gmail dot com
+# Packager: geantbrun
+# Depends on: intltool glib gconf pycairo pygtk avant-window-navigator libsexy libnotify vte libgnomeui gnome-desktop libgtop libgnome-menu
+
+name=awn-extras-applets
+version=0.3.2.2
+release=1
+source=(http://launchpad.net/awn-extras/0.2/0.3.2.2/+download/awn-extras-applets-0.3.2.2.tar.gz)
+
+build() {
+	cd $name-$version
+
+	./autogen.sh
+
+	make
+	make DESTDIR=$PKG install
+	
+}
+
+