diff options
| -rw-r--r-- | groff.spec | 21 |
1 files changed, 14 insertions, 7 deletions
@@ -1,9 +1,9 @@ -%{!?with_xfree86:%define with_xfree86 1} +%{!?with_x:%define with_x 1} Summary: A document formatting system. Name: groff Version: 1.18.1 -Release: 34 +Release: 35 License: GPL Group: Applications/Publishing Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz @@ -30,7 +30,11 @@ Prereq: /sbin/install-info Buildroot: %{_tmppath}/%{name}-root Obsoletes: groff-tools Provides: nroff-i18n -BuildRequires: netpbm-progs, zlib-devel, XFree86-devel, texinfo +BuildRequires: netpbm-progs zlib-devel texinfo +BuildPrereq: byacc +%if %{with_x} +BuildRequires: xorg-x11-devel +%endif %description Groff is a document formatting system. Groff takes standard text and @@ -55,7 +59,7 @@ 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. -%if %{with_xfree86} +%if %{with_x} %package gxditview Summary: An X previewer for groff text processor output. Group: Applications/Publishing @@ -87,7 +91,7 @@ PATH=$PATH:%{_prefix}/X11R6/bin %configure --enable-japanese --enable-multibyte make (cd doc && makeinfo groff.texinfo) -%if %{with_xfree86} +%if %{with_x} cd src/xditview xmkmf && make %endif @@ -98,7 +102,7 @@ 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} -%if %{with_xfree86} +%if %{with_x} cd src/xditview %makeinstall DESTDIR=$RPM_BUILD_ROOT cd ../.. @@ -177,7 +181,7 @@ fi %{_mandir}/man1/grog.* %{_mandir}/man1/mmroff* -%if %{with_xfree86} +%if %{with_x} %files gxditview %defattr(-,root,root) %{_prefix}/X11R6/bin/gxditview @@ -185,6 +189,9 @@ fi %endif %changelog +* Mon Jun 7 2004 Thomas Woerner <twoerner@redhat.com> 1.18.1-35 +- fixed build prereq and requires + * Mon Mar 8 2004 Thomas Woerner <twoerner@redhat.com> 1.18.1-34 - new debian groff patch: groff_1.18.1-15.diff - new fix for debian patch: groff-1.18.1-fix15.patch |