update to 2.21 final

OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=120

build-sys-fix-building-of-wall.patch

@@ -1,24 +0,0 @@
-From d47835cdd49af3fa13015eefbf3422b2faee8439 Mon Sep 17 00:00:00 2001
-From: Petr Uzel <petr.uzel@suse.cz>
-Date: Tue, 21 Feb 2012 15:59:29 +0100
-Subject: [PATCH] build-sys: fix building of wall
-
-
-Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
----
- configure.ac |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-Index: util-linux-2.21-rc2/configure.ac
-===================================================================
---- util-linux-2.21-rc2.orig/configure.ac
-+++ util-linux-2.21-rc2/configure.ac
-@@ -1035,7 +1035,7 @@ AC_ARG_ENABLE([wall],
-   AS_HELP_STRING([--disable-wall], [do not build wall]),
-   [], enable_wall=yes
- )
--UL_BUILD_INIT([wasll])
-+UL_BUILD_INIT([wall])
- AM_CONDITIONAL(BUILD_WALL, test "x$build_wall" = xyes)
- 
- 

cytune-fix-manpage-formatting.patch

@@ -1,31 +0,0 @@
-From 5ae8681e48c67a02baaa67c61801047cc3da1477 Mon Sep 17 00:00:00 2001
-From: Petr Uzel <petr.uzel@suse.cz>
-Date: Tue, 21 Feb 2012 16:18:55 +0100
-Subject: [PATCH] cytune.8: fix formatting
-
-W: manual-page-warning /usr/share/man/man8/cytune.8.gz 178: warning:
-macro `chars',' not defined (possibly missing space after `ch')
-
-Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
----
- sys-utils/cytune.8 |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sys-utils/cytune.8 b/sys-utils/cytune.8
-index 1c4de3e..fd82391 100644
---- a/sys-utils/cytune.8
-+++ b/sys-utils/cytune.8
-@@ -174,8 +174,8 @@ seconds.
- .SH BUGS
- If you run two copies of
- .B cytune
--at the same time to report statistics about the same port, the 'ints',
--'chars', and 'max' value will be reset and not reported correctly.
-+at the same time to report statistics about the same port, the 'ints', 'chars',
-+and 'max' value will be reset and not reported correctly.
- .B cytune
- should prevent this, but does not.
- .\" .SH AUTHOR
--- 
-1.7.7
-

fix-ac-init.patch

@@ -1,12 +0,0 @@
-Index: util-linux-2.21-rc2/configure.ac
-===================================================================
---- util-linux-2.21-rc2.orig/configure.ac
-+++ util-linux-2.21-rc2/configure.ac
-@@ -1,6 +1,4 @@
--AC_INIT(util-linux,
--	m4_esyscmd([tools/git-version-gen .tarball-version]),
--	kzak@redhat.com)
-+AC_INIT(util-linux, 2.21-rc2, kzak@redhat.com)
- 
- AC_PREREQ(2.60)
- 

util-linux.changes

@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Tue Feb 21 13:46:25 UTC 2012 - puzel@suse.com
 
-- update to util-linux-2.21-rc2 
+- update to util-linux-2.21
   chcpu(8):
     - new command
   prlimit(1):
@@ -47,9 +47,6 @@ Tue Feb 21 13:46:25 UTC 2012 - puzel@suse.com
   - drop util-linux-dmesg-fix-printing-of-multibyte-characters.patch
   - libmount-ignore-tailing-slash-in-netfs-source-paths.patch
   - libmount-fix-chdir-to-parent-for-restricted-user-umo.patch
-- add fix-ac-init.patch (fixes build)
-- add build-sys-fix-building-of-wall.patch
-- add cytune-fix-manpage-formatting.patch
 - update to adjtimex-1.29
 - use fdupes to symlink duplicate manpages
 - disabled make check for time (noop)

util-linux.spec

@@ -20,8 +20,6 @@
 %define which_ver 2.20
 %define adjtimex_ver 1.29
 
-%define tar_ver 2.21-rc2
-
 Name:           util-linux
 BuildRequires:  audit-devel
 BuildRequires:  fdupes
@@ -34,7 +32,7 @@ BuildRequires:  pam-devel
 BuildRequires:  pkg-config
 BuildRequires:  readline-devel
 BuildRequires:  zlib-devel
-Version:        2.20.92
+Version:        2.21
 Release:        0
 # util-linux is a base package and uuidd pre-requiring pwdutils pulls
 # that into the core build cycle.  pwdutils also pulls in the whole
@@ -52,7 +50,7 @@ Recommends:     %{name}-lang = %{version}
 Summary:        A collection of basic system utilities
 License:        GPL-2.0+
 Group:          System/Base
-Source:         ftp://ftp.kernel.org/pub/linux/utils/util-linux/v21/%{name}-%{tar_ver}.tar.bz2
+Source:         ftp://ftp.kernel.org/pub/linux/utils/util-linux/v21/%{name}-%{version}.tar.bz2
 Source1:        util-linux-rpmlintrc
 # XXX: make nologin part of login package
 Source2:        nologin.c
@@ -87,9 +85,6 @@ Source51:       blkid.conf
 Patch1:         util-linux-2.12r-fdisk_remove_bogus_warnings.patch
 Patch2:         util-linux-2.20-libmount-deps.patch
 Patch3:         fdisk-tinfo.patch
-Patch4:         fix-ac-init.patch
-Patch5:         build-sys-fix-building-of-wall.patch
-Patch6:         cytune-fix-manpage-formatting.patch
 
 ##
 ## adjtimex
@@ -182,13 +177,10 @@ Files to develop applications using the libmount library.
 
 %lang_package
 %prep
-%setup -q -n %{name}-%{tar_ver} -a 9 -b 11 -b 12 -b 13
+%setup -q -n %{name}-%{version} -a 9 -b 11 -b 12 -b 13
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 #
 cd adjtimex-*