diff --git a/.gitignore b/.gitignore index 0d27901..df32d4a 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /util-linux-2.22-rc2.tar.xz /util-linux-2.22.tar.xz /util-linux-2.22.1.tar.xz +/util-linux-2.22.2.tar.xz diff --git a/sources b/sources index 5f146c9..e03cca9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -730cf9932531ed09b53a04ca30fcb4c9 util-linux-2.22.1.tar.xz +eeacbfdd2556acd899a2d0ffdb446185 util-linux-2.22.2.tar.xz a02aac97c74259ca1b24972c89147ca4 floppy-0.18.tar.bz2 diff --git a/util-linux.spec b/util-linux.spec index 61e50e4..321570d 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.22.1 -Release: 4%{?dist} +Version: 2.22.2 +Release: 1%{?dist} License: GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+ and BSD with advertising and Public Domain Group: System Environment/Base URL: http://en.wikipedia.org/wiki/Util-linux @@ -94,22 +94,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 - -### Upstream patches from proposed stable/v2.22.2 branch -### (remove after update to the final 2.22.2) -### -Patch101: 0001-libmount-don-t-use-umount-optimization-for-l-or-f.patch -Patch102: 0002-wipefs-use-O_EXCL.patch -Patch103: 0003-swapon-remove-loop-declaration-smatch-scan.patch -Patch104: 0004-libblkid-fix-compiler-warning-Wstrict-aliasing.patch -Patch105: 0005-mount-add-c-abbreviation-for-no-canonicalize-to-man-.patch -Patch106: 0006-mount-add-long-options-for-L-and-U-to-man-page.patch -Patch107: 0007-lib-loopdev-improve-debug-messages.patch -Patch108: 0008-lib-loopdev-check-for-sys.patch -Patch109: 0009-fsck.cramfs-compile-with-DINCLUDE_FS_TESTS-for-make-.patch -Patch110: 0010-login-fix-compiler-warning-Wunused-result.patch -Patch111: 0011-misc-make-readlink-usage-more-robust.patch - ### Upstream patches from master branch (will be v2.23) for su(1) and new ### runuser(1) implementation. This is required for the recent coreutils where ### is no more su(1). @@ -779,6 +763,9 @@ fi %changelog +* Thu Dec 13 2012 Karel Zak 2.22.2-1 +- upgrade to upstream maintenance release 2.22.2 + * Mon Nov 19 2012 Karel Zak 2.22.1-5 - sources cleanup