auto-import groff-1.16-7.1 from groff-1.16-7.1.src.rpmgroff-1_16-7_1

3 files changed, 4 insertions, 31 deletions

diff --git a/.cvsignore b/.cvsignore
index 9bcce0e..ffed904 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1 @@
 groff-1.16.tar.gz
-man-pages-ja-GNU_groff-20000115.tar.gz
-mandocj.tar.gz
diff --git a/groff.spec b/groff.spec
index 6ee78d2..7c88d03 100644
--- a/groff.spec
+++ b/groff.spec
@@ -1,22 +1,14 @@
-%define enable_japanese 1
-%define jman man-pages-ja-GNU_groff-20000115
 Summary: A document formatting system.
 Name: groff
 Version: 1.16
-Release: 7j1
+Release: 7.1
 Copyright: GPL
 Group: Applications/Publishing
 Source0: ftp://ftp.gnu.org/gnu/groff/groff-1.16.tar.gz
 Source1: troff-to-ps.fpi
 Source2: README.A4
-# Japanese
-Source10: mandocj.tar.gz
-Source11: %{jman}.tar.gz
-# end
 Patch1: groff-1.16-safer.patch
-# Japanese
-Patch10: groff-1.16jp.diff
-# end
+Patch2: groff-1.17.2-sec.patch
 Requires: mktemp
 Buildroot: %{_tmppath}/%{name}-root
 Obsoletes: groff-tools
@@ -58,26 +50,15 @@ gxditview so that you preview your processed text files in X.  You'll
 also need to install the groff package and the X Window System.
 
 %prep
-%if %{enable_japanese}
-%setup -q -a 11
-%else
 %setup -q
-%endif
 %patch1 -p1 -b .safer
-%if %{enable_japanese}
-%patch10 -p1 -b .japanese
-%endif
+%patch2 -p1
 
 cp %{SOURCE2} .
 
 %build
 PATH=$PATH:%{_prefix}/X11R6/bin
-autoconf
-%if %{enable_japanese}
-%configure --enable-japanese
-%else
 %configure
-%endif
 make
 cd src/xditview
 xmkmf && make
@@ -91,7 +72,7 @@ mkdir -p ${RPM_BUILD_ROOT}%{_prefix}
 cd src/xditview
 %makeinstall DESTDIR=$RPM_BUILD_ROOT
 cd ../..
-#mv $RPM_BUILD_ROOT%{_prefix}/man $RPM_BUILD_ROOT%{_prefix}/share
+mv $RPM_BUILD_ROOT%{_prefix}/man $RPM_BUILD_ROOT%{_prefix}/share
 ln -s tmac.s	${RPM_BUILD_ROOT}%{_prefix}/share/groff/tmac/tmac.gs
 ln -s tmac.mse	${RPM_BUILD_ROOT}%{_prefix}/share/groff/tmac/tmac.gmse
 ln -s tmac.m	${RPM_BUILD_ROOT}%{_prefix}/share/groff/tmac/tmac.gm
@@ -149,10 +130,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %config /etc/X11/app-defaults/GXditview
 
 %changelog
-* Thu Aug 24 2000 ISHIKAWA Mutsumi <ishikawa@redhat.com>
-- japanese patch ported from Debian
-- based on groff-1.16-7
-
 * Fri Jul 28 2000 Tim Waugh <twaugh@redhat.com>
 - Install troff-to-ps.fpi in /usr/lib/rhs-printfilters (#13634).
 
diff --git a/sources b/sources
index 937aecd..0412498 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
 ec57cda1949de57a2e07362366859bbb  groff-1.16.tar.gz
-9bbf9b74fd587d248e17543bda4ce5de  man-pages-ja-GNU_groff-20000115.tar.gz
-e5d7f3273b4d53033723fcd2654d980c  mandocj.tar.gz