powertop: Update to 1.98.

[people/amarx/ipfire-3.x.git] / udev / udev.nm

diff --git a/udev/udev.nm b/udev/udev.nm
index 1629b1cea37195e7f259a876d6be114be291ed82..cede6b371bb0594f63425765100b6a8195fc9a88 100644 (file)
--- a/udev/udev.nm
+++ b/udev/udev.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = udev
-version    = 172
-release    = 4
+version    = 182
+release    = 3
 
 groups     = System/Base
 url        = ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
@@ -21,52 +21,69 @@ source_dl  = ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
 
 build
        requires
+               filesystem >= 002
                glib2-devel
+               gobject-introspection-devel
                gperf
                kbd
+               kmod-devel >= 5
                libacl-devel
+               libblkid-devel >= 2.20
                libselinux-devel
                libsepol-devel
                libuuid-devel
                libusb-compat-devel
+               libxslt
                pciutils
-               pkg-config
+               shadow-utils
+               systemd-units
                usbutils
        end
 
        configure_options += \
-               --exec-prefix="" \
-               --sbindir=/sbin \
-               --sysconfdir=/etc \
-               --libexecdir=/lib/udev \
-               --with-rootlibdir=/lib \
+               --libexecdir=%{prefix}/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}/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
-
-               # 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}
-       end
+               --with-systemdsystemunitdir=%{unitdir}
 end
 
 packages
        package %{name}
                groups += Base
+
+               requires
+                       hwdata
+                       systemd-units
+                       util-linux
+               end
+
+               conflicts
+                       filesystem < 002
+               end
+
+               script prein
+                       getent group cdrom >/dev/null || groupadd -g 11 cdrom || :
+                       getent group tape >/dev/null || groupadd -g 33 tape || :
+                       getent group dialout >/dev/null || groupadd -g 18 dialout || :
+                       getent group floppy >/dev/null || groupadd -g 19 floppy || :
+                       systemctl stop udev.service udev-control.socket udev-kernel.socket >/dev/null 2>&1 || :
+               end
+
+               script postin
+                       systemctl daemon-reload >/dev/null 2>&1 || :
+                       systemctl start udev.service >/dev/null 2>&1 || :
+               end
+
+               script postun
+                       systemctl daemon-reload >/dev/null 2>&1 || :
+               end
        end
 
        package lib%{name}
                template LIBS
+
+               conflicts
+                       filesystem < 002
+               end
        end
 
        package lib%{name}-devel