From 6ea8a8e0d7e9ca1c34988436a794211ff3ec12fc Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 13 May 2009 07:02:48 +0200
Subject: [PATCH] e2fsprogs: remove libuuid and libblkid related stuff.

They are available from different packages. Bump revisions.

--HG--
extra : convert_revision : bfe39956110f39a0bce726d208ada818fcff761e
---
 templates/e2fsprogs/depends        |  2 +-
 templates/e2fsprogs/devel.template |  1 +
 templates/e2fsprogs/libs.template  |  2 ++
 templates/e2fsprogs/template       | 13 +++++++++++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/templates/e2fsprogs/depends b/templates/e2fsprogs/depends
index d681ac6041b..fd5980f7863 100644
--- a/templates/e2fsprogs/depends
+++ b/templates/e2fsprogs/depends
@@ -1,2 +1,2 @@
-abi_depends=1.40
+abi_depends=1.41.5_1
 api_depends=${abi_depends}
diff --git a/templates/e2fsprogs/devel.template b/templates/e2fsprogs/devel.template
index 723b4576c6b..5b37e9a4704 100644
--- a/templates/e2fsprogs/devel.template
+++ b/templates/e2fsprogs/devel.template
@@ -5,6 +5,7 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
 Add_dependency run e2fsprogs-libs
 
 do_install()
diff --git a/templates/e2fsprogs/libs.template b/templates/e2fsprogs/libs.template
index 310e3277820..4d8cf1cbb1f 100644
--- a/templates/e2fsprogs/libs.template
+++ b/templates/e2fsprogs/libs.template
@@ -5,7 +5,9 @@ long_desc="${long_desc}
 
  This package contains the shared libraries."
 
+revision=1
 Add_dependency run glibc
+Add_dependency run libblkid
 
 do_install()
 {
diff --git a/templates/e2fsprogs/template b/templates/e2fsprogs/template
index 04b8d1e81fc..964047d8f7a 100644
--- a/templates/e2fsprogs/template
+++ b/templates/e2fsprogs/template
@@ -2,6 +2,7 @@
 pkgname=e2fsprogs
 sourcepkg=e2fsprogs
 version=1.41.5
+revision=1
 distfiles="$SOURCEFORGE_SITE/e2fsprogs/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--enable-htree --enable-elf-shlibs --enable-fsck
@@ -18,3 +19,15 @@ subpackages="devel libs"
 conf_files="/etc/mke2fs.conf"
 Add_dependency run glibc
 Add_dependency run e2fsprogs-libs
+
+post_install()
+{
+	# Remove stuff belonging to libblkid or libuuid pkgs.
+	find ${DESTDIR} -name \*blkid\* -o -name \*findfs\* | \
+		xargs rm -rf
+	rm -f ${DESTDIR}/lib/libuuid*
+	rm -f ${DESTDIR}/usr/share/man/man3/uuid*
+	rm -f ${DESTDIR}/usr/lib/libuuid*
+	rm -rf ${DESTDIR}/usr/include/uuid
+	rm -f ${DESTDIR}/usr/lib/pkgconfig/uuid*
+}