From af89bc72f422f11b0a01e4e8eb3c86d1f45cfa2b Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 22 Apr 2010 15:45:43 +0200
Subject: [PATCH] lvm2: move so symlink into main pkg.

--HG--
extra : convert_revision : d683b521a2ac3070ecbb12a5f19ee790aa10c4ab
---
 srcpkgs/lvm2/device-mapper-devel.template | 3 ++-
 srcpkgs/lvm2/device-mapper.template       | 3 ++-
 srcpkgs/lvm2/liblvm2app-devel.template    | 2 ++
 srcpkgs/lvm2/liblvm2app.template          | 4 +++-
 srcpkgs/lvm2/template                     | 3 ++-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/lvm2/device-mapper-devel.template b/srcpkgs/lvm2/device-mapper-devel.template
index d6cc0b837cd..94f6c54f996 100644
--- a/srcpkgs/lvm2/device-mapper-devel.template
+++ b/srcpkgs/lvm2/device-mapper-devel.template
@@ -5,6 +5,8 @@ long_desc="
  This package contains the development files for the kernel device-mapper
  library, libdevmapper."
 
+revision=1
+
 Add_dependency run glibc-devel
 Add_dependency run readline-devel
 Add_dependency run ncurses-devel
@@ -13,7 +15,6 @@ Add_dependency run device-mapper
 do_install()
 {
 	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
 }
diff --git a/srcpkgs/lvm2/device-mapper.template b/srcpkgs/lvm2/device-mapper.template
index 1840fab0ad4..10201f0945b 100644
--- a/srcpkgs/lvm2/device-mapper.template
+++ b/srcpkgs/lvm2/device-mapper.template
@@ -5,6 +5,7 @@ long_desc="
  This package contains the supporting userspace utility, dmsetup,
  for the kernel device-mapper and its required library, libdevmapper."
 
+revision=1
 replaces="lvm2-device-mapper>=0"
 
 Add_dependency run glibc
@@ -15,6 +16,6 @@ do_install()
 {
 	mkdir -p ${DESTDIR}/sbin ${DESTDIR}/lib ${DESTDIR}/usr/share/man/man8
 	mv ${SRCPKGDESTDIR}/sbin/dm* ${DESTDIR}/sbin
-	mv ${SRCPKGDESTDIR}/lib/libdevmapper.so.* ${DESTDIR}/lib
+	mv ${SRCPKGDESTDIR}/lib/libdevmapper.so* ${DESTDIR}/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 44379088f8c..403cb010cbb 100644
--- a/srcpkgs/lvm2/liblvm2app-devel.template
+++ b/srcpkgs/lvm2/liblvm2app-devel.template
@@ -5,6 +5,8 @@ long_desc="
  This package contains files needed to develop applications that use the
  lvm2app library."
 
+revision=1
+
 Add_dependency run device-mapper-devel
 Add_dependency run liblvm2app
 
diff --git a/srcpkgs/lvm2/liblvm2app.template b/srcpkgs/lvm2/liblvm2app.template
index 0d6e62de352..ee2d62f6b52 100644
--- a/srcpkgs/lvm2/liblvm2app.template
+++ b/srcpkgs/lvm2/liblvm2app.template
@@ -6,11 +6,13 @@ long_desc="
  to the basic LVM objects and provides functions to enumerate, create or
  modify them."
 
+revision=1
+
 Add_dependency run glibc
 Add_dependency run device-mapper
 
 do_install()
 {
 	mkdir -p ${DESTDIR}/lib
-	mv ${SRCPKGDESTDIR}/lib/liblvm2app.so.* ${DESTDIR}/lib
+	mv ${SRCPKGDESTDIR}/lib/liblvm2app.so* ${DESTDIR}/lib
 }
diff --git a/srcpkgs/lvm2/template b/srcpkgs/lvm2/template
index 2d493fa489b..accbe4eef3e 100644
--- a/srcpkgs/lvm2/template
+++ b/srcpkgs/lvm2/template
@@ -1,7 +1,7 @@
 # Template file for 'lvm2'
 pkgname=lvm2
 version=2.02.62
-revision=1
+revision=2
 wrksrc=LVM2.${version}
 distfiles="ftp://sources.redhat.com/pub/lvm2/LVM2.${version}.tgz"
 build_style=gnu_configure
@@ -51,4 +51,5 @@ post_install()
 		ln -sf $(echo ../../lib/libdevmapper.so.*) libdevmapper.so
 	cd ${DESTDIR}/usr/lib && \
 		ln -sf $(echo ../../lib/liblvm2app.so.*) liblvm2app.so
+	chmod 755 ${DESTDIR}/lib/*.so* ${DESTDIR}/sbin/*
 }