Author: qboosh Date: Sun Sep 11 17:13:10 2011 GMT Module: packages Tag: HEAD ---- Log message: - dropped makeinfo 4.7 hack, now groff BRs makeinfo 4.8 anyway - xtotroff belongs to gxditview, base package no longer requires X libs - moved chem and groffer to -perl - kill /usr/bin/env dependencies, run perl directly - distributed man pages over packages properly
---- Files affected: packages/groff: groff.spec (1.91 -> 1.92) ---- Diffs: ================================================================ Index: packages/groff/groff.spec diff -u packages/groff/groff.spec:1.91 packages/groff/groff.spec:1.92 --- packages/groff/groff.spec:1.91 Tue Aug 30 19:53:01 2011 +++ packages/groff/groff.spec Sun Sep 11 19:13:05 2011 @@ -1,5 +1,4 @@ # $Revision$, $Date$ -# Summary: A document formatting system Summary(de.UTF-8): Ein Dokumentformatierungssystem Summary(es.UTF-8): Paquete groff GNU - formateador de texto @@ -13,7 +12,7 @@ Version: 1.21 Release: 1 Epoch: 1 -License: GPL +License: GPL v3+ Group: Applications/Publishing Source0: http://ftp.gnu.org/gnu/groff/%{name}-%{version}.tar.gz # Source0-md5: 8b8cd29385b97616a0f0d96d0951c5bf @@ -25,12 +24,15 @@ Patch1: %{name}-grotty-wc-no-sgr.patch Patch2: %{name}-grofferdir-auto.patch URL: http://www.gnu.org/software/groff/ -BuildRequires: autoconf +BuildRequires: autoconf >= 2.62 BuildRequires: libstdc++-devel BuildRequires: netpbm-progs -BuildRequires: texinfo >= 4.5 +BuildRequires: perl-base +BuildRequires: sed >= 4.0 +BuildRequires: texinfo >= 4.8 BuildRequires: xorg-cf-files BuildRequires: xorg-lib-libXaw-devel +BuildRequires: xorg-lib-libXmu-devel BuildRequires: xorg-util-imake Requires: mktemp Obsoletes: groff-for-man @@ -194,18 +196,12 @@ %patch1 -p1 %patch2 -p1 -# makeinfo 4.7 has some problems when generating info without -# saving macro expanded file??? -cd doc -makeinfo -E groff.texinfo2 groff.texinfo -mv -f groff.texinfo2 groff.texinfo - %build %{__autoconf} CXXFLAGS="%{rpmcxxflags} -fno-rtti -fno-exceptions" %configure \ --docdir=%{_docdir}/%{name}-%{version} \ - --with-appresdir=%{_datadir}/X11/app-defaults \ + --with-appresdir=%{_appdefsdir} \ --with-grofferdir=%{_datadir}/%{name}/%{version}/groffer %{__make} -j1 @@ -243,23 +239,28 @@ echo ".so tbl.1" > $RPM_BUILD_ROOT%{_mandir}/man1/gtbl.1 echo ".so troff.1" > $RPM_BUILD_ROOT%{_mandir}/man1/gtroff.1 +for f in %{_bindir}/{chem,grog,groffer,roff2dvi,roff2html,roff2pdf,roff2ps,roff2text,roff2x} \ + %{_datadir}/%{name}/%{version}/groffer/{func,man,perl_test}.pl ; do + grep -q '^#! /usr/bin/env perl' $RPM_BUILD_ROOT$f || exit 1 + sed -i -e '1s,#! /usr/bin/env perl,#!/usr/bin/perl,' $RPM_BUILD_ROOT$f +done + bzip2 -dc %{SOURCE2} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} mv -f $RPM_BUILD_ROOT%{_mandir}/ja/{man7/mmroff.7,man1/mmroff.1} %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/postshell +%post -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} -%postun -p /sbin/postshell +%postun -p /sbin/postshell -/usr/sbin/fix-info-dir -c %{_infodir} %files %defattr(644,root,root,755) -%doc BUG-REPORT ChangeLog NEWS PROBLEMS PROJECTS README TODO +%doc BUG-REPORT ChangeLog LICENSES NEWS PROBLEMS PROJECTS README TODO %attr(755,root,root) %{_bindir}/addftinfo -%attr(755,root,root) %{_bindir}/chem %attr(755,root,root) %{_bindir}/eqn %attr(755,root,root) %{_bindir}/eqn2graph %attr(755,root,root) %{_bindir}/gdiffmk @@ -274,7 +275,6 @@ %attr(755,root,root) %{_bindir}/grn %attr(755,root,root) %{_bindir}/grodvi %attr(755,root,root) %{_bindir}/groff -%attr(755,root,root) %{_bindir}/groffer %attr(755,root,root) %{_bindir}/grolbp %attr(755,root,root) %{_bindir}/grolj4 %attr(755,root,root) %{_bindir}/grops @@ -296,20 +296,21 @@ %attr(755,root,root) %{_bindir}/pre-grohtml %attr(755,root,root) %{_bindir}/preconv %attr(755,root,root) %{_bindir}/refer -%attr(755,root,root) %{_bindir}/roff2dvi -%attr(755,root,root) %{_bindir}/roff2html -%attr(755,root,root) %{_bindir}/roff2pdf -%attr(755,root,root) %{_bindir}/roff2ps -%attr(755,root,root) %{_bindir}/roff2text -%attr(755,root,root) %{_bindir}/roff2x %attr(755,root,root) %{_bindir}/soelim %attr(755,root,root) %{_bindir}/tbl %attr(755,root,root) %{_bindir}/tfmtodit %attr(755,root,root) %{_bindir}/troff -%attr(755,root,root) %{_bindir}/xtotroff -%{_datadir}/groff +%dir %{_datadir}/groff +%dir %{_datadir}/groff/%{version} +%{_datadir}/groff/%{version}/eign +%{_datadir}/groff/%{version}/font +%{_datadir}/groff/%{version}/oldfont +%{_datadir}/groff/%{version}/pic +%{_datadir}/groff/%{version}/tmac +%{_datadir}/groff/current +%{_datadir}/groff/site-font +%{_datadir}/groff/site-tmac %{_mandir}/man1/addftinfo.1* -%{_mandir}/man1/chem.1* %{_mandir}/man1/eqn.1* %{_mandir}/man1/eqn2graph.1* %{_mandir}/man1/gdiffmk.1* @@ -324,7 +325,6 @@ %{_mandir}/man1/grn.1* %{_mandir}/man1/grodvi.1* %{_mandir}/man1/groff.1* -%{_mandir}/man1/groffer.1* %{_mandir}/man1/grohtml.1* %{_mandir}/man1/grolbp.1* %{_mandir}/man1/grolj4.1* @@ -343,20 +343,17 @@ %{_mandir}/man1/pfbtops.1* %{_mandir}/man1/pic.1* %{_mandir}/man1/pic2graph.1* +%{_mandir}/man1/preconv.1* %{_mandir}/man1/refer.1* -%{_mandir}/man1/roff2dvi.1* -%{_mandir}/man1/roff2html.1* -%{_mandir}/man1/roff2pdf.1* -%{_mandir}/man1/roff2ps.1* -%{_mandir}/man1/roff2text.1* -%{_mandir}/man1/roff2x.1* %{_mandir}/man1/soelim.1* %{_mandir}/man1/tbl.1* %{_mandir}/man1/tfmtodit.1* %{_mandir}/man1/troff.1* -%{_mandir}/man1/xtotroff.1* -%{_mandir}/man5/* -%{_mandir}/man7/[!m]* +%{_mandir}/man5/groff_*.5* +%{_mandir}/man5/lj4_font.5* +%{_mandir}/man7/ditroff.7* +%{_mandir}/man7/groff*.7* +%{_mandir}/man7/roff.7* %lang(de) %{_mandir}/de/man1/groff.1* @@ -394,8 +391,9 @@ %lang(ja) %{_mandir}/ja/man1/tbl.1* %lang(ja) %{_mandir}/ja/man1/tfmtodit.1* %lang(ja) %{_mandir}/ja/man1/troff.1* -%lang(ja) %{_mandir}/ja/man5/* -%lang(ja) %{_mandir}/ja/man7/[!m]* +%lang(ja) %{_mandir}/ja/man5/groff_*.5* +%lang(ja) %{_mandir}/ja/man7/groff*.7* +%lang(ja) %{_mandir}/ja/man7/roff.7* %lang(pl) %{_mandir}/pl/man1/gnroff.1* %lang(pl) %{_mandir}/pl/man1/groff.1* @@ -405,30 +403,49 @@ %lang(pl) %{_mandir}/pl/man1/soelim.1* %lang(pl) %{_mandir}/pl/man1/tbl.1* -%{_infodir}/*info* +%{_infodir}/groff.info* %files gxditview %defattr(644,root,root,755) %doc src/devices/xditview/{ChangeLog,README,TODO} %attr(755,root,root) %{_bindir}/gxditview +%attr(755,root,root) %{_bindir}/xtotroff %{_appdefsdir}/GXditview %{_appdefsdir}/GXditview-color -%{_mandir}/man1/* +%{_mandir}/man1/gxditview.1* +%{_mandir}/man1/xtotroff.1* %files perl %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/afmtodit +%attr(755,root,root) %{_bindir}/chem +%attr(755,root,root) %{_bindir}/groffer %attr(755,root,root) %{_bindir}/grog %attr(755,root,root) %{_bindir}/mmroff +%attr(755,root,root) %{_bindir}/roff2dvi +%attr(755,root,root) %{_bindir}/roff2html +%attr(755,root,root) %{_bindir}/roff2pdf +%attr(755,root,root) %{_bindir}/roff2ps +%attr(755,root,root) %{_bindir}/roff2text +%attr(755,root,root) %{_bindir}/roff2x %attr(755,root,root) %{_bindir}/trofftops -%{_mandir}/man1/afmtodit.* -%{_mandir}/man1/grog.* -%{_mandir}/man1/mmroff.* +%{_datadir}/groff/%{version}/groffer +%{_mandir}/man1/afmtodit.1* +%{_mandir}/man1/chem.1* +%{_mandir}/man1/grog.1* +%{_mandir}/man1/groffer.1* +%{_mandir}/man1/mmroff.1* +%{_mandir}/man1/roff2dvi.1* +%{_mandir}/man1/roff2html.1* +%{_mandir}/man1/roff2pdf.1* +%{_mandir}/man1/roff2ps.1* +%{_mandir}/man1/roff2text.1* +%{_mandir}/man1/roff2x.1* -%lang(fi) %{_mandir}/fi/man1/afmtodit.* +%lang(fi) %{_mandir}/fi/man1/afmtodit.1* -%lang(ja) %{_mandir}/ja/man1/grog.* -%lang(ja) %{_mandir}/ja/man1/mmroff.* +%lang(ja) %{_mandir}/ja/man1/grog.1* +%lang(ja) %{_mandir}/ja/man1/mmroff.1* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -436,6 +453,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.92 2011/09/11 17:13:05 qboosh +- dropped makeinfo 4.7 hack, now groff BRs makeinfo 4.8 anyway +- xtotroff belongs to gxditview, base package no longer requires X libs +- moved chem and groffer to -perl +- kill /usr/bin/env dependencies, run perl directly +- distributed man pages over packages properly + Revision 1.91 2011/08/30 17:53:01 arekm - up to 1.21; all patches dropped (obsolete or merged); new patches from fc ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/groff/groff.spec?r1=1.91&r2=1.92&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
