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

glen glen at pld-linux.org
Sat Jan 24 15:53:42 CET 2015


commit 1bb18b38cc095b954b33d82b6c1c03eb782c9d5f
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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/systemd.spec b/systemd.spec
index 5c02af3..dfa3047 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -143,8 +143,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
@@ -274,6 +272,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/1bb18b38cc095b954b33d82b6c1c03eb782c9d5f



More information about the pld-cvs-commit mailing list