Merge review.

This commit is contained in:
Marcela Mašláňová 2007-02-27 14:03:49 +00:00
parent 93e26c12ff
commit b2f7ab9b8d

View File

@ -1,11 +1,12 @@
%{!?with_x:%define with_x 1}
Summary: A document formatting system.
Name: groff
Summary: A document formatting system
Name: groff
Version: 1.18.1.4
Release: 2
Release: 4%{?dist}
License: GPL
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
@ -21,7 +22,7 @@ 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
#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
@ -29,18 +30,16 @@ 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
#Patch22: groff-1.18.1.1-bigendian.patch
Patch23: groff-1.18.1.1-spacefix.patch
Patch24: groff-1.18.1.4-sectmp.patch
URL: ftp://ftp.gnu.org/gnu/groff/
Requires: mktemp
Prereq: /sbin/install-info
Buildroot: %{_tmppath}/%{name}-root
Obsoletes: groff-tools
Provides: nroff-i18n
BuildRequires: netpbm-progs zlib-devel texinfo
BuildPrereq: byacc
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
%description
Groff is a document formatting system. Groff takes standard text and
@ -55,7 +54,7 @@ groff with the X Window System, you will also need to install the
groff-gxditview package.
%package perl
Summary: Parts of the groff formatting system that require Perl.
Summary: Parts of the groff formatting system that require Perl
Group: Applications/Publishing
%description perl
@ -67,7 +66,7 @@ troff-to-ps print filter.
%if %{with_x}
%package gxditview
Summary: An X previewer for groff text processor output.
Summary: An X previewer for groff text processor output
Group: Applications/Publishing
BuildRequires: imake xorg-x11-proto-devel libX11-devel libXaw-devel
BuildRequires: libXt-devel libXpm-devel libXext-devel
@ -111,7 +110,7 @@ done
#PATH=$PATH:%{_prefix}/X11R6/bin
#autoconf
%configure --enable-multibyte
make
make %{?_smp_mflags}
(cd doc && makeinfo groff.texinfo)
%if %{with_x}
cd src/xditview
@ -126,23 +125,23 @@ mkdir -p ${RPM_BUILD_ROOT}%{_prefix} ${RPM_BUILD_ROOT}%{_infodir}
#install -m 644 doc/groff.info* ${RPM_BUILD_ROOT}/%{_infodir}
%if %{with_x}
cd src/xditview
%makeinstall DESTDIR=$RPM_BUILD_ROOT
%makeinstall DESTDIR=${RPM_BUILD_ROOT}
cd ../..
%endif
#mv $RPM_BUILD_ROOT%{_prefix}/man $RPM_BUILD_ROOT%{_prefix}/share
ln -s s.tmac ${RPM_BUILD_ROOT}%{_datadir}/groff/%version/tmac/gs.tmac
ln -s mse.tmac ${RPM_BUILD_ROOT}%{_datadir}/groff/%version/tmac/gmse.tmac
ln -s m.tmac ${RPM_BUILD_ROOT}%{_datadir}/groff/%version/tmac/gm.tmac
ln -s s.tmac ${RPM_BUILD_ROOT}%{_datadir}/groff/%version/tmac/gs.tmac
ln -s mse.tmac ${RPM_BUILD_ROOT}%{_datadir}/groff/%version/tmac/gmse.tmac
ln -s m.tmac ${RPM_BUILD_ROOT}%{_datadir}/groff/%version/tmac/gm.tmac
ln -s troff ${RPM_BUILD_ROOT}%{_bindir}/gtroff
ln -s tbl ${RPM_BUILD_ROOT}%{_bindir}/gtbl
ln -s pic ${RPM_BUILD_ROOT}%{_bindir}/gpic
ln -s eqn ${RPM_BUILD_ROOT}%{_bindir}/geqn
ln -s neqn ${RPM_BUILD_ROOT}%{_bindir}/gneqn
ln -s refer ${RPM_BUILD_ROOT}%{_bindir}/grefer
ln -s lookbib ${RPM_BUILD_ROOT}%{_bindir}/glookbib
ln -s indxbib ${RPM_BUILD_ROOT}%{_bindir}/gindxbib
ln -s soelim ${RPM_BUILD_ROOT}%{_bindir}/gsoelim
ln -s soelim ${RPM_BUILD_ROOT}%{_bindir}/zsoelim
ln -s tbl ${RPM_BUILD_ROOT}%{_bindir}/gtbl
ln -s pic ${RPM_BUILD_ROOT}%{_bindir}/gpic
ln -s eqn ${RPM_BUILD_ROOT}%{_bindir}/geqn
ln -s neqn ${RPM_BUILD_ROOT}%{_bindir}/gneqn
ln -s refer ${RPM_BUILD_ROOT}%{_bindir}/grefer
ln -s lookbib ${RPM_BUILD_ROOT}%{_bindir}/glookbib
ln -s indxbib ${RPM_BUILD_ROOT}%{_bindir}/gindxbib
ln -s soelim ${RPM_BUILD_ROOT}%{_bindir}/gsoelim
ln -s soelim ${RPM_BUILD_ROOT}%{_bindir}/zsoelim
ln -s nroff ${RPM_BUILD_ROOT}%{_bindir}/gnroff
# Build system is compressing man-pages
@ -168,13 +167,16 @@ find ${RPM_BUILD_ROOT}%{_bindir} ${RPM_BUILD_ROOT}%{_mandir} -type f -o -type l
grep -v gxditview |\
sed "s|${RPM_BUILD_ROOT}||g" | sed "s|\.[0-9]|\.*|g" > groff-files
install -m 644 %SOURCE6 $RPM_BUILD_ROOT%{_datadir}/groff/%version/tmac/hyphen.cs
install -pm 644 %SOURCE6 $RPM_BUILD_ROOT%{_datadir}/groff/%version/tmac/hyphen.cs
install -m 755 %SOURCE7 $RPM_BUILD_ROOT%{_bindir}/nroff
install -pm 755 %SOURCE7 $RPM_BUILD_ROOT%{_bindir}/nroff
ln -sf doc.tmac $RPM_BUILD_ROOT%{_datadir}/groff/%version/tmac/docj.tmac
# installed, but not packaged in rpm
rm -fr $RPM_BUILD_ROOT%{_datadir}/doc/groff $RPM_BUILD_ROOT%{_infodir}/dir $RPM_BUILD_ROOT/usr/lib/X11/app-defaults
mkdir -p $RPM_BUILD_ROOT%{_datadir}/groff/%{version}/groffer/
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/%{_libdir}/X11/app-defaults \
$RPM_BUILD_ROOT%{_libdir}/groff/groffer
%clean
rm -rf ${RPM_BUILD_ROOT}
@ -185,20 +187,24 @@ exit 0
%preun
if [ $1 = 0 ]; then
/sbin/install-info --delete %{_infodir}/groff.gz %{_infodir}/dir
/sbin/install-info --delete %{_infodir}/groff.gz %{_infodir}/dir
fi
exit 0
%files -f groff-files
%defattr(-,root,root)
%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*
%{_libdir}/groff
%attr(0755,root,root) %{_datadir}/groff/1.18.1.4/font/devps/generate/afmname
%attr(0755,root,root) %{_datadir}/groff/1.18.1.4/font/devps/generate/symbol.sed
%attr(0755,root,root) %{_datadir}/groff/1.18.1.4/font/devdvi/generate/CompileFonts
%attr(0755,root,root) %{_datadir}/groff/1.18.1.4/groffer/version.sh
%files perl
%defattr(-,root,root)
%defattr(-,root,root,-)
%{_bindir}/grog
%{_bindir}/mmroff
%{_bindir}/afmtodit
@ -208,12 +214,19 @@ exit 0
%if %{with_x}
%files gxditview
%defattr(-,root,root)
%defattr(-,root,root,-)
%{_bindir}/gxditview
%{_datadir}/X11/app-defaults/GXditview
%endif
%changelog
* Tue Feb 27 2007 Marcela Maslanova <mmaslano@redhat.com> - 1.18.1.4-4
- merge review
- rhbz#225859
* Thu Feb 8 2007 Marcela Maslanova <mmaslano@redhat.com> - 1.18.1.4-3
- rhbz#225859 review
* Mon Jan 22 2007 Marcela Maslanova <mmaslano@redhat.com> - 1.18.1.4-2
- changes in spec, remove patches groff-1.18.1.1-bigendian.patch, groff-xlibs.patch
@ -474,7 +487,7 @@ exit 0
- do not change groff to use /etc/papersize. Deleted the changes
in the debian patch.
* Fri Mar 30 2001 Trond Eivind Glomsrød <teg@redhat.com>
* Fri Mar 30 2001 Trond Eivind Glomsrřd <teg@redhat.com>
- Add hyphen.cs - file generated as described in Czech how-to, 6.7
* Wed Mar 28 2001 Florian La Roche <Florian.LaRoche@redhat.de>