From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 7 Jan 2012 15:01:35 +0000 (+0100)
Subject: dbus-glib: Make package work on x86_64.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=173c1afd61761e87eea00c12b1bd5113f388ef2e;hp=1120d04beec2d002a0d47919a7191350dc895fe9;p=people%2Farne_f%2Fipfire-3.x.git

dbus-glib: Make package work on x86_64.
---

diff --git a/dbus-glib/dbus-glib.nm b/dbus-glib/dbus-glib.nm
index 8054c6d37..59d6680f4 100644
--- a/dbus-glib/dbus-glib.nm
+++ b/dbus-glib/dbus-glib.nm
@@ -5,7 +5,7 @@
 
 name       = dbus-glib
 version    = 0.94
-release    = 1
+release    = 2
 
 groups     = System/Libraries
 url        = http://www.freedesktop.org/software/dbus/
@@ -30,8 +30,8 @@ build
 
 	configure_options += \
 		--sysconfdir=/etc \
-		--libdir=/lib \
-		--libexecdir=/usr/lib \
+		--libdir=/%{lib} \
+		--libexecdir=%{libdir} \
 		--mandir=/usr/share/man
 
 	test
@@ -39,10 +39,10 @@ build
 	end
 
 	install_cmds
-		mv -v %{BUILDROOT}/lib/pkgconfig %{BUILDROOT}/usr/lib/
+		mv -v %{BUILDROOT}/%{lib}/pkgconfig %{BUILDROOT}%{libdir}
 
-		rm -vf %{BUILDROOT}/lib/libdbus-glib-1.so
-		ln -svf ../../lib/libdbus-glib-1.so.2 %{BUILDROOT}/usr/lib/libdbus-glib-1.so
+		rm -vf %{BUILDROOT}/%{lib}/libdbus-glib-1.so
+		ln -svf ../../%{lib}/libdbus-glib-1.so.2 %{BUILDROOT}%{libdir}/libdbus-glib-1.so
 	end
 end