Merge branch 'master' into f19

.gitignore

@@ -24,3 +24,4 @@
 /util-linux-2.22.2.tar.xz
 /util-linux-2.23-rc1.tar.xz
 /util-linux-2.23-rc2.tar.xz
+/util-linux-2.23.tar.xz

sources

@@ -1 +1 @@
-abf3d68b534237b9c336dd5bfbf058d9  util-linux-2.23-rc2.tar.xz
+cf5e9bb402371beaaffc3a5f276d5783  util-linux-2.23.tar.xz

util-linux.spec

@@ -2,12 +2,12 @@
 Summary: A collection of basic system utilities
 Name: util-linux
 Version: 2.23
-Release: 0.6%{?dist}
+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
 
-%define upstream_version %{version}-rc2
+%define upstream_version %{version}
 
 ### Macros
 %define cytune_archs %{ix86} alpha %{arm}
@@ -77,10 +77,6 @@ Requires: libmount = %{version}-%{release}
 # 151635 - makeing /var/log/lastlog
 Patch3: util-linux-ng-2.22-login-lastlog.patch
 
-### upstream pathes (2.23)
-# 948274 - interruption code 0x4003B in libmount.so.1.1.0
-Patch100: 0001-libmount-fix-mount.nfs-segfault-rely-on-assert-rathe.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
@@ -234,6 +230,14 @@ make %{?_smp_mflags}
 # build nologin
 gcc $CFLAGS -o nologin nologin.c
 
+
+%check
+#to run tests use "--with check"
+%if %{?_with_check:1}%{!?_with_check:0}
+make check
+%endif
+
+
 %install
 rm -rf ${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
@@ -788,6 +792,13 @@ fi
 %{_libdir}/pkgconfig/uuid.pc
 
 %changelog
+* Thu Apr 25 2013 Karel Zak <kzak@redhat.com> 2.23-1
+- upgrade to 2.23
+- add --with check to call make check
+
+* Mon Apr 15 2013 Karel Zak <kzak@redhat.com> 2.23-0.7
+- remove unused patches
+
 * Mon Apr 15 2013 Karel Zak <kzak@redhat.com> 2.23-0.6
 - remove floppy from util-linux