From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 7 Jan 2012 15:01:42 +0000 (+0100)
Subject: lvm2: Make package work on x86_64.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98583dbefe1b0ceb4cb1ec348fa71d0af769a0f4;p=ipfire-3.x.git

lvm2: Make package work on x86_64.
---

diff --git a/lvm2/lvm2.nm b/lvm2/lvm2.nm
index 5c033c0f3..302204348 100644
--- a/lvm2/lvm2.nm
+++ b/lvm2/lvm2.nm
@@ -3,9 +3,10 @@
 # Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
 ###############################################################################
 
-name       = LVM2
+name       = lvm2
 version    = 2.02.54
-release    = 1
+release    = 2
+thisapp    = LVM2.%{version}
 
 groups     = System/Base
 url        = http://sources.redhat.com/lvm2/
@@ -21,8 +22,6 @@ description
 	(kind of logical partitions) in volume groups.
 end
 
-thisapp    = %{name}.%{version}
-
 source_dl  =
 sources    = %{thisapp}.tgz
 
@@ -38,20 +37,19 @@ build
 		--bindir=/bin \
 		--sbindir=/sbin \
 		--exec-prefix=/ \
-		--libdir=/lib \
+		--libdir=/%{lib} \
 		--enable-pkgconfig
 
 	install_cmds
-		mkdir -pv %{BUILDROOT}/usr/lib
-		rm -vf %{BUILDROOT}/lib/libdevmapper.so
-		ln -svf libdevmapper.so.1.02 %{BUILDROOT}/lib/libdevmapper.so.1
-		ln -svf ../../lib/libdevmapper.so.1 %{BUILDROOT}/usr/lib/libdevmapper.so
+		mkdir -pv %{BUILDROOT}%{libdir}
+		rm -vf %{BUILDROOT}/%{lib}/libdevmapper.so
+		ln -svf libdevmapper.so.1.02 %{BUILDROOT}/%{lib}/libdevmapper.so.1
+		ln -svf ../../%{lib}/libdevmapper.so.1 %{BUILDROOT}%{libdir}/libdevmapper.so
 	end
 end
 
 packages
 	package %{name}
-	end
 
 	package libdevmapper
 		template LIBS