- don't use name macro in trigger conditions

[packages/systemd.git] / systemd.spec

diff --git a/systemd.spec b/systemd.spec
index 769d705df163f07a879d4500ec0bedb7f0336b1e..87a56f5a93196ea98eba2695410c073e3b44652f 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -39,7 +39,7 @@ Summary(pl.UTF-8):    systemd - zarządca systemu i usług dla Linuksa
 Name:          systemd
 # Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often)
 Version:       183
-Release:       0.3
+Release:       0.7
 Epoch:         1
 License:       GPL v2+
 Group:         Base
@@ -77,6 +77,8 @@ Patch7:               udev-uClibc.patch
 Patch8:                udev-ploop-rules.patch
 Patch9:                udevlibexecdir.patch
 Patch10:       static-udev.patch
+Patch11:       systemd-udev-service.patch
+Patch12:       udevadm-in-sbin.patch
 URL:           http://www.freedesktop.org/wiki/Software/systemd
 BuildRequires: acl-devel
 %{?with_audit:BuildRequires:   audit-libs-devel}
@@ -544,6 +546,8 @@ initrd.
 %endif
 %patch8 -p1
 %patch9 -p1
+%patch11 -p1
+%patch12 -p1
 cp -p %{SOURCE2} src/systemd_booted.c
 
 %{__mv} src/udev/keymap/keyboard-force-release.sh{,.in}
@@ -822,7 +826,7 @@ if [ $1 -ge 1 ]; then
        /bin/systemctl daemon-reload > /dev/null 2>&1 || :
 fi
 
-%triggerpostun units -- %{name}-units < 43-7
+%triggerpostun units -- systemd-units < 43-7
 # Remove design fialures
 rm -f %{_sysconfdir}/systemd/system/network.target.wants/ifcfg@*.service >/dev/null 2>&1 || :
 rm -f %{_sysconfdir}/systemd/system/network.target.wants/network-post.service >/dev/null 2>&1 || :
@@ -853,25 +857,26 @@ fi
 %triggerpostun -n udev-core -- udev < 165
 /sbin/udevadm info --convert-db
 
-%triggerpostun -n udev-core -- %{name}-core < 1:175-4
-%systemd_trigger udev-settle.service
+%triggerpostun -n udev-core -- udev-core < 1:183
+/bin/systemctl --quiet enable systemd-udev-settle.service || :
+%{__rm} -f /etc/systemd/system/basic.target.wants/udev-settle.service || :
 
 %post -n udev-core
 if [ $1 -gt 1 ]; then
        if [ ! -x /bin/systemd_booted ] || ! /bin/systemd_booted; then
                if grep -qs devtmpfs /proc/mounts && [ -n "$(pidof udevd)" ]; then
                        /sbin/udevadm control --exit
-                       /lib/udev/udevd --daemon
+                       /lib/systemd/systemd-udevd --daemon
                fi
        else
                SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog \
-               /bin/systemctl --quiet try-restart udev.service || :
+               /bin/systemctl --quiet try-restart systemd-udev.service || :
        fi
 fi
-%systemd_post udev-settle.service
+%systemd_post systemd-udev-settle.service
 
 %preun -n udev-core
-%systemd_preun udev-settle.service
+%systemd_preun systemd-udev-settle.service
 
 %postun -n udev-core
 %systemd_reload
@@ -1073,6 +1078,7 @@ fi
 %{systemdunitdir}/*.socket
 %{systemdunitdir}/*.target
 %{systemdunitdir}/*.timer
+%exclude %{systemdunitdir}/systemd-udev*.*
 %if %{with plymouth}
 %exclude %{systemdunitdir}/plymouth*.service
 %exclude %{systemdunitdir}/systemd-ask-password-plymouth.*
@@ -1279,8 +1285,6 @@ fi
 %{_mandir}/man8/udevadm.8*
 %{_mandir}/man8/udevd.8*
 
-#{systemdunitdir}/basic.target.wants/udev-trigger.service
-#{systemdunitdir}/basic.target.wants/udev.service
 %{systemdunitdir}/sockets.target.wants/systemd-udev-control.socket
 %{systemdunitdir}/sockets.target.wants/systemd-udev-kernel.socket
 %{systemdunitdir}/systemd-udev-control.socket