[util-linux/f17] 2.21.1-1: upgrade to stable release

[kzak]

commit 1fbd38ec35010f2011a37b32659f19e088f6a202
Author: Karel Zak <kzak at redhat.com>
Date:   Fri Mar 30 13:48:09 2012 +0200

    2.21.1-1: upgrade to stable release
    
    Signed-off-by: Karel Zak <kzak at redhat.com>

 .gitignore                               |    1 +
 sources                                  |    2 +-
 util-linux-2.21-canonicalize-slash.patch |   37 --------------------
 util-linux-2.21-libmount-NFS.patch       |   34 ------------------
 util-linux-2.21-libmount-empty.patch     |   48 --------------------------
 util-linux-2.21-libmount-fstab.patch     |   27 --------------
 util-linux-2.21-mount-a.patch            |   55 ------------------------------
 util-linux.spec                          |   22 +++---------
 8 files changed, 7 insertions(+), 219 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3e7f767..e27a90a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /util-linux-2.20.1.tar.bz2
 /util-linux-2.21-rc2.tar.xz
 /util-linux-2.21.tar.xz
+/util-linux-2.21.1.tar.xz
diff --git a/sources b/sources
index 75b605a..d4c2bff 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 a02aac97c74259ca1b24972c89147ca4  floppy-0.18.tar.bz2
-208aa058f4117759d2939d1be7d662fc  util-linux-2.21.tar.xz
+ad602dcd528f340b1329cfa6200d8f80  util-linux-2.21.1.tar.xz
diff --git a/util-linux.spec b/util-linux.spec
index cc43da2..38d6bca 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -1,8 +1,8 @@
 ### Header
 Summary: A collection of basic system utilities
 Name: util-linux
-Version: 2.21
-Release: 2%{?dist}
+Version: 2.21.1
+Release: 1%{?dist}
 License: GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: http://kernel.org/~kzak/util-linux/
@@ -77,16 +77,6 @@ Patch3: util-linux-ng-2.21-login-lastlog.patch
 # 231192 - ipcs is not printing correct values on pLinux
 Patch4: util-linux-2.21-ipcs-32bit.patch
 
-# 797216 - f17 cannot mount filesystem at boot time systemd refuses
-Patch5: util-linux-2.21-libmount-fstab.patch
-Patch6: util-linux-2.21-canonicalize-slash.patch
-
-Patch7: util-linux-2.21-mount-a.patch
-Patch8: util-linux-2.21-libmount-NFS.patch
-# 797438 - systemd always fails systemd-remount-api-vfs.service
-Patch9: util-linux-2.21-libmount-empty.patch
-
-
 %description
 The util-linux package contains a large variety of low-level system
 utilities that are necessary for a Linux system to function. Among
@@ -202,11 +192,6 @@ cp %{SOURCE8} %{SOURCE9} .
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
 
 %build
 unset LINGUAS || :
@@ -722,6 +707,9 @@ fi
 
 
 %changelog
+* Fri Mar 30 2012 Karel Zak <kzak at redhat.com> 2.21.1-1
+- upgrade to bugfix release 2.21.1
+
 * Thu Mar 01 2012 Michal Luscon <mluscon at redhat.com> 2.21-2
 - fix #797216 - cannot mount filesystem at boot time systemd refuses
 - fix #797438 - systemd always fails systemd-remount-api-vfs.service