|
|
@@ -2,8 +2,8 @@
|
|
|
Summary: A collection of basic system utilities
|
|
|
Summary(ja): 基本システムユーティリティー集
|
|
|
Name: util-linux
|
|
|
-Version: 2.22.1
|
|
|
-Release: 2%{?_dist_release}
|
|
|
+Version: 2.22.2
|
|
|
+Release: 1%{?_dist_release}
|
|
|
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
|
|
|
@@ -106,6 +106,7 @@ Conflicts: SysVinit-tools < 2.88dsf-2
|
|
|
Requires(preun): /sbin/install-info
|
|
|
Requires(post): /sbin/install-info
|
|
|
Requires(post): coreutils
|
|
|
+Requires(pre): coreutils
|
|
|
Requires: pam >= 0.66-4, /etc/pam.d/system-auth
|
|
|
Requires: libuuid = %{version}-%{release}
|
|
|
Requires: libblkid = %{version}-%{release}
|
|
|
@@ -140,20 +141,9 @@ Patch7: util-linux-ng-2.21-login-lastlog.patch
|
|
|
# 231192 - ipcs is not printing correct values on pLinux
|
|
|
Patch8: 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)
|
|
|
+### Upstream patches from proposed stable/v2.22.x branch
|
|
|
+### (remove after update to the final 2.22.3)
|
|
|
###
|
|
|
-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
|
|
|
@@ -353,18 +343,6 @@ cp %{SOURCE8} %{SOURCE9} .
|
|
|
%patch7 -p1
|
|
|
%patch8 -p1
|
|
|
|
|
|
-%patch101 -p1
|
|
|
-%patch102 -p1
|
|
|
-%patch103 -p1
|
|
|
-%patch104 -p1
|
|
|
-%patch105 -p1
|
|
|
-%patch106 -p1
|
|
|
-%patch107 -p1
|
|
|
-%patch108 -p1
|
|
|
-%patch109 -p1
|
|
|
-%patch110 -p1
|
|
|
-%patch111 -p1
|
|
|
-
|
|
|
%patch200 -p1
|
|
|
%patch201 -p1
|
|
|
%patch202 -p1
|
|
|
@@ -973,6 +951,10 @@ fi
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Jan 20 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 2.22.2-1
|
|
|
+- upadte to 2.22.2
|
|
|
+- add R(pre): coreutils to fix install order
|
|
|
+
|
|
|
* Wed Nov 28 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 2.22.1-2
|
|
|
- run autogen.sh before configure
|
|
|
- remove "* include postlogin" from su.pamd
|
daisuke