[packages/systemd/systemd-208] move binfmt-detector conflict to init package

[glen]

commit 24f2a36c9febcd329fb55a2de2aecffcc0e1f210
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sat Jan 24 16:52:22 2015 +0200

    move binfmt-detector conflict to init package
    
    as the conflict occours only if booted with systemd

 systemd.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/systemd.spec b/systemd.spec
index d3280f4..cc475c3 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -16,7 +16,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:	208
-Release:	11
+Release:	12
 Epoch:		1
 License:	GPL v2+ (udev), LGPL v2.1+ (the rest)
 Group:		Base
@@ -132,8 +132,6 @@ Provides:	group(systemd-journal)
 Provides:	udev-acl = %{epoch}:%{version}-%{release}
 Obsoletes:	systemd-no-compat-tmpfiles
 Obsoletes:	udev-systemd
-# systemd takes care of that and causes problems
-Conflicts:	binfmt-detector
 # sytemd wants pam with pam_systemd.so in system-auth...
 Conflicts:	pam < 1:1.1.5-5
 # ...and sudo hates it
@@ -262,6 +260,8 @@ Obsoletes:	readahead < 1:1.5.7-3
 Obsoletes:	virtual(init-daemon)
 Conflicts:	rc-scripts < 0.4.5.5-2
 Conflicts:	upstart
+# systemd takes care of that and causes problems
+Conflicts:	binfmt-detector
 
 %description init
 Install this package when you are ready to final switch to systemd.
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/systemd.git/commitdiff/24f2a36c9febcd329fb55a2de2aecffcc0e1f210