merge review

This commit is contained in:
vcrhonek 2008-01-25 11:20:07 +00:00
parent ab8f64d7fa
commit cb71596d18

View File

@ -1,3 +1,5 @@
%define tex_texinfo %{_datadir}/texmf/tex/texinfo
Summary: Tools needed to create Texinfo format documentation files Summary: Tools needed to create Texinfo format documentation files
Name: texinfo Name: texinfo
Version: 4.11 Version: 4.11
@ -28,12 +30,6 @@ are going to write documentation for the GNU Project.
%package -n info %package -n info
Summary: A stand-alone TTY-based reader for GNU texinfo documentation Summary: A stand-alone TTY-based reader for GNU texinfo documentation
Group: System Environment/Base Group: System Environment/Base
# By making info prereq bash, other packages which have triggers based on
# info don't run those triggers until bash is in place as well. This is an
# ugly method of doing it (triggers which fire on set intersection would
# be better), but it's the best we can do for now. Talk to Erik before
# removing this.
Prereq: bash
%description -n info %description -n info
The GNU project uses the texinfo file format for much of its The GNU project uses the texinfo file format for much of its
@ -45,6 +41,8 @@ Summary: Tools for formatting Texinfo documentation files using TeX
Group: Applications/Publishing Group: Applications/Publishing
Requires: texinfo = %{version}-%{release} Requires: texinfo = %{version}-%{release}
Requires: tetex Requires: tetex
Requires(post): %{_bindir}/texconfig-sys
Requires(postun): %{_bindir}/texconfig-sys
%description tex %description tex
Texinfo is a documentation system that can produce both online Texinfo is a documentation system that can produce both online
@ -70,16 +68,17 @@ mkdir -p ${RPM_BUILD_ROOT}/sbin
make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
mkdir -p $RPM_BUILD_ROOT%{tex_texinfo}
install -p -m644 doc/texinfo.tex doc/txi-??.tex $RPM_BUILD_ROOT%{tex_texinfo}
install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1/texi2pdf.1 install -p -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1/texi2pdf.1
install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_infodir}/dir install -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_infodir}/dir
mv $RPM_BUILD_ROOT%{_bindir}/install-info $RPM_BUILD_ROOT/sbin mv $RPM_BUILD_ROOT%{_bindir}/install-info $RPM_BUILD_ROOT/sbin
rm -f $RPM_BUILD_ROOT%{_datadir}/texinfo/texinfo.{xsl,dtd}
# Convert ChangeLog to UTF-8 # Convert ChangeLog to UTF-8
mv ChangeLog ChangeLog_iso /usr/bin/iconv -f iso-8859-2 -t utf-8 < ChangeLog > ChangeLog_utf8
/usr/bin/iconv -f iso-8859-2 -t utf-8 < ChangeLog_iso > ChangeLog touch -r ChangeLog ChangeLog_utf8
rm -f ChangeLog_iso mv ChangeLog_utf8 ChangeLog
%find_lang %name %find_lang %name
@ -103,6 +102,13 @@ if [ $1 = 0 ]; then
|| : || :
fi fi
%post tex
%{_bindir}/texconfig-sys rehash 2> /dev/null || :
%postun tex
%{_bindir}/texconfig-sys rehash 2> /dev/null || :
%files -f %{name}.lang %files -f %{name}.lang
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS ChangeLog INTRODUCTION NEWS README TODO COPYING %doc AUTHORS ChangeLog INTRODUCTION NEWS README TODO COPYING
@ -132,6 +138,7 @@ fi
%{_bindir}/texi2dvi %{_bindir}/texi2dvi
%{_bindir}/texi2pdf %{_bindir}/texi2pdf
%{_bindir}/pdftexi2dvi %{_bindir}/pdftexi2dvi
%{tex_texinfo}/
%{_mandir}/man1/texindex.1* %{_mandir}/man1/texindex.1*
%{_mandir}/man1/texi2dvi.1* %{_mandir}/man1/texi2dvi.1*
%{_mandir}/man1/texi2pdf.1* %{_mandir}/man1/texi2pdf.1*