]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
systemd: The main package needs to depend on -units of the same version.
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 12 Oct 2011 10:03:44 +0000 (12:03 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 12 Oct 2011 10:03:44 +0000 (12:03 +0200)
systemd/systemd.nm

index 9dac8a92bde1a7349c70bea28717b6b02a0c4f70..322aea359a0dcb61d60f8ee905d1a7f40e01cf17 100644 (file)
@@ -5,7 +5,7 @@
 
 name       = systemd
 version    = 36
-release    = 2
+release    = 3
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Base
@@ -18,8 +18,6 @@ description
        SysV and LSB init scripts.
 end
 
-conflicts += upstart
-
 source_dl  = http://cgit.freedesktop.org/systemd/snapshot/
 
 build
@@ -111,11 +109,13 @@ packages
                        dbus
                        python-cairo
                        python-dbus
+                       %{name}-units=%{thisver}
                        udev>=172
                        util-linux>=2.19
                end
 
                prerequires += authconfig
+               conflicts += upstart
 
                script postin
                        # Generate Machine ID.