|
|
@@ -2,8 +2,8 @@
|
|
|
Summary: A collection of basic system utilities
|
|
|
Summary(ja): 基本システムユーティリティー集
|
|
|
Name: util-linux-ng
|
|
|
-Version: 2.16
|
|
|
-Release: 3%{?_dist_release}
|
|
|
+Version: 2.17.1
|
|
|
+Release: 1%{?_dist_release}
|
|
|
License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
|
|
|
Group: System Environment/Base
|
|
|
URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng
|
|
|
@@ -83,6 +83,8 @@ Requires(preun): /sbin/install-info
|
|
|
Requires(post): /sbin/install-info
|
|
|
Requires(post): coreutils
|
|
|
Requires: pam >= 0.66-4, /etc/pam.d/system-auth
|
|
|
+Requires: libuuid = %{version}-%{release}
|
|
|
+Requires: libblkid = %{version}-%{release}
|
|
|
%if %{with_audit}
|
|
|
Requires: audit-libs >= 1.0.6
|
|
|
%endif
|
|
|
@@ -106,8 +108,6 @@ Patch2: util-linux-ng-2.13-floppy-generic.patch
|
|
|
|
|
|
### Fedora/RHEL specific patches -- need to die!
|
|
|
###
|
|
|
-# remove partitions
|
|
|
-Patch3: util-linux-ng-2.14-blockdev-rmpart.patch
|
|
|
# 199745 - Non-existant simpleinit(8) mentioned in ctrlaltdel(8)
|
|
|
Patch4: util-linux-ng-2.13-ctrlaltdel-man.patch
|
|
|
# /etc/blkid.tab --> /etc/blkid/blkid.tab
|
|
|
@@ -119,22 +119,9 @@ Patch5: util-linux-ng-2.16-blkid-cachefile.patch
|
|
|
Patch7: util-linux-ng-2.13-login-lastlog.patch
|
|
|
# 231192 - ipcs is not printing correct values on pLinux
|
|
|
Patch8: util-linux-ng-2.15-ipcs-32bit.patch
|
|
|
-
|
|
|
-### Upstream patches
|
|
|
-###
|
|
|
-# 513104 - blkid returns no fstype for ext2 device when ext2 module not loaded
|
|
|
-Patch9: util-linux-ng-2.16-libblkid-ext2.patch
|
|
|
-# 518572 - blkid requires ext2.ko to be decompressed on installation media
|
|
|
-Patch10: util-linux-ng-2.16-libblkid-compression.patch
|
|
|
-# 522718 - sfdisk -d /dev/xxx | sfdisk --force /dev/yyy fails when LANG is set
|
|
|
-Patch11: util-linux-ng-2.14-sfdisk-dump.patch
|
|
|
-# Swsuspend does not work
|
|
|
-Patch12: util-linux-ng-2.16-blkid-swsuspend.patch
|
|
|
-# 514413 - Extra spaces at the end of CD mount point
|
|
|
-Patch13: util-linux-ng-2.16-libblkid-joliet.patch
|
|
|
-# 519237 - bash: cannot set terminal process group (-1): Inappropriate ioctl for device
|
|
|
-Patch14: util-linux-ng-2.16-switchroot-tty.patch
|
|
|
-
|
|
|
+# 533874 - RFE: libblkid should allow the developer to ask for
|
|
|
+# scanning of slow devices (eg. cdroms)
|
|
|
+Patch9: util-linux-ng-2.17-blkid-removable.patch
|
|
|
|
|
|
%description
|
|
|
The util-linux-ng package contains a large variety of low-level system
|
|
|
@@ -268,17 +255,11 @@ cp %{SOURCE8} %{SOURCE9} .
|
|
|
%patch0 -p1
|
|
|
%patch1 -p1
|
|
|
%patch2 -p1
|
|
|
-%patch3 -p1
|
|
|
%patch4 -p1
|
|
|
%patch5 -p1
|
|
|
%patch7 -p1
|
|
|
%patch8 -p1
|
|
|
%patch9 -p1
|
|
|
-%patch10 -p1
|
|
|
-%patch11 -p1
|
|
|
-%patch12 -p1
|
|
|
-%patch13 -p1
|
|
|
-%patch14 -p1
|
|
|
|
|
|
|
|
|
%build
|
|
|
@@ -790,6 +771,12 @@ fi
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Mon Apr 12 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.17.1-1
|
|
|
+- new upstream release
|
|
|
+- add R: libuuid = %{version}-%{release}, libblkid = %{version}-%{release}
|
|
|
+- remove Patch3, Patch9-14 (merged in upstream)
|
|
|
+- add Patch9
|
|
|
+
|
|
|
* Thu Feb 11 2010 NAKAMURA Kenta <kenta@vinelinux.org> - 2.16-3
|
|
|
- added compat32-libuuid packages for x86_64 arch support
|
|
|
- added BuildRequires: popt-devel
|
daisuke