auto-import groff-1.18-3 from groff-1.18-3.src.rpmgroff-1_18-3

5 files changed, 111 insertions, 9 deletions

diff --git a/.cvsignore b/.cvsignore
index 6b649fa..966a85f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,3 @@
-groff-1.17.2.tar.gz
+groff-1.18.tar.gz
 man-pages-ja-GNU_groff-20000115.tar.gz
 mandocj.tar.gz
diff --git a/groff-1.18-info.patch b/groff-1.18-info.patch
new file mode 100644
index 0000000..e26692e
--- /dev/null
+++ b/groff-1.18-info.patch
@@ -0,0 +1,11 @@
+--- groff-1.18/doc/groff.texinfo.info	2002-07-05 17:07:24.000000000 +0200
++++ groff-1.18/doc/groff.texinfo	2002-08-01 15:23:23.000000000 +0200
+@@ -8,7 +8,7 @@
+ @c
+ 
+ @c %**start of header (This is for running Texinfo on a region.)
+-@setfilename groff
++@setfilename groff.info
+ @settitle The GNU Troff Manual
+ @setchapternewpage odd
+ @footnotestyle separate
diff --git a/groff-1.18-nohtml.patch b/groff-1.18-nohtml.patch
new file mode 100644
index 0000000..313514b
--- /dev/null
+++ b/groff-1.18-nohtml.patch
@@ -0,0 +1,48 @@
+--- groff-1.18/doc/Makefile.sub.nohtml	2002-06-14 17:18:34.000000000 +0200
++++ groff-1.18/doc/Makefile.sub	2002-08-06 13:46:19.000000000 +0200
+@@ -54,11 +54,9 @@
+   meintro.ps \
+   pic.ps
+ 
+-HTMLDOCFILES=\
+-  pic.html
++HTMLDOCFILES=
+ 
+-HTMLDOCIMAGEFILES=\
+-  pic*
++HTMLDOCIMAGEFILES=
+ 
+ EXAMPLEFILES=\
+   webpage.ms \
+@@ -71,11 +69,9 @@
+   gnu.png \
+   grnexmpl.ps
+ 
+-HTMLEXAMPLEFILES=\
+-  webpage.html
++HTMLEXAMPLEFILES=
+ 
+-HTMLEXAMPLEIMAGEFILES=\
+-  webpage*
++HTMLEXAMPLEIMAGEFILES=
+ 
+ imagedir=img
+ htmldocimagedir=$(htmldocdir)/$(imagedir)
+@@ -109,7 +105,7 @@
+ 
+ 
+ all: groff $(PROCESSEDDOCFILES) prepare_examples \
+-     $(PROCESSEDEXAMPLEFILES) $(make_html)
++     $(PROCESSEDEXAMPLEFILES) 
+ 
+ html: $(HTMLDOCFILES) $(HTMLEXAMPLEFILES)
+ 
+@@ -131,7 +127,7 @@
+ 
+ distfiles: groff
+ 
+-install_data: groff $(DOCFILES) $(PROCESSEDDOCFILES) $(make_install_html) \
++install_data: groff $(DOCFILES) $(PROCESSEDDOCFILES)  \
+               $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES)
+ 	-test -d $(infodir) || $(mkinstalldirs) $(infodir)
+ # Prefer info files in builddir over srcdir; we test for
diff --git a/groff.spec b/groff.spec
index 77a0100..5a8a73e 100644
--- a/groff.spec
+++ b/groff.spec
@@ -1,7 +1,10 @@
+# remove if it builds on ia64
+%define optflags -O0
+
 Summary: A document formatting system.
 Name: groff
-Version: 1.17.2
-Release: 12
+Version: 1.18
+Release: 3
 Copyright: GPL
 Group: Applications/Publishing
 Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
@@ -13,10 +16,12 @@ 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-16.patch
-Patch3: groff-1.17.2-16.diff
+Patch3: groff_1.18-1.diff
+Patch4: groff-1.18-info.patch
+Patch5: groff-1.18-nohtml.patch
 URL: ftp://ftp.gnu.org/gnu/groff/
 Requires: mktemp
+Prereq: /sbin/install-info
 Buildroot: %{_tmppath}/%{name}-root
 Obsoletes: groff-tools
 
@@ -54,7 +59,9 @@ System display.
 %prep
 %setup -q -a 4
 %patch1 -p1 -b .safer
-%patch2 -p1 -b .japanese
+%patch3 -p1 -b .japanese
+%patch4 -p1 -b .info
+%patch5 -p1 -b .nohtml
 
 cp %{SOURCE2} .
 
@@ -63,14 +70,16 @@ PATH=$PATH:%{_prefix}/X11R6/bin
 #autoconf
 %configure --enable-japanese
 make
+(cd doc && makeinfo groff.texinfo)
 cd src/xditview
 xmkmf && make
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
 PATH=$PATH:%{_prefix}/X11R6/bin
-mkdir -p ${RPM_BUILD_ROOT}%{_prefix}
+mkdir -p ${RPM_BUILD_ROOT}%{_prefix} ${RPM_BUILD_ROOT}%{_infodir}
 %makeinstall manroot=${RPM_BUILD_ROOT}/%{_mandir}
+install -m 644 doc/groff.info* ${RPM_BUILD_ROOT}/%{_infodir}
 cd src/xditview
 %makeinstall DESTDIR=$RPM_BUILD_ROOT
 cd ../..
@@ -114,13 +123,25 @@ find ${RPM_BUILD_ROOT}%{_prefix}/bin ${RPM_BUILD_ROOT}%{_mandir} -type f -o -typ
 
 install -m 644 %SOURCE6 $RPM_BUILD_ROOT/usr/share/groff/%version/tmac/hyphen.cs
 
+ln -sf doc.tmac $RPM_BUILD_ROOT/usr/share/groff/%version/tmac/docj.tmac
+
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
+%post
+/sbin/install-info %{_infodir}/groff.info.gz %{_infodir}/dir
+exit 0
+
+%preun
+if [ $1 = 0 ]; then
+    /sbin/install-info --delete %{_infodir}/groff.info.gz %{_infodir}/dir
+fi
+
 %files -f groff-files
 %defattr(-,root,root)
 %doc	BUG-REPORT NEWS PROBLEMS README README.A4 TODO VERSION
 %{_prefix}/share/groff
+%{_infodir}/groff.info*
 #/usr/share/printconf/tests/*
 #/usr/share/printconf/mf_rules/*
 
@@ -131,7 +152,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_prefix}/bin/afmtodit
 %{_mandir}/man1/afmtodit.*
 %{_mandir}/man1/grog.*
-%{_mandir}/man7/mmroff*
+%{_mandir}/man1/mmroff*
 
 %files gxditview
 %defattr(-,root,root)
@@ -140,6 +161,28 @@ rm -rf ${RPM_BUILD_ROOT}
 #/etc/X11/app-defaults/GXditview
 
 %changelog
+* Sat Aug 10 2002 Elliot Lee <sopwith@redhat.com>
+- rebuilt with gcc-3.2 (we hope)
+
+* Thu Aug  8 2002 Yukihiro Nakai <ynakai@redhat.com>
+- link docj.tmac to doc.tmac #57560
+
+* Thu Aug  1 2002 Harald Hoyer <harald@redhat.de>
+- update to 1.18
+- mmroff(7) is now mmroff(1)
+
+* Tue Jul 23 2002 Tim Powers <timp@redhat.com>
+- build using gcc-3.2-0.1
+
+* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Wed Jun 12 2002 Florian La Roche <Florian.LaRoche@redhat.de>
+- prereq install-info and add post/preun for info files
+
+* Wed May 29 2002 Florian La Roche <Florian.LaRoche@redhat.de>
+- add info files #64667
+
 * Fri Feb 22 2002 Florian La Roche <Florian.LaRoche@redhat.de>
 - rebuild in new environment
 
diff --git a/sources b/sources
index 9a60a32..6ef2949 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-9564e58e553e7a8d4c6e73a782f296ce  groff-1.17.2.tar.gz
+31474119d1ef2ded0bd0692132d50d05  groff-1.18.tar.gz
 9bbf9b74fd587d248e17543bda4ce5de  man-pages-ja-GNU_groff-20000115.tar.gz
 e5d7f3273b4d53033723fcd2654d980c  mandocj.tar.gz