rpms/coreutils
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed nonversioned obsolete of mktemp, some requested manpages improvements

Browse Source
This commit is contained in:
Ondrej Vasik 2008-01-28 15:18:19 +00:00
parent 0629e270fb
commit 2c1a19b394
2 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
coreutils-6.10-manpages.patch Normal file
View File

@ -0,0 +1,34 @@
diff -urp coreutils-6.10-orig/man/md5sum.1 coreutils-6.10/man/md5sum.1
--- coreutils-6.10-orig/man/md5sum.1 2008-01-28 14:33:16.000000000 +0100
+++ coreutils-6.10/man/md5sum.1 2008-01-28 14:54:29.000000000 +0100
@@ -19,6 +19,7 @@ read MD5 sums from the FILEs and check t
.TP
\fB\-t\fR, \fB\-\-text\fR
read in text mode (default)
+Note: There is no difference between binary and text mode on GNU system.
.SS "The following two options are useful only when verifying checksums:"
.TP
\fB\-\-status\fR
diff -urp coreutils-6.10-orig/man/sort.1 coreutils-6.10/man/sort.1
--- coreutils-6.10-orig/man/sort.1 2008-01-28 14:33:17.000000000 +0100
+++ coreutils-6.10/man/sort.1 2008-01-28 16:02:28.000000000 +0100
@@ -56,7 +56,7 @@ compress temporaries with PROG;
decompress them with PROG \fB\-d\fR
.TP
\fB\-k\fR, \fB\-\-key\fR=\fIPOS1[\fR,POS2]
-start a key at POS1, end it at POS2 (origin 1)
+start a key at POS1, end it at POS2 (origin 1) - when no POS2 is specified, end of line is used
.TP
\fB\-m\fR, \fB\-\-merge\fR
merge already sorted files; do not sort
@@ -103,8 +103,8 @@ With no FILE, or when FILE is \-, read s
.PP
*** WARNING ***
The locale specified by the environment affects sort order.
-Set LC_ALL=C to get the traditional sort order that uses
-native byte values.
+Set LC_ALL=C (by "export LC_ALL=C") to get the traditional
+sort order that uses native byte values.
.SH AUTHOR
Written by Mike Haertel and Paul Eggert.
.SH "REPORTING BUGS"

13
coreutils.spec
View File

@ -1,7 +1,7 @@
Summary: The GNU core utilities: a set of tools commonly used in shell scripts
Name: coreutils
Version: 6.10
Release: 1%{?dist}
Release: 2%{?dist}
License: GPLv3+
Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/
@ -22,6 +22,7 @@ Source203: coreutils-runuser-l.pamd
# Our patches
Patch100: coreutils-chgrp.patch
Patch101: coreutils-6.10-configuration.patch
Patch102: coreutils-6.10-manpages.patch
# sh-utils
Patch703: sh-utils-2.0.11-dateman.patch
@ -71,8 +72,9 @@ Provides: fileutils = %{version}-%{release}
Provides: sh-utils = %{version}-%{release}
Provides: stat = %{version}-%{release}
Provides: textutils = %{version}-%{release}
Obsoletes: mktemp
Provides: mktemp = %{version}-%{release}
#old mktemp package had epoch 3, so we have to use 4 for coreutils
Provides: mktemp = 4:%{version}-%{release}
Obsoletes: mktemp < 4:%{version}-%{release}
Obsoletes: fileutils <= 4.1.9
Obsoletes: sh-utils <= 2.0.12
Obsoletes: stat <= 3.3
@ -96,6 +98,7 @@ cd %name-%version
# Our patches
%patch100 -p1 -b .chgrp
%patch101 -p1 -b .configure
%patch102 -p1 -b .manpages
# sh-utils
%patch703 -p1 -b .dateman
@ -286,6 +289,10 @@ fi
/sbin/runuser
%changelog
* Mon Jan 28 2008 Ondrej Vasik <ovasik@redhat.com> - 6.10-2
- some manpages improvements(#406981,#284881)
- fix non-versioned obsoletes of mktemp(#430407)
* Fri Jan 25 2008 Ondrej Vasik <ovasik@redhat.com> - 6.10-1
- New upstream release(changed %%prep because of lack of lzma
support in %%setup macro)