From a158aded170ed914b47f6a8c7f9bd9cdbe2768aa Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Mon, 28 Jan 2008 07:27:59 +0000 Subject: [PATCH] - package Japanese separately -> texlive-japanese - add missing BR: texlive-texmf-fonts (#430338) - temporarily disable BR: texlive in kpathsea --- texlive.spec | 116 ++++++++++++++++++++++----------------------------- 1 file changed, 49 insertions(+), 67 deletions(-) diff --git a/texlive.spec b/texlive.spec index 88c0409..9bed29f 100644 --- a/texlive.spec +++ b/texlive.spec @@ -9,8 +9,6 @@ %define dvipdfmx_ver 0 %define dvipng_ver 1.9 -%define enable_japanese 1 - %define desktop_file_utils_version 0.9 %define default_letter_paper 0 # lcdf typetools can be easily built as a separate tool, so it should be @@ -26,7 +24,7 @@ Name: texlive Version: %{texlive_ver} -Release: 15%{?dist} +Release: 16%{?dist} Summary: Binaries for the TeX formatting system Group: Applications/Publishing @@ -141,11 +139,8 @@ BuildRequires: poppler-devel >= 0.6.2-2 BuildRequires: teckit-devel Requires: ruby Requires: texlive-texmf = %{version} +Requires: texlive-texmf-fonts = %{version} Requires: texlive-texmf-errata = %{version} -# used to be in tetex, but is a separated project -%if %{enable_japanese} -Requires: mendexk -%endif # make sure fonts package installed before running post - since # fmtutil-sys is symlink to fmtutil Requires(post): %{_bindir}/fmtutil @@ -240,12 +235,13 @@ by default. Summary: A DVI to PostScript converter for the TeX text formatting system Group: Applications/Publishing Requires: texlive = %{version}-%{release} -Requires: psutils +Obsoletes: tetex < 3.0-99 Obsoletes: tetex-dvips < 3.0-99 Provides: tetex-dvips = 3.0-99 Requires: texlive-texmf-dvips = %{version} Requires: texlive-texmf-errata = %{version} Provides: tex(dvips) +Requires: psutils %description dvips Dvips converts .dvi files, for example those produced by the TeX text @@ -279,6 +275,7 @@ Requires: netpbm-progs # make sure main and fonts package installed before running post Requires(post): %{_bindir}/fmtutil %{_bindir}/fmtutil-sys BuildRequires: ghostscript netpbm-progs +Obsoletes: tetex < 3.0-99 Obsoletes: tetex-latex < 3.0-99 Provides: tetex-latex = 3.0-99 Requires: texlive-texmf-latex = %{version} @@ -293,11 +290,23 @@ compile LaTeX files directly to PDF format. The TeX documentation is located in the texlive-doc package. +%package japanese +Summary: DVI to PDF translator +Group: Applications/Publishing +Requires: texlive = %{version} +Requires: texlive-texmf-dvips = %{version} +Requires: texlive-texmf-errata = %{version} +Provides: tex(japanese) +Requires: mendexk + +%description japanese +Japanese support for TeXLive. + %package -n kpathsea Summary: Shared library needed by kpathsea and info files Group: Development/Libraries Obsoletes: tetex-fonts < 3.0-99 -Requires: texlive = %{version}-%{release} +#Requires: texlive = %{version}-%{release} %description -n kpathsea Shared library needed by kpathsea and info files. @@ -451,7 +460,6 @@ popd %endif ## Japanese pTeX -%if %{enable_japanese} # create customized cid-x.map for dvipdfmx (#418091) cat <> texk/dvipdfmx/data/config/cid-x.map %% @@ -492,7 +500,6 @@ ln -s dvips.1 texk/pdvipsk/pdvips.1 # set up mendexk tar xfz %{SOURCE1002} -C texk -%endif %build @@ -505,11 +512,9 @@ unset HOME ||: %{__rm} -r libs/{teckit,obsdcompat} # Japanese pTeX -%if %{enable_japanese} pushd texk $RPM_BUILD_DIR/%{name}-%{version}/texk/autoconf2.13 -m $RPM_BUILD_DIR/%{name}-%{version}/texk/etc/autoconf popd -%endif %configure \ %if %{default_letter_paper} @@ -552,7 +557,6 @@ popd # %%{?_smp_mflags} does not work in texlive-2007/libs/icu-xetex/common make -%if %{enable_japanese} cd texk/web2c/ptex-src-%{ptex_src_ver} ./configure EUC make @@ -563,7 +567,6 @@ cd texk/mendexk%{mendexk_ver} ./configure EUC make cd - -%endif %install @@ -632,8 +635,6 @@ rm -rf %{buildroot}%{_texmf_main}/web2c/*.pool # ptex pool file is added later, and therefore kept # Japanese pTeX -%if %{enable_japanese} -# remove %{buildroot}%{_bindir}/platex rm -f %{buildroot}%{_bindir}/platex # Convert documents to UTF-8 mkdir -p %{buildroot}%{_texmf_main}/doc/ptex/ptex-src-%{name} \ @@ -673,7 +674,6 @@ install -p -m 644 COPYRIGHT ChangeLog %{buildroot}%{_datadir}/texmf/doc/mendexk- iconv -f EUC-JP -t UTF-8 README -o %{buildroot}%{_datadir}/texmf/doc/mendexk-%{name}/README iconv -f ISO-2022-JP -t UTF-8 COPYRIGHT.jis -o %{buildroot}%{_datadir}/texmf/doc/mendexk-%{name}/COPYRIGHT.jis cd - -%endif # remove useless files in texconfig rm -rf %{buildroot}%{_texmf_main}/texconfig/{g,v,x,README,generic} @@ -769,7 +769,12 @@ fi %defattr(-,root,root,-) # config files %dir %{_texmf_conf} -%dir %{_texmf_conf}/web2c +%dir %{_texmf_conf}/web2c/ +%dir %{_texmf_var}/web2c/ +%dir %{_texmf_main}/web2c/ +%dir %{_texmf_main}/doc/ +%doc %{_texmf_main}/doc/bibtex8/ +%doc __fedora_kpathsea/fmtutil.cnf-init %config(noreplace) %{_texmf_conf}/web2c/mktexdir.opt # binaries %{_bindir}/aleph @@ -889,11 +894,6 @@ fi %{_bindir}/textools %{_bindir}/tmftools %{_bindir}/xmltools -# Japanese pTeX -%if %{enable_japanese} -%{_bindir}/jbibtex -%{_bindir}/ptex -%endif # man pages %{_mandir}/man1/amstex.1* %{_mandir}/man1/bibtex.1* @@ -987,22 +987,8 @@ fi %{_mandir}/man1/pstopdf.1* %{_mandir}/man1/texmfstart.1* %{_mandir}/man1/textools.1* -# Japanese pTeX -%dir %{_texmf_main}/web2c %{_texmf_main}/texconfig/tcfmgr* %{_texmf_main}/bibtex/ -# Japanese pTeX -%if %{enable_japanese} -%{_texmf_main}/web2c/ptex.pool -%endif -%dir %{_texmf_main}/doc -%doc %{_texmf_main}/doc/bibtex8/ -# Japanese pTeX -%if %{enable_japanese} -%doc %{_texmf_main}/doc/ptex/ -%endif -%dir %{_texmf_var}/web2c/ -%doc __fedora_kpathsea/fmtutil.cnf-init # other stuff %{_sysconfdir}/cron.daily/texlive.cron %{_infodir}/web2c.info.* @@ -1056,17 +1042,6 @@ fi %{_mandir}/man1/dvired.1* %{_mandir}/man1/odvips.1* %{_infodir}/dvips.info.* -# Japanese pTeX -%if %{enable_japanese} -%{_bindir}/pdvips -%{_bindir}/opdvips -%{_bindir}/pdvitype -%{_texmf_main}/pdvips/ -%{_texmf_main}/fonts/map/pdvips/ -%{_mandir}/man1/pdvips.1* -%{_mandir}/man1/opdvips.1* -%doc %{_texmf_main}/doc/pdvipsk/ -%endif %files doc %defattr(-,root,root,-) @@ -1120,11 +1095,7 @@ fi %{_bindir}/latex %{_bindir}/pdflatex %{_bindir}/xelatex -%if %{enable_japanese} -%{_bindir}/platex-pl -%else %{_bindir}/platex -%endif %{_bindir}/pslatex %{_mandir}/man1/latex.1* %{_mandir}/man1/pdflatex.1* @@ -1147,25 +1118,15 @@ fi %{_bindir}/lacheck %{_bindir}/mllatex %{_bindir}/pdfcslatex -%if %{enable_japanese} -%{_bindir}/pdfplatex-pl -%else -%{_bindir}/pdfplatex -%endif %{_bindir}/sjislatex %{_bindir}/sjispdflatex %{_mandir}/man1/lacheck.1* -# Japanese pTeX -%if %{enable_japanese} -%{_bindir}/platex -%{_bindir}/platex209 -%endif %files -n kpathsea %defattr(-,root,root,-) +%doc __fedora_kpathsea/kpathsea_defaults/ %{_libdir}/libkpathsea.so.* %{_infodir}/kpathsea.info.* -%doc __fedora_kpathsea/kpathsea_defaults/ %files -n kpathsea-devel %defattr(-,root,root,-) @@ -1183,11 +1144,9 @@ fi %files -n mendexk %defattr(-,root,root,-) -%if %{enable_japanese} +%doc %{_texmf_main}/doc/mendexk-%{name}/ %{_bindir}/mendex %{_mandir}/ja/man1/mendex.1* -%doc %{_texmf_main}/doc/mendexk-%{name}/ -%endif %files -n dvipdfm %defattr(-,root,root,-) @@ -1199,6 +1158,7 @@ fi %{_mandir}/man1/dvipdft.1* %files -n dvipdfmx +%defattr(-,root,root,-) %doc texk/dvipdfmx/AUTHORS texk/dvipdfmx/ChangeLog %doc texk/dvipdfmx/COPYING texk/dvipdfmx/README %dir %{_texmf_conf}/dvipdfm/ @@ -1207,7 +1167,29 @@ fi %{_bindir}/xdvipdfmx %{_texmf_main}/dvipdfm/ +%files japanese +%doc %{_texmf_main}/doc/pdvipsk/ +%doc %{_texmf_main}/doc/ptex/ +%{_bindir}/jbibtex +%{_bindir}/ptex +%{_texmf_main}/web2c/ptex.pool +%{_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 + %changelog +* Mon Jan 28 2008 Jindrich Novy - 2007-16 +- package Japanese separately -> texlive-japanese +- add missing BR: texlive-texmf-fonts (#430338) +- temporarily disable BR: texlive in kpathsea + * Wed Jan 23 2008 Jindrich Novy - 2007-15 - dependency pruning: (#428489, #429753) - package XeTeX separately