From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 9 Nov 2011 18:37:28 +0000 (+0100)
Subject: util-linux: Update to 2.20.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a10c58dc50d5f894241c48596dcd714a4b49781e;p=ipfire-3.x.git

util-linux: Update to 2.20.
---

diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm
index 36ab421cf..7c1c55828 100644
--- a/util-linux/util-linux.nm
+++ b/util-linux/util-linux.nm
@@ -4,9 +4,9 @@
 ###############################################################################
 
 name       = util-linux
-version    = 2.19
-major_ver  = 2.19
-release    = 7
+major_ver  = 2.20
+version    = %{major_ver}
+release    = 1
 
 groups     = System/Base
 url        = http://kernel.org/~kzak/util-linux/
@@ -103,6 +103,7 @@ packages
 		conflicts
 			setup<3.0-2
 			util-linux-ng
+			sysvinit<=2.86-2
 		end
 
 		preprequires += coreutils