update to 2.20.1, enable audit, add C: SysVinit-tools<2.88dsf-2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5723 ec354946-7b23-47d6-9f5a-488ba84defc7

u/util-linux/util-linux-vl.spec

@@ -2,7 +2,7 @@
 Summary: A collection of basic system utilities
 Summary(ja): 基本システムユーティリティー集
 Name: util-linux
-Version: 2.19
+Version: 2.20.1
 Release: 1%{?_dist_release}
 License: GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 Group: System Environment/Base
@@ -11,7 +11,7 @@ URL: http://kernel.org/~kzak/util-linux/
 ### Features
 %define include_raw 0
 %define with_selinux 0
-%define with_audit 0
+%define with_audit 1
 %define mtab_symlink 1
 
 ### Macros
@@ -40,7 +40,7 @@ BuildRequires: popt-devel
 BuildRequires: libutempter-devel
 
 ### Sources
-Source0: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/%{name}-%{version}.tar.bz2
+Source0: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.20/%{name}-%{version}.tar.xz
 Source1: util-linux-ng-login.pamd
 Source5: util-linux-ng-login-noselinux.pamd
 Source2: util-linux-ng-remote.pamd
@@ -81,6 +81,9 @@ Provides: setarch = %{version}-%{release}
 # libblkid, blkid, findfs is moved from e2fsprogs
 Conflicts: e2fsprogs < 1.41.5
 
+# mountpoint is moved from SysVinit-tools
+Conflicts: SysVinit-tools < 2.88dsf-2
+
 Requires(preun): /sbin/install-info
 Requires(post): /sbin/install-info
 Requires(post): coreutils
@@ -100,12 +103,16 @@ Requires: udev
 Requires(post,preun): alternatives
 Provides: pager
 
+Distribution: Vine Linux
+Vendor: Project Vine
+Packager: daisuke
+
 ### Floppy patches (Fedora/RHEL specific)
 ###
 # add a missing header
 Patch0: util-linux-2.19-floppy-locale.patch
 # add note about ATAPI IDE floppy to fdformat.8
-Patch1: util-linux-ng-2.13-fdformat-man-ide.patch
+Patch1: util-linux-2.20-fdformat-man-ide.patch
 # 169628 - /usr/bin/floppy doesn't work with /dev/fd0
 Patch2: util-linux-2.19-floppy-generic.patch
 
@@ -114,14 +121,14 @@ Patch2: util-linux-2.19-floppy-generic.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
-Patch5: util-linux-ng-2.16-blkid-cachefile.patch
+Patch5: util-linux-2.20-blkid-cachefile.patch
 
 ### Ready for upstream?
 ###
 # 151635 - makeing /var/log/lastlog
 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
+Patch8: util-linux-2.20-ipcs-32bit.patch
 
 %description
 The util-linux-ng package contains a large variety of low-level system
@@ -321,6 +328,7 @@ export SUID_LDFLAGS="-pie"
 	--enable-login-utils \
 	--enable-kill \
 	--enable-write \
+	--enable-ddate \
 %if %{include_raw}
 	--enable-raw \
 %endif
@@ -607,6 +615,7 @@ fi
 /bin/kill
 /bin/lsblk
 /bin/more
+/bin/mountpoint
 /bin/taskset
 
 /sbin/addpart
@@ -700,6 +709,7 @@ fi
 %{_mandir}/man1/mcookie.1*
 %{_mandir}/man1/more.1*
 %{_mandir}/man1/namei.1*
+%{_mandir}/man1/mountpoint.1*
 %{_mandir}/man1/readprofile.1*
 %{_mandir}/man1/rename.1*
 %{_mandir}/man1/renice.1*
@@ -715,6 +725,7 @@ fi
 %{_mandir}/man1/uuidgen.1*
 %{_mandir}/man1/whereis.1*
 %{_mandir}/man1/write.1*
+%{_mandir}/ru/man1/ddate.1.gz
 
 %{_mandir}/man5/fstab.5*
 
@@ -841,6 +852,7 @@ fi
 %{_mandir}/man3/uuid_generate.3*
 %{_mandir}/man3/uuid_generate_random.3*
 %{_mandir}/man3/uuid_generate_time.3*
+%{_mandir}/man3/uuid_generate_time_safe.3*
 %{_mandir}/man3/uuid_is_null.3*
 %{_mandir}/man3/uuid_parse.3*
 %{_mandir}/man3/uuid_time.3*
@@ -871,6 +883,11 @@ fi
 %endif
 
 %changelog
+* Tue Feb 21 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 2.20.1-1
+- update to 2.20.1
+- enable audit
+- provide mountpoint (conflicts: SysVinit-tools < 2.88dsf-2)
+
 * Sat Mar 19 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.19-1
 - new upstream release
 - rename again to util-linux