rebase to 1.21

1 files changed, 9 insertions, 6 deletions

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@redhat.com> 1.21-1
+- package rebase to 1.21
+
 * Fri Nov 26 2010 Jan Vcelak <jvcelak@redhat.com> 1.20.1-3
 - experimental support of Japanese (charclass and wcwidth patches)
   thanks to Daiki Ueno (dueno@redhat.com)