packages: systemd/systemd.spec - conflicts binfmt-detector

[blues]

Author: blues                        Date: Sun Feb  5 21:30:39 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- conflicts binfmt-detector

---- Files affected:
packages/systemd:
   systemd.spec (1.105 -> 1.106) 

---- Diffs:

================================================================
Index: packages/systemd/systemd.spec
diff -u packages/systemd/systemd.spec:1.105 packages/systemd/systemd.spec:1.106
--- packages/systemd/systemd.spec:1.105	Sun Feb  5 00:48:46 2012
+++ packages/systemd/systemd.spec	Sun Feb  5 22:30:34 2012
@@ -85,6 +85,8 @@
 Suggests:	service(syslog)
 Suggests:	%{name}-no-compat-tmpfiles
 Provides:	udev-acl
+# systemd takes care of that and causes problems
+Conflicts:	binfmt-detector
 Conflicts:	upstart
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -682,6 +684,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.106  2012/02/05 21:30:34  blues
+- conflicts binfmt-detector
+
 Revision 1.105  2012/02/04 23:48:46  blues
 - suggests service(klogd) too
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/systemd/systemd.spec?r1=1.105&r2=1.106&f=u