From 38f37fde92fe215f7cf539aadffb105279148ddd Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Wed, 13 Apr 2016 13:43:52 +0200
Subject: [PATCH] 2.28-1: upgrade

---
 .gitignore                |  3 +++
 2.27-blkid-zfs-raid.patch | 13 -------------
 sources                   |  2 +-
 util-linux.spec           | 25 +++++++++++++++++++------
 4 files changed, 23 insertions(+), 20 deletions(-)
 delete mode 100644 2.27-blkid-zfs-raid.patch

diff --git a/.gitignore b/.gitignore
index f0b7163..9dec953 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,6 @@
 /util-linux-2.27-rc2.tar.xz
 /util-linux-2.27.tar.xz
 /util-linux-2.27.1.tar.xz
+/util-linux-2.28-rc1.tar.xz
+/util-linux-2.28-rc2.tar.xz
+/util-linux-2.28.tar.xz
diff --git a/2.27-blkid-zfs-raid.patch b/2.27-blkid-zfs-raid.patch
deleted file mode 100644
index 14f6926..0000000
--- a/2.27-blkid-zfs-raid.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up util-linux-2.27.1/libblkid/src/probe.c.kzak util-linux-2.27.1/libblkid/src/probe.c
-diff -up util-linux-2.27.1/libblkid/src/superblocks/zfs.c.kzak util-linux-2.27.1/libblkid/src/superblocks/zfs.c
---- util-linux-2.27.1/libblkid/src/superblocks/zfs.c.kzak	2015-11-02 10:07:34.567648465 +0100
-+++ util-linux-2.27.1/libblkid/src/superblocks/zfs.c	2015-11-18 12:13:32.716188023 +0100
-@@ -258,7 +258,7 @@ static int probe_zfs(blkid_probe pr, con
- const struct blkid_idinfo zfs_idinfo =
- {
- 	.name		= "zfs_member",
--	.usage		= BLKID_USAGE_RAID,
-+	.usage		= BLKID_USAGE_FILESYSTEM,
- 	.probefunc	= probe_zfs,
- 	.minsz		= 64 * 1024 * 1024,
- 	.magics		= BLKID_NONE_MAGIC
diff --git a/sources b/sources
index eb41972..12f80fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3cd2698d1363a2c64091c2dadc974647  util-linux-2.27.1.tar.xz
+e534e6ccc49107e5d31c329af798ef7d  util-linux-2.28.tar.xz
diff --git a/util-linux.spec b/util-linux.spec
index f6fd786..5865246 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.27.1
-Release: 2%{?dist}
+Version: 2.28
+Release: 1%{?dist}
 License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
 URL: http://en.wikipedia.org/wiki/Util-linux
@@ -88,8 +88,6 @@ Requires: libfdisk = %{version}-%{release}
 ###
 # 151635 - makeing /var/log/lastlog
 Patch0: 2.23-login-lastlog-create.patch
-# 1259745 - Can't start installation in Rawhide or F23 recent development images
-Patch1: 2.27-blkid-zfs-raid.patch
 
 %description
 The util-linux package contains a large variety of low-level system
@@ -255,7 +253,6 @@ written in the Python programming language to use the interface
 supplied by the libmount library to work with mount tables (fstab,
 mountinfo, etc) and mount filesystems.
 
-
 %prep
 %autosetup -p1 -n %{name}-%{upstream_version}
 
@@ -391,6 +388,9 @@ ln -sf /proc/mounts %{buildroot}/etc/mtab
 # remove static libs
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib{uuid,blkid,mount,smartcols,fdisk}.a
 
+# temporary remove to avoid conflicts with bash-completion pkg
+rm -f $RPM_BUILD_ROOT%{compldir}/{mount,umount}
+
 # find MO files
 %find_lang %name
 
@@ -531,6 +531,7 @@ exit 0
 %{_bindir}/lsipc
 %{_bindir}/lslocks
 %{_bindir}/lslogins
+%{_bindir}/lsns
 %{_bindir}/mcookie
 %{_bindir}/mesg
 %{_bindir}/more
@@ -632,7 +633,8 @@ exit 0
 %{_mandir}/man8/ldattach.8*
 %{_mandir}/man8/losetup.8*
 %{_mandir}/man8/lsblk.8*
-%{_mandir}/man8/lslocks.8.gz
+%{_mandir}/man8/lslocks.8*
+%{_mandir}/man8/lsns.8*
 %{_mandir}/man8/mkfs.8*
 %{_mandir}/man8/mkfs.cramfs.8*
 %{_mandir}/man8/mkfs.minix.8*
@@ -721,6 +723,7 @@ exit 0
 %{compldir}/getopt
 %{compldir}/hexdump
 %{compldir}/ionice
+%{compldir}/ipcmk
 %{compldir}/ipcrm
 %{compldir}/ipcs
 %{compldir}/isosize
@@ -733,6 +736,8 @@ exit 0
 %{compldir}/lscpu
 %{compldir}/lsipc
 %{compldir}/lslocks
+%{compldir}/lslogins
+%{compldir}/lsns
 %{compldir}/mcookie
 %{compldir}/mesg
 %{compldir}/mkfs
@@ -740,6 +745,7 @@ exit 0
 %{compldir}/mkfs.minix
 %{compldir}/mkswap
 %{compldir}/more
+#%{compldir}/mount
 %{compldir}/mountpoint
 %{compldir}/namei
 %{compldir}/nsenter
@@ -762,10 +768,12 @@ exit 0
 %{compldir}/setterm
 %{compldir}/su
 %{compldir}/swaplabel
+%{compldir}/swapoff
 %{compldir}/swapon
 %{compldir}/tailf
 %{compldir}/taskset
 %{compldir}/ul
+#%{compldir}/umount
 %{compldir}/unshare
 %{compldir}/utmpdump
 %{compldir}/uuidgen
@@ -896,6 +904,11 @@ exit 0
 %{_libdir}/python*/site-packages/libmount/*
 
 %changelog
+* Tue Apr 12 2016 Karel Zak <kzak@redhat.com> - 2.28-1
+- upgrade to stable v2.28
+  http://ftp.kernel.org/pub/linux/utils/util-linux/v2.28/v2.28-ReleaseNotes
+- add missing completion scripts
+
 * Wed Nov 18 2015 Karel Zak <kzak@redhat.com> - 2.27.1-2
 - fix #1259745 - Can't start installation in Rawhide or F23 recent development images