From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 5 Apr 2012 17:12:03 +0000 (+0200)
Subject: dbus: Move libs to /usr.
X-Git-Url: http://git.ipfire.org/?p=ipfire-3.x.git;a=commitdiff_plain;h=278ecf9f4c5028ce21cc23fe8d416f3fc3c48da8

dbus: Move libs to /usr.
---

diff --git a/dbus/dbus.nm b/dbus/dbus.nm
index 6bfd2ea6b..168e61f37 100644
--- a/dbus/dbus.nm
+++ b/dbus/dbus.nm
@@ -5,7 +5,7 @@
 
 name       = dbus
 version    = 1.4.16
-release    = 2
+release    = 3
 
 groups     = System/Daemons
 url        = http://www.freedesktop.org/software/dbus/
@@ -29,29 +29,10 @@ build
 	end
 
 	configure_options += \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--libdir=/%{lib} \
-		--libexecdir=/%{lib} \
 		--enable-libaudit \
 		--enable-selinux=yes \
 		--with-systemdsystemunitdir=/lib/systemd/system/ \
 		--with-dbus-user=dbus
-
-	install_cmds
-		mkdir -pv %{BUILDROOT}%{libdir}
-		mv -v %{BUILDROOT}/%{lib}/pkgconfig %{BUILDROOT}%{libdir}
-
-		#change the arch-deps.h include directory to /usr/lib instead of /lib
-		sed -e 's@-I${libdir}@-I${prefix}/%{lib}@' -i %{BUILDROOT}%{libdir}/pkgconfig/dbus-1.pc
-
-		mkdir -pv %{BUILDROOT}%{libdir}/dbus-1.0/include
-		mv -v %{BUILDROOT}/%{lib}/dbus-1.0/include/* %{BUILDROOT}%{libdir}/dbus-1.0/include
-		rm -rvf %{BUILDROOT}/%{lib}/dbus-1.0
-
-		rm -vf %{BUILDROOT}/%{lib}/libdbus-1.so
-		ln -svf ../../%{lib}/libdbus-1.so.3 %{BUILDROOT}%{libdir}/libdbus-1.so
-	end
 end
 
 packages
@@ -99,7 +80,7 @@ packages
 	package %{name}-devel
 		template DEVEL
 
-		files += /usr/lib/dbus-1.0
+		files += %{libdir}/dbus-1.0
 	end
 
 	package %{name}-debuginfo