diff --git a/icoutils-0.30.0-genresscript-add-options-to-man-page.patch b/icoutils-0.30.0-genresscript-add-options-to-man-page.patch new file mode 100644 index 0000000..44ecd89 --- /dev/null +++ b/icoutils-0.30.0-genresscript-add-options-to-man-page.patch @@ -0,0 +1,28 @@ +--- icoutils-0.30.0.old/extresso/genresscript.1 2012-05-04 00:14:50.000000000 +0100 ++++ icoutils-0.30.0/extresso/genresscript.1 2013-05-16 11:37:46.885992180 +0100 +@@ -33,6 +33,25 @@ + (Everything but the destination filename will be filled in in the script.) + This is useful when you already have extracted images and want to + create a resource script of them. ++.SH OPTIONS ++.IP \fB\-t\fR ++.IP \fB\-\-type=ID\fR ++.IX ++list resources of this type instead of group_icon ++.IP \fB\-b\fR ++.IP \fB\-\-base=PATH\fR ++.IX ++the default extraction name of all resources ++.IP \fB\-s\fR ++.IP \fB\-\-sort\fR ++.IX ++sort alphabetically instead of using order in binary ++.IP \fB\-\-help\fR ++.IX ++display this help and exit ++.IP \fB\-\-version\fR ++.IX ++output version information and exit + .SH SEE ALSO + .BR extresso (1), + .BR icotool (1), diff --git a/icoutils-0.30.0-icotool-document-raw-option.patch b/icoutils-0.30.0-icotool-document-raw-option.patch new file mode 100644 index 0000000..be6083d --- /dev/null +++ b/icoutils-0.30.0-icotool-document-raw-option.patch @@ -0,0 +1,12 @@ +--- icoutils-0.30.0.old/icotool/icotool.1 2012-05-04 00:14:50.000000000 +0100 ++++ icoutils-0.30.0/icotool/icotool.1 2013-05-16 11:40:16.757686693 +0100 +@@ -152,6 +152,9 @@ + + This option has no effect in list mode. + .TP ++.B \-r, \-\-raw=FILENAME ++Store input file as raw PNG (Vista icons). ++.TP + .B \-\-help + Show summary of options. + .TP diff --git a/icoutils-0.30.0-wrestool-document-a-option.patch b/icoutils-0.30.0-wrestool-document-a-option.patch new file mode 100644 index 0000000..2989026 --- /dev/null +++ b/icoutils-0.30.0-wrestool-document-a-option.patch @@ -0,0 +1,22 @@ +--- icoutils-0.30.0.old/wrestool/main.c 2012-08-23 15:47:06.000000000 +0100 ++++ icoutils-0.30.0/wrestool/main.c 2013-05-16 11:43:37.933276641 +0100 +@@ -186,7 +186,7 @@ + printf(_(" -t, --type=[+|-]ID resource type identifier\n")); + printf(_(" -n, --name=[+|-]ID resource name identifier\n")); + printf(_(" -L, --language=[+|-]ID resource language identifier\n")); +- printf(_(" --all perform operation on all resource (default)\n")); ++ printf(_(" -a, --all perform operation on all resource (default)\n")); + printf(_("\nMiscellaneous:\n")); + printf(_(" -o, --output=PATH where to place extracted files\n")); + printf(_(" -R, --raw do not parse resource contents\n")); +--- icoutils-0.30.0.old/wrestool/wrestool.1 2012-05-04 00:14:50.000000000 +0100 ++++ icoutils-0.30.0/wrestool/wrestool.1 2013-05-16 11:43:10.630332292 +0100 +@@ -65,7 +65,7 @@ + Resource language identifier. Has no effect when processing + 16-bit libraries. + .TP +-.B \-\-all ++.B \-a, \-\-all + Perform operation on all resource (default). + .TP + .B \-o, \-\-output=PATH diff --git a/icoutils-0.30.0-wrestool-remove-bogus-r-option.patch b/icoutils-0.30.0-wrestool-remove-bogus-r-option.patch new file mode 100644 index 0000000..ed37735 --- /dev/null +++ b/icoutils-0.30.0-wrestool-remove-bogus-r-option.patch @@ -0,0 +1,11 @@ +--- icoutils-0.30.0.old/wrestool/main.c 2012-08-23 15:47:06.000000000 +0100 ++++ icoutils-0.30.0/wrestool/main.c 2013-05-16 11:44:53.881121841 +0100 +@@ -236,7 +236,7 @@ + { "help", no_argument, NULL, OPT_HELP }, + { 0, 0, 0, 0 } + }; +- c = getopt_long (argc, argv, "t:n:L:o:aRrxlv", long_options, &option_index); ++ c = getopt_long (argc, argv, "t:n:L:o:aRxlv", long_options, &option_index); + if (c == EOF) + break; + diff --git a/icoutils.spec b/icoutils.spec index 5441e49..47d94d3 100644 --- a/icoutils.spec +++ b/icoutils.spec @@ -1,6 +1,6 @@ Name: icoutils Version: 0.30.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Utility for extracting and converting Microsoft icon and cursor files Group: Applications/Multimedia @@ -16,6 +16,13 @@ BuildRequires: perl-Carp Provides: bundled(gnulib) +# Documentation fixes (RHBZ#948882). +# Sent upstream 2013-05-16. +Patch1: icoutils-0.30.0-genresscript-add-options-to-man-page.patch +Patch2: icoutils-0.30.0-icotool-document-raw-option.patch +Patch3: icoutils-0.30.0-wrestool-document-a-option.patch +Patch4: icoutils-0.30.0-wrestool-remove-bogus-r-option.patch + %description The icoutils are a set of programs for extracting and converting images in Microsoft Windows icon and cursor files. These files usually have the @@ -24,6 +31,11 @@ libraries. %prep %setup -q +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 + autoreconf for f in AUTHORS NEWS; do @@ -52,6 +64,9 @@ make install DESTDIR=%{buildroot} %changelog +* Thu May 16 2013 Richard W.M. Jones 0.30.0-3 +- Documentation fixes (RHBZ#948882). + * Sat Mar 23 2013 Martin Gieseking 0.30.0-2 - Rebuilt with recent autoconf for https://bugzilla.redhat.com/show_bug.cgi?id=925575