From 6ad124b68b4035913a1d480362b29ccb353adcf5 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 23 Apr 2010 13:54:39 +0200
Subject: [PATCH] lvm2: move so symlinks into main pkg.

--HG--
extra : convert_revision : bd98f45d4205f0b96984d51355ee299e3138d7f7
---
 srcpkgs/lvm2/device-mapper.template    | 6 ++++--
 srcpkgs/lvm2/liblvm2app-devel.template | 3 +--
 srcpkgs/lvm2/liblvm2app.template       | 5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/lvm2/device-mapper.template b/srcpkgs/lvm2/device-mapper.template
index 10201f0945..1db15f0e9c 100644
--- a/srcpkgs/lvm2/device-mapper.template
+++ b/srcpkgs/lvm2/device-mapper.template
@@ -5,7 +5,7 @@ long_desc="
  This package contains the supporting userspace utility, dmsetup,
  for the kernel device-mapper and its required library, libdevmapper."
 
-revision=1
+revision=2
 replaces="lvm2-device-mapper>=0"
 
 Add_dependency run glibc
@@ -14,8 +14,10 @@ Add_dependency run ncurses-libs
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/sbin ${DESTDIR}/lib ${DESTDIR}/usr/share/man/man8
+	mkdir -p ${DESTDIR}/sbin ${DESTDIR}/lib ${DESTDIR}/usr/share/man/man8 \
+		${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/sbin/dm* ${DESTDIR}/sbin
 	mv ${SRCPKGDESTDIR}/lib/libdevmapper.so* ${DESTDIR}/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/libdevmapper.so ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/share/man/man8/dm* ${DESTDIR}/usr/share/man/man8
 }
diff --git a/srcpkgs/lvm2/liblvm2app-devel.template b/srcpkgs/lvm2/liblvm2app-devel.template
index 403cb010cb..59b4d4e116 100644
--- a/srcpkgs/lvm2/liblvm2app-devel.template
+++ b/srcpkgs/lvm2/liblvm2app-devel.template
@@ -5,7 +5,7 @@ long_desc="
  This package contains files needed to develop applications that use the
  lvm2app library."
 
-revision=1
+revision=2
 
 Add_dependency run device-mapper-devel
 Add_dependency run liblvm2app
@@ -14,7 +14,6 @@ do_install()
 {
 	mkdir -p ${DESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/include
 	mv ${SRCPKGDESTDIR}/usr/include/lvm2app.h ${DESTDIR}/usr/include
-	mv ${SRCPKGDESTDIR}/usr/lib/liblvm2app.* ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/lvm2app* \
 		${DESTDIR}/usr/lib/pkgconfig
 }
diff --git a/srcpkgs/lvm2/liblvm2app.template b/srcpkgs/lvm2/liblvm2app.template
index ee2d62f6b5..9047b2eaa9 100644
--- a/srcpkgs/lvm2/liblvm2app.template
+++ b/srcpkgs/lvm2/liblvm2app.template
@@ -6,13 +6,14 @@ long_desc="
  to the basic LVM objects and provides functions to enumerate, create or
  modify them."
 
-revision=1
+revision=2
 
 Add_dependency run glibc
 Add_dependency run device-mapper
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/lib
+	mkdir -p ${DESTDIR}/lib ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/lib/liblvm2app.so* ${DESTDIR}/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/liblvm2app.so ${DESTDIR}/usr/lib
 }