auto-import groff-1.16.1-7 from groff-1.16.1-7.src.rpm

.cvsignore

@@ -1 +1,3 @@
-groff-1.16.tar.gz
+groff-1.16.1.tar.gz
+man-pages-ja-GNU_groff-20000115.tar.gz
+mandocj.tar.gz

groff.spec

@@ -1,15 +1,19 @@
 Summary: A document formatting system.
 Name: groff
-Version: 1.16
-Release: 7.1.1
+Version: 1.16.1
+Release: 7
 Copyright: GPL
 Group: Applications/Publishing
-Source0: ftp://ftp.gnu.org/gnu/groff/groff-1.16.tar.gz
-Source1: troff-to-ps.fpi
+Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
+Source1: mf40-groff_filters
 Source2: README.A4
+# Japanese sources
+Source3: mandocj.tar.gz
+Source4: man-pages-ja-GNU_groff-20000115.tar.gz
+Source5: groff.test
+Source6: hyphen.cs
 Patch1: groff-1.16-safer.patch
-Patch2: groff-1.17.2-sec.patch
-Patch3: groff-1.16.1-sec.patch
+Patch2: groff-1.16-debian.patch
 Requires: mktemp
 Buildroot: %{_tmppath}/%{name}-root
 Obsoletes: groff-tools
@@ -51,16 +55,16 @@ 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
-%setup -q
+%setup -q -a 4
 %patch1 -p1 -b .safer
-%patch2 -p1
-%patch3 -p1
+%patch2 -p1 -b .japanese
 
 cp %{SOURCE2} .
 
 %build
 PATH=$PATH:%{_prefix}/X11R6/bin
-%configure
+autoconf
+%configure --enable-japanese
 make
 cd src/xditview
 xmkmf && make
@@ -69,12 +73,11 @@ xmkmf && make
 rm -rf ${RPM_BUILD_ROOT}
 PATH=$PATH:%{_prefix}/X11R6/bin
 mkdir -p ${RPM_BUILD_ROOT}%{_prefix}
-
-%makeinstall
+%makeinstall manroot=${RPM_BUILD_ROOT}/%{_mandir}
 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
@@ -100,14 +103,18 @@ ln -s soelim.1.gz ${RPM_BUILD_ROOT}%{_mandir}/man1/gsoelim.1.gz
 ln -s tbl.1.gz 	${RPM_BUILD_ROOT}%{_mandir}/man1/gtbl.1.gz
 ln -s troff.1.gz 	${RPM_BUILD_ROOT}%{_mandir}/man1/gtroff.1.gz
 
-mkdir -p ${RPM_BUILD_ROOT}%{_prefix}/lib/rhs/rhs-printfilters
-install -m755 %{SOURCE1} ${RPM_BUILD_ROOT}%{_prefix}/lib/rhs/rhs-printfilters
+mkdir -p ${RPM_BUILD_ROOT}/usr/share/printconf/mf_rules
+cp %{SOURCE1} ${RPM_BUILD_ROOT}/usr/share/printconf/mf_rules/
+mkdir -p ${RPM_BUILD_ROOT}/usr/share/printconf/tests
+cp %{SOURCE5} ${RPM_BUILD_ROOT}/usr/share/printconf/tests/
 
 find ${RPM_BUILD_ROOT}%{_prefix}/bin ${RPM_BUILD_ROOT}%{_mandir} -type f -o -type l | \
 	grep -v afmtodit | grep -v grog | grep -v mdoc.samples |\
 	grep -v mmroff |\
 	sed "s|${RPM_BUILD_ROOT}||g" | sed "s|\.[0-9]|\.*|g" > groff-files
 
+install -m 644 %SOURCE6 $RPM_BUILD_ROOT/usr/share/groff/tmac/hyphen.cs
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -115,6 +122,8 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(-,root,root)
 %doc	BUG-REPORT NEWS PROBLEMS README README.A4 TODO VERSION
 %{_prefix}/share/groff
+/usr/share/printconf/tests/*
+/usr/share/printconf/mf_rules/*
 
 %files perl
 %defattr(-,root,root)
@@ -124,16 +133,37 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man1/afmtodit.*
 %{_mandir}/man1/grog.*
 %{_mandir}/man7/mmroff*
-%{_prefix}/lib/rhs/*/*
 
 %files gxditview
 %defattr(-,root,root)
 %{_prefix}/X11R6/bin/gxditview
-%config /etc/X11/app-defaults/GXditview
+%{_prefix}/X11R6/lib/X11/app-defaults/GXditview
+#/etc/X11/app-defaults/GXditview
 
 %changelog
-* Tue Jan 15 2002 Florian La Roche <Florian.LaRoche@redhat.de>
-- add two security patches
+* Tue Apr 03 2001 Florian La Roche <Florian.LaRoche@redhat.de>
+- do not change groff to use /etc/papersize. Deleted the changes
+  in the debian patch.
+
+* Fri Mar 30 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- Add hyphen.cs - file generated as described in Czech how-to, 6.7
+
+* Wed Mar 28 2001 Florian La Roche <Florian.LaRoche@redhat.de>
+- updated to newest debian patch to get nippon/ascii8 support
+  better working
+
+* Fri Feb  9 2001 Crutcher Dunnavant <crutcher@redhat.com>
+- switch to printconf filtration rules
+
+* Tue Jan 09 2001 Florian La Roche <Florian.LaRoche@redhat.de>
+- change app-defaults to /usr/X11R6/lib/X11/app-defaults/
+  and do not mark it as config file
+
+* Thu Dec 14 2000 Yukihiro Nakai <ynakai@redhat.com>
+- Add Japanese patch from RHL7J
+
+* Fri Aug  4 2000 Florian La Roche <Florian.LaRoche@redhat.de>
+- update to bug-fix release 1.16.1
 
 * Fri Jul 28 2000 Tim Waugh <twaugh@redhat.com>
 - Install troff-to-ps.fpi in /usr/lib/rhs-printfilters (#13634).

sources

@@ -1 +1,3 @@
-ec57cda1949de57a2e07362366859bbb  groff-1.16.tar.gz
+f5dfb985bd890fd6dcd95b138935a9ad  groff-1.16.1.tar.gz
+9bbf9b74fd587d248e17543bda4ce5de  man-pages-ja-GNU_groff-20000115.tar.gz
+e5d7f3273b4d53033723fcd2654d980c  mandocj.tar.gz