[groff] rebase to 1.21

[jvcelak]

commit 965113abc11e988a3572a7adc3d6db0aed5b3f25
Author: Jan Vcelak <jvcelak at redhat.com>
Date:   Fri Jan 21 17:13:25 2011 +0100

    rebase to 1.21

 groff-japanese-charclass.patch |  859 --
 groff-japanese-wcwidth.patch   |23721 ----------------------------------------
 groff-makefile-typo.patch      |   17 +
 groff-manpages-typos.patch     |   56 +
 groff.spec                     |   15 +-
 5 files changed, 82 insertions(+), 24586 deletions(-)
---
diff --git a/groff-makefile-typo.patch b/groff-makefile-typo.patch
new file mode 100644
index 0000000..be2dbb8
--- /dev/null
+++ b/groff-makefile-typo.patch
@@ -0,0 +1,17 @@
+Fixes a typo in Makefile.comm
+
+Upstream fix:
+http://lists.gnu.org/archive/html/bug-groff/2011-01/msg00002.html
+
+diff -ur groff-1.21.old/Makefile.comm groff-1.21/Makefile.comm
+--- groff-1.21.old/Makefile.comm	2010-12-31 08:33:08.000000000 +0100
++++ groff-1.21/Makefile.comm	2011-01-21 16:19:59.762069900 +0100
+@@ -21,7 +21,7 @@
+ #
+ INCLUDES=-I. -I$(srcdir) \
+   -I$(top_builddir)/src/include -I$(top_srcdir)/src/include \
+-  -I$(tob_builddir)/src/libs/gnulib/lib
++  -I$(top_builddir)/src/libs/gnulib/lib
+ ALL_CCFLAGS=$(INCLUDES) $(CCDEFINES) $(CCFLAGS) $(CPPFLAGS)
+ COMPILE.cpp=$(CCC) $(ALL_CCFLAGS) -c
+ ALL_CFLAGS=$(INCLUDES) $(CDEFINES) $(CFLAGS) $(CPPFLAGS)
diff --git a/groff-manpages-typos.patch b/groff-manpages-typos.patch
new file mode 100644
index 0000000..c450db8
--- /dev/null
+++ b/groff-manpages-typos.patch
@@ -0,0 +1,56 @@
+Various manual page fixes. Selected from #668524 and #668461.
+
+Patch was sent upstream:
+http://lists.gnu.org/archive/html/bug-groff/2011-01/msg00011.html
+
+diff -uNPrp a/contrib/mm/groff_mm.man b/contrib/mm/groff_mm.man
+--- a/contrib/mm/groff_mm.man	2011-01-21 14:52:52.302854667 +0100
++++ b/contrib/mm/groff_mm.man	2011-01-21 15:51:53.138775191 +0100
+@@ -1158,7 +1158,7 @@ and also less than or equal to
+ .B Hb
+ or
+ .B Hs
+-are centerered.
++are centered.
+ .RE
+ .
+ .IP
+@@ -1229,7 +1229,7 @@ Fourteen number registers named
+ up to
+ .B H14
+ contain the counter for each heading level.
+-The values are printed using arabic numerals;
++The values are printed using Arabic numerals;
+ this can be changed with the macro
+ .B HM
+ (see below).
+@@ -1590,7 +1590,7 @@ is still controlled by
+ .IR text-indent .
+ .
+ .IP
+-The mark is left-justified whitin the mark area if
++The mark is left-justified within the mark area if
+ .I pad
+ is\~0.
+ If
+@@ -1664,7 +1664,7 @@ Default is\~0.
+ List-status clear.
+ Terminates all current active lists down to
+ .IR list-level ,
+-or\~0 if no argmuent is given.
++or\~0 if no argument is given.
+ This is used by\~\c
+ .B H
+ to clear any active list.
+diff -uNPrp groff-1.21.old/man/roff.man groff-1.21/man/roff.man
+--- groff-1.21.old/man/roff.man	2010-12-31 08:33:09.000000000 +0100
++++ groff-1.21/man/roff.man	2011-01-21 15:26:24.061849971 +0100
+@@ -252,7 +252,7 @@ Today, the name
+ .I roff
+ is used to refer to a
+ .I troff/\:nroff
+-sytem as a whole.
++system as a whole.
+ .
+ .P
+ Ossanna's first version was written in the PDP-11 assembly language and
diff --git a/groff.spec b/groff.spec
index 9024b55..4203c79 100644
--- a/groff.spec
+++ b/groff.spec
@@ -2,8 +2,8 @@
 
 Summary: A document formatting system
 Name: groff
-Version: 1.20.1
-Release: 3%{?dist}
+Version: 1.21
+Release: 1%{?dist}
 License: GPLv3+ and GFDL and BSD and MIT
 Group: Applications/Publishing
 URL: http://groff.ffii.org
@@ -11,8 +11,8 @@ URL: http://groff.ffii.org
 Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
 
 Patch1: groff-info-missing-x11.patch
-Patch2: groff-japanese-charclass.patch
-Patch3: groff-japanese-wcwidth.patch
+Patch2: groff-makefile-typo.patch
+Patch3: groff-manpages-typos.patch
 
 Requires: mktemp
 Requires: /sbin/install-info
@@ -78,8 +78,8 @@ language and documentation for creating PDF files.
 %prep
 %setup -q
 %patch1 -p1 -b .info-missing-x11
-%patch2 -p1 -b .japanese-charclass
-%patch3 -p1 -b .japanese-wcwidth
+%patch2 -p1 -b .makefile-typo
+%patch3 -p1 -b .manpages-typos
 
 for file in NEWS src/devices/grolbp/grolbp.man doc/{groff.info*,webpage.ms} \
 				contrib/mm/*.man contrib/mom/examples/{README.txt,*.mom} ; do
@@ -202,6 +202,9 @@ fi
 %doc %{_docdir}/%{name}-%{version}/pdf/
 
 %changelog
+* Fri Jan 21 2011 Jan Vcelak <jvcelak at redhat.com> 1.21-1
+- package rebase to 1.21
+
 * Fri Nov 26 2010 Jan Vcelak <jvcelak at redhat.com> 1.20.1-3
 - experimental support of Japanese (charclass and wcwidth patches)
   thanks to Daiki Ueno (dueno at redhat.com)