From c8f746bc9663033133681339f5cc6817e3633213f86621adca8265da0d7b8ef2 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Thu, 13 Mar 2014 16:12:50 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=557 --- systemd-mini.changes | 6 ++++++ systemd-mini.spec | 2 +- systemd.changes | 6 ++++++ systemd.spec | 5 +++-- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index ffb3d9de..aa4dc952 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 13 15:43:19 UTC 2014 - werner@suse.de + +- Avoid file conflict between udev and systemd (bnc# 868230) + + ------------------------------------------------------------------- Wed Mar 12 16:52:09 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index 4f4f7966..d253f72d 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -1105,7 +1105,7 @@ exit 0 %dir %{_prefix}/lib/systemd/user %dir %{_prefix}/lib/systemd/system %exclude %{_prefix}/lib/systemd/system/systemd-udev*.* -%exclude %{_prefix}/lib/systemd/system/udev.service +%exclude %{_prefix}/lib/systemd/system/*udev*.service %exclude %{_prefix}/lib/systemd/system/systemd-udev-root-symlink.service %exclude %{_prefix}/lib/systemd/system/*.target.wants/systemd-udev*.* %exclude %{_prefix}/lib/systemd/system/basic.target.wants/systemd-udev-root-symlink.service diff --git a/systemd.changes b/systemd.changes index ffb3d9de..aa4dc952 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 13 15:43:19 UTC 2014 - werner@suse.de + +- Avoid file conflict between udev and systemd (bnc# 868230) + + ------------------------------------------------------------------- Wed Mar 12 16:52:09 UTC 2014 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index 90eb3c3a..77d3e29f 100644 --- a/systemd.spec +++ b/systemd.spec @@ -625,7 +625,8 @@ cp %{SOURCE7} m4/ %patch1023 -p1 %patch1999 -p1 %patch2000 -p1 -%patch2001 -p1 +## DISABLED ... does not work even on little endian +##%patch2001 -p1 # udev patches %patch1034 -p0 %patch1035 -p0 @@ -1100,7 +1101,7 @@ exit 0 %dir %{_prefix}/lib/systemd/user %dir %{_prefix}/lib/systemd/system %exclude %{_prefix}/lib/systemd/system/systemd-udev*.* -%exclude %{_prefix}/lib/systemd/system/udev.service +%exclude %{_prefix}/lib/systemd/system/*udev*.service %exclude %{_prefix}/lib/systemd/system/systemd-udev-root-symlink.service %exclude %{_prefix}/lib/systemd/system/*.target.wants/systemd-udev*.* %exclude %{_prefix}/lib/systemd/system/basic.target.wants/systemd-udev-root-symlink.service