- Resolves: #556199 update iconv.1 man page

This commit is contained in:
Ivana Varekova 2010-01-27 14:10:11 +00:00
parent d507cadbc8
commit 138d3c3323
2 changed files with 72 additions and 1 deletions

View File

@ -0,0 +1,65 @@
diff -up man-pages-3.23/man1/iconv.1.pom man-pages-3.23/man1/iconv.1
--- man-pages-3.23/man1/iconv.1.pom 2010-01-26 15:23:10.000000000 +0100
+++ man-pages-3.23/man1/iconv.1 2010-01-27 15:03:09.000000000 +0100
@@ -196,26 +196,42 @@ The \fBiconv\fR program converts the enc
\fIinputfile\fR from one coded character set to another. The result is
written to standard output unless otherwise specified by the
\fB--output\fR option.
-.PP
+.SS
+Input/Output format specification:
+.TP
\fB--from-code\fR, \fB\-f\fR \fIencoding\fR
-.PP
Convert characters from \fIencoding\fR
-.PP
+.TP
\fB--to-code\fR, \fB\-t\fR \fIencoding\fR
-.PP
Convert characters to \fIencoding\fR
-.PP
+.SS
+Information:
+.TP
\fB--list\fR
-.PP
List known coded character sets
-.PP
+.SS
+Output control:
+.TP
+\fB-c\fR
+omit invalid characters from output
+.TP
\fB--output\fR, \fB\-o\fR \fIfile\fR
-.PP
Specify output file (instead of stdout)
-.PP
+.TP
+\fB--silent\fR, \fB-s\fR
+suppress warnings
+.TP
\fB--verbose\fR
-.PP
Print progress information.
+.TP
+\fB-?\fR, \fB--help\fR
+Give this help list
+.TP
+\fB--usage\fR
+Give a short usage message
+.TP
+\fB-V\fR, \fB--version\fR
+Print program version
.SH "EXAMPLES"
Following examples convert from code set ISO88592 "input.txt" to UTF8
code set or ASCII and stores the result as "output.txt".
@@ -225,7 +241,7 @@ iconv -f ISO88592 -t UTF8 < input.txt >
iconv -f ISO88592 -t ASCII//TRANSLIT < input.txt > output.txt
\fp
.fi
-
+\fR
.SH "AUTHOR"
iconv is written by Ulrich Drepper as part of the GNU C Library.
.PP

View File

@ -4,7 +4,7 @@
Summary: Man (manual) pages from the Linux Documentation Project
Name: man-pages
Version: 3.23
Release: 5%{?dist}
Release: 6%{?dist}
License: GPLv2+ and GPL+ and BSD and MIT and Copyright only and IEEE
Group: Documentation
URL: http://www.kernel.org/pub/linux/docs/manpages/
@ -32,6 +32,7 @@ Patch57: man-pages-3.22-nsswitch.conf.patch
Patch58: man-pages-3.23-proc.patch
Patch59: man-pages-3.23-ld.so.patch
Patch60: man-pages-3.22-sched_setaffinity.patch
Patch61: man-pages-3.23-iconv.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Autoreq: false
@ -62,6 +63,7 @@ rmdir man-pages-posix-%{posix_version}-%{posix_release}
%patch58 -p1
%patch59 -p1
%patch60 -p1
%patch61 -p1
### And now remove those we are not going to use:
@ -132,6 +134,10 @@ rm -rf $RPM_BUILD_ROOT
%lang(en) %{_mandir}/en/man*
%changelog
* Wed Jan 27 2010 Ivana Hutarova Varekova <varekova@redhat.com> - 3.23-6
- Resolves: #556199
update iconv.1 man page
* Tue Jan 26 2010 Ivana Hutarova Varekova <varekova@redhat.com> - 3.23-5
- Resolves: #557971
remove unnecessary man-pages from man-pages_syscalls and man-pages_add