]> git.pld-linux.org Git - packages/systemd.git/commitdiff
move binfmt-detector conflict to init package auto/th/systemd-208-12
authorElan Ruusamäe <glen@delfi.ee>
Sat, 24 Jan 2015 14:52:22 +0000 (16:52 +0200)
committerElan Ruusamäe <glen@delfi.ee>
Sat, 24 Jan 2015 14:52:24 +0000 (16:52 +0200)
as the conflict occours only if booted with systemd

systemd.spec

index d3280f480fe415c90854ceb9f2bf8bd79bba11a5..cc475c3cf9ed729dcd79472b063c0b4a6fcbaf84 100644 (file)
@@ -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.
This page took 0.41981 seconds and 4 git commands to generate.