# HG changeset patch
# User Rohit Joshi <jozee@slitaz.org>
# Date 1267699429 0
# Node ID efd761ce45946fca2638fc9cdfee86039587a956
# Parent  99d5f29bc4b6e397284b5ca7821df32b2422e71e
Up: lvm2; split libdevmapper from lvm2 now

diff -r 99d5f29bc4b6 -r efd761ce4594 libdevmapper-dev/receipt
--- a/libdevmapper-dev/receipt	Wed Mar 03 18:08:06 2010 +0000
+++ b/libdevmapper-dev/receipt	Thu Mar 04 10:43:49 2010 +0000
@@ -1,16 +1,18 @@
 # SliTaz package receipt.
 
 PACKAGE="libdevmapper-dev"
-VERSION="1.02.27"
+VERSION="1.02.44"
 CATEGORY="development"
 SHORT_DESC="Linux device mapper library development files."
 MAINTAINER="b1+slitaz@nagel.org"
-WANTED="libdevmapper"
+WANTED="lvm2"
+WANTED_VERSION="2.02.61"
 WEB_SITE="http://sourceware.org/dm/"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr
+	_pkg="$WOK/$WANTED/LVM2-$WANTED_VERSION/_pkg"
 	cp -a $_pkg/usr/include $fs/usr
 }
diff -r 99d5f29bc4b6 -r efd761ce4594 libdevmapper/receipt
--- a/libdevmapper/receipt	Wed Mar 03 18:08:06 2010 +0000
+++ b/libdevmapper/receipt	Thu Mar 04 10:43:49 2010 +0000
@@ -1,35 +1,22 @@
 # SliTaz package receipt.
 
 PACKAGE="libdevmapper"
-VERSION="1.02.27"
+VERSION="1.02.44"
 CATEGORY="system-tools"
 SHORT_DESC="Linux device mapper library."
 MAINTAINER="b1+slitaz@nagel.org"
 TARBALL="device-mapper.$VERSION.tgz"
 WEB_SITE="http://sourceware.org/dm/"
-WGET_URL="ftp://sources.redhat.com/pub/dm/$TARBALL"
-
-# Rules to configure and make the package.
-compile_rules()
-{
-	cd $WOK/$PACKAGE
-	mv device-mapper.$VERSION $PACKAGE-$VERSION
-	cd $src/lib
-	sed 's/(INSTALL) -D/(INSTALL)/' < Makefile.in > tmp
-	mv tmp Makefile.in
-	cd $src
-	./configure --prefix=/usr $CONFIGURE_ARGS
-	make
-	mkdir -p $src/_pkg/usr/lib
-	mkdir -p $src/_pkg/usr/include
-	cd $src/lib
-	make DESTDIR=$src/_pkg install
-}
+WANTED="lvm2"
+WANTED_VERSION="2.02.61"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib
-	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
-	strip -s $fs/usr/lib/*
+	mkdir -p $fs/usr/lib $fs/usr/sbin $fs/etc 
+	_pkg="$WOK/$WANTED/LVM2-$WANTED_VERSION/_pkg"
+	cp -a $_pkg/usr/lib/libdevmapper*.so* $fs/usr/lib
+	cp -a $_pkg/usr/sbin/dmsetup $fs/usr/sbin
+	cp -a $_pkg/etc/udev $fs/etc	
+	
 }
diff -r 99d5f29bc4b6 -r efd761ce4594 lvm2/receipt
--- a/lvm2/receipt	Wed Mar 03 18:08:06 2010 +0000
+++ b/lvm2/receipt	Thu Mar 04 10:43:49 2010 +0000
@@ -2,11 +2,11 @@
 
 PACKAGE="lvm2"
 SOURCE="LVM2"
-VERSION="2.02.51"
+VERSION="2.02.61"
 CATEGORY="system-tools"
 SHORT_DESC="Linux Logical Volume Manager."
 MAINTAINER="guillaume.michon@laposte.net"
-DEPENDS="readline linux-md libdevmapper ncurses"
+DEPENDS="readline linux-md libdevmapper"
 BUILD_DEPENDS="readline-dev"
 TARBALL="$SOURCE.$VERSION.tgz"
 WEB_SITE="http://sourceware.org/lvm2/"
@@ -24,18 +24,24 @@
 		--mandir=/usr/share/man \
 		--enable-cmdlib \
 		--enable-dmeventd \
+		--with-udevdir=/etc/udev/rules.d \
 		$CONFIGURE_ARGS &&
 	make && make DESTDIR=$PWD/_pkg install
+	cd $src/udev
+	make DESTDIR=$src/_pkg install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr/lib
-	cp -a $_pkg/etc $fs
+	mkdir -p $fs/usr/lib $fs/etc
+	cp -a $_pkg/etc/udev $fs/etc
 	cp -a $_pkg/usr/sbin $fs/usr
 	cp -a $_pkg/usr/lib/* $fs/usr/lib
-	rm $fs/usr/lib/libdevmapper.so*
+	# split libdevmapper
+	rm -f $fs/usr/lib/libdevmapper*.so*
+	rm -f $fs/usr/sbin/dmsetup
+
 }