From 1c07627a0b562a38247609aa832f067fe4620f43 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 05:54:22 +0000
Subject: [PATCH] auto-import groff-1.18-4 from groff-1.18-4.src.rpm

---
 groff.spec | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/groff.spec b/groff.spec
index 5a8a73e..ace94ac 100644
--- a/groff.spec
+++ b/groff.spec
@@ -4,7 +4,7 @@
 Summary: A document formatting system.
 Name: groff
 Version: 1.18
-Release: 3
+Release: 4
 Copyright: GPL
 Group: Applications/Publishing
 Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
@@ -79,7 +79,7 @@ rm -rf ${RPM_BUILD_ROOT}
 PATH=$PATH:%{_prefix}/X11R6/bin
 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}
+#install -m 644 doc/groff.info* ${RPM_BUILD_ROOT}/%{_infodir}
 cd src/xditview
 %makeinstall DESTDIR=$RPM_BUILD_ROOT
 cd ../..
@@ -111,10 +111,10 @@ ln -s soelim.1.gz	${RPM_BUILD_ROOT}%{_mandir}/man1/zsoelim.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}/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/
+#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 |\
@@ -129,19 +129,19 @@ ln -sf doc.tmac $RPM_BUILD_ROOT/usr/share/groff/%version/tmac/docj.tmac
 rm -rf ${RPM_BUILD_ROOT}
 
 %post
-/sbin/install-info %{_infodir}/groff.info.gz %{_infodir}/dir
+/sbin/install-info %{_infodir}/groff.gz %{_infodir}/dir
 exit 0
 
 %preun
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/groff.info.gz %{_infodir}/dir
+    /sbin/install-info --delete %{_infodir}/groff.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*
+%{_infodir}/groff*
 #/usr/share/printconf/tests/*
 #/usr/share/printconf/mf_rules/*
 
@@ -161,8 +161,9 @@ fi
 #/etc/X11/app-defaults/GXditview
 
 %changelog
-* Sat Aug 10 2002 Elliot Lee <sopwith@redhat.com>
-- rebuilt with gcc-3.2 (we hope)
+* Sun Aug 11 2002 Florian La Roche <Florian.LaRoche@redhat.de>
+- use info files as installed by groff package
+- completely disable older printconf stuff
 
 * Thu Aug  8 2002 Yukihiro Nakai <ynakai@redhat.com>
 - link docj.tmac to doc.tmac #57560