Package rebase (1.81.1 -> 1.20.1)groff-1_20_1-0_fc14

1 files changed, 127 insertions, 162 deletions

diff --git a/groff.spec b/groff.spec
index cb537f2..f32e776 100644
--- a/groff.spec
+++ b/groff.spec
@@ -1,46 +1,23 @@
 %{!?with_x:%define with_x 1}
 
 Summary: A document formatting system
-Name:	groff
-Version: 1.18.1.4
-Release: 18%{?dist}
-License: GPLv2 and GFDL
+Name: groff
+Version: 1.20.1
+Release: 0%{?dist}
+License: GPLv3+ and GFDL and BSD and MIT
 Group: Applications/Publishing
 URL: http://groff.ffii.org
+
 Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz
-Source3: mandocj.tar.gz
-Source4: man-pages-ja-GNU_groff-20000115.tar.gz
-Source6: hyphen.cs
-Source7: nroff
-Patch1: groff-1.16-safer.patch
-Patch3: groff_1.18.1-15.diff
-Patch4: groff-1.18-info.patch
-Patch6: groff-1.18-pfbtops_cpp.patch
-Patch7: groff-1.18-gzip.patch
-Patch9: groff-1.18.1-fixminus.patch
-Patch11: groff-1.18.1-8bit.patch
-Patch12: groff-1.18.1-korean.patch
-Patch13: groff-1.18.1-gzext.patch
-#Patch14: groff-xlibs.patch
-Patch15: groff-1.18.1-fix15.patch
-Patch16: groff-1.18.1-devutf8.patch
-#Patch17: groff-1.18.1.3-revision.patch
-Patch18: groff-1.18.1.1-do_char.patch
-#Patch19: groff-1.18.1.1-grn.patch
-#Patch20: groff-1.18.1.1-tempfile.patch
-#Patch21: groff-1.18.1.1-gcc41.patch
-#Patch22: groff-1.18.1.1-bigendian.patch
-Patch23: groff-1.18.1.1-spacefix.patch
-Patch24: groff-1.18.1.4-sectmp.patch
-Patch25: groff-1.18.1.4-grofferpath.patch
-Patch26: groff-1.18.1.4-gcc4.3.0.patch
- 
+
 Requires: mktemp
 Requires: /sbin/install-info
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Conflicts: groff-tools = %version
-Provides: nroff-i18n = %version
-BuildRequires: byacc zlib-devel texinfo
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Provides: nroff-i18n = %{version}-%{release}
+BuildRequires: netpbm-progs psutils ghostscript
+# when building from CVS add: BuildRequires: texinfo byacc
+Requires(post): info
+Requires(preun): info
 
 %description
 Groff is a document formatting system. Groff takes standard text and
@@ -52,178 +29,166 @@ more.
 
 Groff can also be used to format man pages. If you are going to use
 groff with the X Window System, you will also need to install the
-groff-gxditview package.
+groff-x11 package.
 
 %package perl
 Summary: Parts of the groff formatting system that require Perl
 Group: Applications/Publishing
+Requires: groff = %{version}-%{release}
 
 %description perl
 The groff-perl package contains the parts of the groff text processor
-package that require Perl. These include the afmtodit font processor
-for creating PostScript font files, the grog utility that can be used
-to automatically determine groff command-line options, and the
-troff-to-ps print filter.
+package that require Perl. These include the afmtodit (font processor
+for creating PostScript font files), groffer (tool for displaying groff
+files), grog (utility that can be used to automatically determine groff
+command-line options), chem (groff preprocessor for producing chemical
+structure diagrams), mmroff (reference preprocessor) and roff2dvi
+roff2html roff2pdf roff2ps roff2text roff2x (roff code converters).
 
 %if %{with_x}
-%package gxditview
-Summary: An X previewer for groff text processor output
+%package x11
+Summary: Parts of the groff formatting system that require X Windows System
 Group: Applications/Publishing
-BuildRequires: imake xorg-x11-proto-devel libX11-devel libXaw-devel
-BuildRequires: libXt-devel libXpm-devel libXext-devel
-
-%description gxditview
-Gxditview displays the groff text processor's output on an X Window
-System display.
+BuildRequires: libXaw-devel libXmu-devel
+Requires: groff = %{version}-%{release}
+Provides: groff-gxditview = %{version}-%{release}
+Obsoletes: groff-gxditview < 1.20.1
+
+%description x11
+The groff-x11 package contains the parts of the groff text processor
+package that require X Windows System. These include gxditview (display
+groff intermediate output files on X Window System display) and
+xtotroff (converts X font metrics into groff font metrics).
 %endif
 
+%package doc
+Summary: Documentation for groff document formatting system
+Group: Documentation
+Requires: groff = %{version}-%{release}
+
+%description doc
+The groff-doc package includes additional documentation for groff
+text processor package. It contains examples, documentation for PIC
+language and documentation for creating PDF files.
+
 %prep
-%setup -q -a 4
-%patch1 -p1
-%patch3 -p1
-%patch4 -p1
-#%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch9 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1 -b .gzext
-#%patch14 -p1
-%patch15 -p1 -b .fix9
-%patch16 -p1 -b .devutf8
-#%patch17 -p1 -b .revision
-%patch18 -p1 -b .do_char
-#%patch19 -p1 -b .grn
-#%patch20 -p1 -b .tempfile
-#%patch21 -p1 -b .gcc41
-#%patch22 -p1 -b .bigendian
-%patch23 -p1 -b .spacefix
-%patch24 -p1 -b .sectmp
-%patch25 -p1 -b .grofferpath
-%patch26 -p1 -b .gcc43
-
-for i in contrib/mm/{groff_mm,groff_mmse,mmroff}.man \
-		src/devices/grolbp/grolbp.man; do
-	iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
-	mv "${i}_" "$i"
+%setup -q
+
+for file in NEWS src/devices/grolbp/grolbp.man doc/{groff.info*,webpage.ms} \
+				contrib/mm/*.man contrib/mom/examples/{README.txt,*.mom} ; do
+	iconv -f iso-8859-1 -t utf-8 < "$file" > "${file}_"
+	mv "${file}_" "$file"
 done
 
 %build
-#PATH=$PATH:%{_prefix}/X11R6/bin
-#autoconf
-%configure --enable-multibyte
-# no html docs
-make make_html=
-(cd doc && makeinfo groff.texinfo)
-%if %{with_x}
-cd src/xditview
-xmkmf && make %{?_smp_mflags}
-%endif
+%configure --with-appresdir=%{_datadir}/X11/app-defaults
+make
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-#PATH=$PATH:%{_prefix}/X11R6/bin
-mkdir -p ${RPM_BUILD_ROOT}%{_infodir}
-# 1) no html docs
-# 2) the list could be shorter if configure parameters were not expanded;
-#    %%configure should be fixed!
-make install make_html= make_install_html= \
-			manroot=${RPM_BUILD_ROOT}%{_mandir} \
-			bindir=%{buildroot}%{_bindir} \
-			mandir=%{buildroot}%{_mandir} \
-			prefix=%{buildroot}/usr \
-			exec_prefix=%{buildroot}/usr \
-			sbindir=%{buildroot}%{_exec_prefix}/sbin \
-			sysconfdir=%{buildroot}/etc \
-			datadir=%{buildroot}/usr/share \
-			infodir=%{buildroot}/%{_prefix}/info \
-			sysconfdir=%{buildroot}/etc \
-			includedir=%{buildroot}/usr/include \
-			libdir=%{buildroot}/%{_libdir} \
-			libexecdir=%{buildroot}/usr/libexec \
-			localstatedir=%{buildroot}/var \
-			sharedstatedir=%{buildroot}/usr/com \
-			infodir=%{buildroot}/usr/share/info
-			
-#install -m 644 doc/groff.info* ${RPM_BUILD_ROOT}/%{_infodir}
-%if %{with_x}
-cd src/xditview
-make install DESTDIR=${RPM_BUILD_ROOT}
-cd ../..
-%endif
+rm -rf %{buildroot}
 
-for file in {s,mse,m}.tmac; do
-	ln -s $file ${RPM_BUILD_ROOT}%{_datadir}/groff/%{version}/tmac/g$file
-done
-for file in g{{n,t}roff,tbl,pic,{,n}eqn,refer,{look,indx}bib} {g,z}soelim; do
-	ln -s ${file#?} ${RPM_BUILD_ROOT}%{_bindir}/$file
-	ln -s {${file#?},${RPM_BUILD_ROOT}%{_mandir}/man1/$file}.1.gz
+make install DESTDIR=%{buildroot} \
+			docdir=%{_docdir}/%{name}-%{version} \
+			groffer_dir=%{_datadir}/%{name}/%{version}/groffer
+
+# some binaries need alias with 'g' or 'z' prefix
+
+for file in g{nroff,troff,tbl,pic,eqn,neqn,refer,lookbib,indxbib,soelim} zsoelim; do
+	ln -s ${file#?} %{buildroot}%{_bindir}/${file}
+	ln -s ${file#?}.1.gz %{buildroot}%{_mandir}/man1/${file}.1.gz
 done
 
-ln -s devnippon ${RPM_BUILD_ROOT}%{_datadir}/groff/%{version}/font/devkorean
+# perl dependent files in /usr/bin will be in separate package
 
-cat debian/mandoc.local >> ${RPM_BUILD_ROOT}%{_datadir}/groff/site-tmac/mdoc.local
-cat debian/mandoc.local >> ${RPM_BUILD_ROOT}%{_datadir}/groff/site-tmac/man.local
+rm -f files-perl files-nonperl
+for file in %{buildroot}%{_bindir}/*; do
+	# package selection
+	if grep -q -m1 '^#!.*\<perl\>' $file; then
+		output_file=files-perl
+	else
+		output_file=files-nonperl
+	fi
+
+	echo %{_bindir}/$(basename $file) >> $output_file
+
+	# manpage availability
+	manfile=%{buildroot}%{_mandir}/man1/$(basename $file).\*
+	if [ -f $manfile -o -L $manfile ]; then
+		echo %{_mandir}/man1/$(basename $file).\* >> $output_file
+	fi
+done
 
-find ${RPM_BUILD_ROOT}%{_bindir} ${RPM_BUILD_ROOT}%{_mandir} -type f -o -type l | \
-	sed "/afmtodit/d;/grog/d;/mdoc\.samples/d;/mmroff/d;/gxditview/d
-		s|${RPM_BUILD_ROOT}||g; s|\.[0-9]|\.*|g" > groff-files
+# another documentation files
 
-install -pm 644 %SOURCE6 $RPM_BUILD_ROOT%{_datadir}/groff/%version/tmac/hyphen.cs
+cp BUG-REPORT COPYING FDL LICENSES MORE.STUFF NEWS PROBLEMS %{buildroot}%{_docdir}/%{name}-%{version}
 
-install -pm 755 %SOURCE7 $RPM_BUILD_ROOT%{_bindir}/nroff
+# remove unnecessary files and fix privileges
 
-ln -sf doc.tmac $RPM_BUILD_ROOT%{_datadir}/groff/%version/tmac/docj.tmac
-# installed, but not packaged in rpm
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/groff/%{version}/groffer/
-chmod 755 $RPM_BUILD_ROOT%{_datadir}/groff/1.18.1.4/font/devps/generate/symbol.sed
-chmod 755 $RPM_BUILD_ROOT%{_datadir}/groff/1.18.1.4/font/devdvi/generate/CompileFonts
-chmod 755 $RPM_BUILD_ROOT%{_datadir}/groff/1.18.1.4/font/devps/generate/afmname
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/groff/groffer/version.sh
-mv $RPM_BUILD_ROOT%{_libdir}/groff/groffer/* $RPM_BUILD_ROOT/%{_datadir}/groff/%{version}/groffer/
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/groff $RPM_BUILD_ROOT%{_infodir}/dir $RPM_BUILD_ROOT/%{_prefix}/lib/X11/app-defaults
-rm -rf $RPM_BUILD_ROOT%{_libdir}/groff/groffer
-rm -rf $RPM_BUILD_ROOT%{_libdir}/groff/site-tmac
-rm -rf $RPM_BUILD_ROOT%{_libdir}/groff
+rm -f %{buildroot}%{_infodir}/dir
+
+chmod 755 %{buildroot}%{_datadir}/groff/%{version}/groffer/version.sh
+chmod 755 %{buildroot}%{_datadir}/groff/%{version}/font/devlj4/generate/special.awk
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 
 %post
-/sbin/install-info %{_infodir}/groff.gz %{_infodir}/dir;
-exit 0
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
 
 %preun
 if [ $1 = 0 ]; then
-	/sbin/install-info --delete %{_infodir}/groff.gz %{_infodir}/dir
+	/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
 fi
-exit 0
 
-%files -f groff-files
+%files -f files-nonperl
 %defattr(-,root,root,-)
-%doc	BUG-REPORT NEWS PROBLEMS README TODO VERSION
-%doc	doc/meintro.me doc/meref.me doc/pic.ms
-%{_datadir}/groff
-%{_infodir}/groff*
-
-%files perl
+%doc %{_docdir}/%{name}-%{version}/*.me
+%doc %{_docdir}/%{name}-%{version}/*.ps
+%doc %{_docdir}/%{name}-%{version}/*.ms
+%doc %{_docdir}/%{name}-%{version}/BUG-REPORT
+%doc %{_docdir}/%{name}-%{version}/COPYING
+%doc %{_docdir}/%{name}-%{version}/FDL
+%doc %{_docdir}/%{name}-%{version}/LICENSES
+%doc %{_docdir}/%{name}-%{version}/MORE.STUFF
+%doc %{_docdir}/%{name}-%{version}/NEWS
+%doc %{_docdir}/%{name}-%{version}/PROBLEMS
+%{_datadir}/groff/
+# manpages for binaries are covered by -f
+%{_mandir}/man1/grohtml.*
+%{_mandir}/man5/*
+%{_mandir}/man7/*
+%{_infodir}/groff.info*
+%exclude %{_datadir}/groff/%{version}/groffer
+%exclude %{_bindir}/gxditview
+%exclude %{_bindir}/xtotroff
+%exclude %{_mandir}/man1/gxditview.*
+%exclude %{_mandir}/man1/xtotroff.*
+
+%files perl -f files-perl
 %defattr(-,root,root,-)
-%{_bindir}/grog
-%{_bindir}/mmroff
-%{_bindir}/afmtodit
-%{_mandir}/man1/afmtodit.*
-%{_mandir}/man1/grog.*
-%{_mandir}/man1/mmroff*
+%{_datadir}/groff/%{version}/groffer/
 
 %if %{with_x}
-%files gxditview
+%files x11
 %defattr(-,root,root,-)
 %{_bindir}/gxditview
+%{_bindir}/xtotroff
 %{_datadir}/X11/app-defaults/GXditview
+%{_datadir}/X11/app-defaults/GXditview-color
+%{_mandir}/man1/gxditview.*
+%{_mandir}/man1/xtotroff.*
 %endif
 
+%files doc
+%defattr(-,root,root,-)
+%doc %{_docdir}/%{name}-%{version}/examples/
+%doc %{_docdir}/%{name}-%{version}/html/
+%doc %{_docdir}/%{name}-%{version}/pdf/
+
 %changelog
+* Tue Mar 12 2010 Jan Vcelak <jvcelak@redhat.com> - 1.20.1-0
+- Package rebase to upstream 1.20.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.18.1.4-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild