util-linux: Make sure to replace util-linux-ng.

Also conflict with setup<3.0-2 because of /var/log/lastlog.

diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm
index f15a6fe0c4ea8ff1a9cc6378e06d69ea16c0dcae..d403c9b549657784108db25878042d2339f765c3 100644 (file)
--- a/util-linux/util-linux.nm
+++ b/util-linux/util-linux.nm
@@ -6,10 +6,9 @@
 name       = util-linux
 version    = 2.19
 major_ver  = 2.19
-release    = 2
+release    = 3
 
 groups     = System/Base
-#groups-%{name} = Base %{groups}
 url        = http://kernel.org/~kzak/util-linux/
 license    = GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 summary    = A collection of basic system utilities.
@@ -44,7 +43,6 @@ build
                --bindir=/bin \
                --sbindir=/sbin \
                --disable-wall \
-               --enable-arch \
                --enable-kill \
                --enable-login-utils \
                --enable-partx \
@@ -99,7 +97,18 @@ end
 
 packages
        package %{name}
-               requires = /etc/pam.d/system-auth
+               groups += Base
+
+               requires
+                       /etc/pam.d/system-auth
+               end
+
+               obsoletes = util-linux-ng
+
+               conflicts
+                       setup<3.0-2
+                       util-linux-ng
+               end
        end
        
        # Package information for libblkid