From 15eb7e9b65b61ecd14acbb57f2726cbf5417bc35 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@fedoraproject.org>
Date: Feb 19 2008 15:51:22 +0000
Subject: - package ConTeXt separately to get rid of the ruby dependency

- fix summary for texlive-japanese
- remove man pages with no corresponding binaries

---

diff --git a/texlive.spec b/texlive.spec
index 94b9fb8..ed9d295 100644
--- a/texlive.spec
+++ b/texlive.spec
@@ -13,6 +13,7 @@
 %define default_letter_paper 0
 # lcdf typetools can be easily built as a separate tool, so it should be
 %define disable_lcdf_typetools 1
+%define f8_packaging 0
 
 # These need to match what is in the texlive-texmf package.
 #  since texlive-texmf is a BuildRequires, it installs an rpm macro
@@ -24,7 +25,7 @@
 
 Name:		texlive
 Version:	%{texlive_ver}
-Release:	17%{?dist}
+Release:	18%{?dist}
 Summary:	Binaries for the TeX formatting system
 
 Group:		Applications/Publishing
@@ -135,9 +136,12 @@ BuildRequires:	ncurses-devel zlib-devel libpng-devel gd-devel t1lib-devel
 BuildRequires:	libSM-devel libICE-devel
 # for non-modular xorg - use xorg-devel instead of above
 BuildRequires:	Xaw3d-devel
+%if %{f8_packaging}
+BuildRequires:	poppler-devel >= 0.6.2-1
+%else
 BuildRequires:	poppler-devel >= 0.6.2-2
+%endif
 BuildRequires:	teckit-devel
-Requires:	ruby
 Requires:	texlive-texmf = %{version}
 Requires:	texlive-texmf-fonts = %{version}
 Requires:	texlive-texmf-errata = %{version}
@@ -291,17 +295,29 @@ compile LaTeX files directly to PDF format.
 The TeX documentation is located in the texlive-doc package.
 
 %package japanese
-Summary: DVI to PDF translator
+Summary: Japanese support for TeXLive
 Group: Applications/Publishing
 Requires: texlive = %{version}
+Requires: texlive-latex = %{version}
 Requires: texlive-texmf-dvips = %{version}
-Requires: texlive-texmf-errata = %{version}
+Requires: texlive-texmf-errata-japanese = %{version}
 Provides: tex(japanese)
 Requires: mendexk
 
 %description japanese
 Japanese support for TeXLive.
 
+%package context
+Summary: ConTeXt is a document preparation system based on TeX
+Group: Applications/Publishing
+Requires: texlive = %{version}
+Requires: texlive-texmf-errata-context = %{version}
+Requires: ruby
+Provides: tex(context)
+
+%description context
+ConTeXt is a document preparation system based on TeX.
+
 %package -n kpathsea
 Summary: Shared library needed by kpathsea and info files
 Group:   Development/Libraries
@@ -687,6 +703,9 @@ mv %{buildroot}%{_texmf_main}/dvipdfm/cid-x.map %{buildroot}%{_texmf_conf}/dvipd
 rm %{buildroot}%{_bindir}/devnag
 rm %{buildroot}%{_bindir}/afm2pl %{buildroot}%{_mandir}/man1/afm2pl.1*
 
+# remove unused ConTeXt stuff
+rm %{buildroot}%{_mandir}/man1/texfind.1* %{buildroot}%{_mandir}/man1/fdf2tex.1*
+
 %clean
 rm -rf %{buildroot}
 
@@ -783,8 +802,6 @@ fi
 %{_bindir}/ctangle
 %{_bindir}/ctie
 %{_bindir}/cweave
-%{_bindir}/dvitomp
-%{_bindir}/dmp
 %{_bindir}/etex
 %{_bindir}/fmtutil
 %{_bindir}/fmtutil-sys
@@ -804,8 +821,6 @@ fi
 %{_bindir}/lamed
 %{_bindir}/mag
 %{_bindir}/makeindex
-%{_bindir}/makempx
-%{_bindir}/makempy
 %{_bindir}/mf-nowin
 %{_bindir}/mft
 %{_bindir}/mkindex
@@ -816,9 +831,6 @@ fi
 %{_bindir}/mktexmf
 %{_bindir}/mktexpk
 %{_bindir}/mktextfm
-%{_bindir}/mpost
-%{_bindir}/mpto
-%{_bindir}/mptopdf
 %{_bindir}/newer
 %{_bindir}/ofm2opl
 %{_bindir}/omega
@@ -847,11 +859,8 @@ fi
 %{_bindir}/texconfig
 %{_bindir}/texconfig-dialog
 %{_bindir}/texconfig-sys
-%{_bindir}/texexec
-%{_bindir}/texfont
 %{_bindir}/texhash
 %{_bindir}/texlinks
-%{_bindir}/texutil
 %{_bindir}/tftopl
 %{_bindir}/tie
 %{_bindir}/updmap
@@ -862,38 +871,18 @@ fi
 # new files not in Fedora tetex
 %{_bindir}/bibtex8
 %{_bindir}/csplain
-%{_bindir}/hbf2gf
 # separated project
 %{_bindir}/mltex
 %{_bindir}/pdfcsplain
-# not positive these belong here
-%{_bindir}/bg5conv
-%{_bindir}/cef5conv
-%{_bindir}/cefconv
-%{_bindir}/cefsconv
 # separated project
 %{_bindir}/eplain
 %{_bindir}/extconv
 %{_bindir}/musixflx
 %{_bindir}/physe
 %{_bindir}/phyzzx
-%{_bindir}/sjisconv
 %{_bindir}/texsis
 # other utilities
-%{_bindir}/ctxtools
-%{_bindir}/exatools
-%{_bindir}/luatools
-%{_bindir}/mpstools
-%{_bindir}/mtxtools
-%{_bindir}/pdftools
 %{_bindir}/pdftosrc
-%{_bindir}/pstopdf
-%{_bindir}/rlxtools
-%{_bindir}/runtools
-%{_bindir}/texmfstart
-%{_bindir}/textools
-%{_bindir}/tmftools
-%{_bindir}/xmltools
 # man pages
 %{_mandir}/man1/amstex.1*
 %{_mandir}/man1/bibtex.1*
@@ -901,11 +890,8 @@ fi
 %{_mandir}/man1/ctie.1*
 %{_mandir}/man1/cweave.1*
 %{_mandir}/man1/cweb.1*
-%{_mandir}/man1/dvitomp.1*
-%{_mandir}/man1/dmp.1*
 %{_mandir}/man1/eplain.1*
 %{_mandir}/man1/etex.1*
-%{_mandir}/man1/fdf2tex.1*
 %{_mandir}/man1/fmtutil.1*
 %{_mandir}/man1/fmtutil-sys.1*
 %{_mandir}/man1/fontinst.1*
@@ -923,8 +909,6 @@ fi
 %{_mandir}/man1/lambda.1*
 %{_mandir}/man1/mag.1*
 %{_mandir}/man1/makeindex.1*
-%{_mandir}/man1/makempx.1*
-%{_mandir}/man1/makempy.1*
 %{_mandir}/man1/mf-nowin.1*
 %{_mandir}/man1/mft.1*
 %{_mandir}/man1/mkindex.1*
@@ -935,8 +919,6 @@ fi
 %{_mandir}/man1/mktexmf.1*
 %{_mandir}/man1/mktexpk.1*
 %{_mandir}/man1/mktextfm.1*
-%{_mandir}/man1/mpost.1*
-%{_mandir}/man1/mpto.1*
 %{_mandir}/man1/newer.1*
 %{_mandir}/man1/ofm2opl.1*
 %{_mandir}/man1/omega.1*
@@ -962,12 +944,8 @@ fi
 %{_mandir}/man1/tex.1*
 %{_mandir}/man1/texconfig.1*
 %{_mandir}/man1/texconfig-sys.1*
-%{_mandir}/man1/texexec.1*
-%{_mandir}/man1/texfind.1*
-%{_mandir}/man1/texfont.1*
 %{_mandir}/man1/texhash.1*
 %{_mandir}/man1/texlinks.1*
-%{_mandir}/man1/texutil.1*
 %{_mandir}/man1/tftopl.1*
 %{_mandir}/man1/tie.1*
 %{_mandir}/man1/updmap.1*
@@ -977,18 +955,9 @@ fi
 %{_mandir}/man1/weave.1*
 %{_mandir}/man5/fmtutil.cnf.5*
 # new files not in Fedora tetex
-%{_mandir}/man1/hbf2gf.1*
 %{_mandir}/man5/updmap.cfg.*
 # man pages for other utilities
-%{_mandir}/man1/ctxtools.1*
-%{_mandir}/man1/mptopdf.1*
-%{_mandir}/man1/pdftools.1*
 %{_mandir}/man1/pdftosrc.1*
-%{_mandir}/man1/pstopdf.1*
-%{_mandir}/man1/texmfstart.1*
-%{_mandir}/man1/textools.1*
-%{_texmf_main}/texconfig/tcfmgr*
-%{_texmf_main}/bibtex/
 # other stuff
 %{_sysconfdir}/cron.daily/texlive.cron
 %{_infodir}/web2c.info.*
@@ -996,6 +965,8 @@ fi
 %{_texmf_main}/web2c/mktexdir
 %{_texmf_main}/web2c/mktexnam
 %{_texmf_main}/web2c/mktexupd
+%{_texmf_main}/bibtex/
+%{_texmf_main}/texconfig/tcfmgr*
 
 %files utils
 %defattr(-,root,root,-)
@@ -1102,24 +1073,10 @@ fi
 %{_mandir}/man1/pslatex.1*
 %{_infodir}/latex.info.*
 # not in fedora tetex
-%{_bindir}/bg5+latex
-%{_bindir}/bg5+pdflatex
-%{_bindir}/bg5latex
-%{_bindir}/bg5pdflatex
-%{_bindir}/cef5latex
-%{_bindir}/cef5pdflatex
-%{_bindir}/ceflatex
-%{_bindir}/cefpdflatex
-%{_bindir}/cefslatex
-%{_bindir}/cefspdflatex
 %{_bindir}/cslatex
-%{_bindir}/gbklatex
-%{_bindir}/gbkpdflatex
 %{_bindir}/lacheck
 %{_bindir}/mllatex
 %{_bindir}/pdfcslatex
-%{_bindir}/sjislatex
-%{_bindir}/sjispdflatex
 %{_mandir}/man1/lacheck.1*
 
 %files -n kpathsea
@@ -1170,21 +1127,87 @@ fi
 %files japanese
 %doc %{_texmf_main}/doc/pdvipsk/
 %doc %{_texmf_main}/doc/ptex/
-%{_bindir}/jbibtex
-%{_bindir}/ptex
+%{_texmf_main}/fonts/map/pdvips/
+%{_texmf_main}/pdvips/
 %{_texmf_main}/web2c/ptex.pool
+%{_bindir}/bg5+latex
+%{_bindir}/bg5+pdflatex
+%{_bindir}/bg5latex
+%{_bindir}/bg5pdflatex
+%{_bindir}/cef5latex
+%{_bindir}/cef5pdflatex
+%{_bindir}/ceflatex
+%{_bindir}/cefpdflatex
+%{_bindir}/cefslatex
+%{_bindir}/cefspdflatex
+%{_bindir}/bg5conv
+%{_bindir}/cef5conv
+%{_bindir}/cefconv
+%{_bindir}/cefsconv
+%{_bindir}/gbklatex
+%{_bindir}/gbkpdflatex
+%{_bindir}/hbf2gf
+%{_bindir}/jbibtex
+%{_bindir}/pdfplatex-pl
 %{_bindir}/pdvips
-%{_bindir}/opdvips
 %{_bindir}/pdvitype
-%{_texmf_main}/pdvips/
-%{_texmf_main}/fonts/map/pdvips/
-%{_mandir}/man1/pdvips.1*
-%{_mandir}/man1/opdvips.1*
 %{_bindir}/platex-pl
-%{_bindir}/pdfplatex-pl
 %{_bindir}/platex209
+%{_bindir}/ptex
+%{_bindir}/sjisconv
+%{_bindir}/sjislatex
+%{_bindir}/sjispdflatex
+%{_bindir}/opdvips
+%{_mandir}/man1/hbf2gf.1*
+%{_mandir}/man1/pdvips.1*
+%{_mandir}/man1/opdvips.1*
+
+%files context
+%{_bindir}/ctxtools
+%{_bindir}/dvitomp
+%{_bindir}/dmp
+%{_bindir}/exatools
+%{_bindir}/luatools
+%{_bindir}/makempx
+%{_bindir}/makempy
+%{_bindir}/mpost
+%{_bindir}/mpstools
+%{_bindir}/mpto
+%{_bindir}/mptopdf
+%{_bindir}/mtxtools
+%{_bindir}/pdftools
+%{_bindir}/pstopdf
+%{_bindir}/rlxtools
+%{_bindir}/runtools
+%{_bindir}/texexec
+%{_bindir}/texfont
+%{_bindir}/texmfstart
+%{_bindir}/textools
+%{_bindir}/texutil
+%{_bindir}/tmftools
+%{_bindir}/xmltools
+%{_mandir}/man1/ctxtools.1*
+%{_mandir}/man1/dvitomp.1*
+%{_mandir}/man1/dmp.1*
+%{_mandir}/man1/makempx.1*
+%{_mandir}/man1/makempy.1*
+%{_mandir}/man1/mpost.1*
+%{_mandir}/man1/mpto.1*
+%{_mandir}/man1/mptopdf.1*
+%{_mandir}/man1/pdftools.1*
+%{_mandir}/man1/pstopdf.1*
+%{_mandir}/man1/texexec.1*
+%{_mandir}/man1/texfont.1*
+%{_mandir}/man1/texmfstart.1*
+%{_mandir}/man1/textools.1*
+%{_mandir}/man1/texutil.1*
 
 %changelog
+* Tue Feb 19 2008 Jindrich Novy <jnovy@redhat.com> - 2007-18
+- package ConTeXt separately to get rid of the ruby dependency
+- fix summary for texlive-japanese
+- remove man pages with no corresponding binaries
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2007-17
 - Autorebuild for GCC 4.3