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

udev: Make package work on x86_64.
---

diff --git a/udev/udev.nm b/udev/udev.nm
index 1629b1cea..8d2eadb32 100644
--- a/udev/udev.nm
+++ b/udev/udev.nm
@@ -5,7 +5,7 @@
 
 name       = udev
 version    = 172
-release    = 4
+release    = 5
 
 groups     = System/Base
 url        = ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
@@ -38,25 +38,22 @@ build
 		--exec-prefix="" \
 		--sbindir=/sbin \
 		--sysconfdir=/etc \
-		--libexecdir=/lib/udev \
-		--with-rootlibdir=/lib \
+		--libexecdir=/%{lib}/udev \
+		--with-rootlibdir=/%{lib} \
 		--with-selinux \
 		--disable-introspection \
 		--with-systemdsystemunitdir=/lib/systemd/system
 
 	install_cmds
-		# Install pkg-config files correctly
-		mv -v %{BUILDROOT}/lib/pkgconfig %{BUILDROOT}/usr/lib
+		rm -vf %{BUILDROOT}/%{lib}/lib{udev,gudev-1.0}.so
+		ln -svf ../../%{lib}/libudev.so.0 %{BUILDROOT}%{libdir}/libudev.so
+		ln -svf ../../%{lib}/libgudev-1.0.so.0 %{BUILDROOT}%{libdir}/libgudev-1.0.so
 
-		rm -vf %{BUILDROOT}/lib/lib{udev,gudev-1.0}.so
-		ln -svf ../../lib/libudev.so.0 %{BUILDROOT}/usr/lib/libudev.so
-		ln -svf ../../lib/libgudev-1.0.so.0 %{BUILDROOT}/usr/lib/libgudev-1.0.so
-
-		ln -svf ../../../../lib/udev/udev-acl \
-			%{BUILDROOT}/usr/lib/ConsoleKit/run-seat.d/udev-acl.ck
+		# We do not use ConsoleKit
+		rm -rf %{BUILDROOT}/usr/lib*/ConsoleKit
 
 		# Remove network rules. We have our own in the network package.
-		rm -v %{BUILDROOT}/lib/udev/{write_net_rules,rules.d/75-persistent-net-generator.rules}
+		rm -v %{BUILDROOT}/%{lib}/udev/{write_net_rules,rules.d/75-persistent-net-generator.rules}
 	end
 end