- move MetaPost back to the main package from texlive-context

- don't package dvipdfmx, it is now packaged separately (#433225)
This commit is contained in:
Jindrich Novy 2008-03-04 15:22:16 +00:00
parent 8b5e4fa3a0
commit 401cc64795
1 changed files with 30 additions and 13 deletions

View File

@ -7,8 +7,8 @@
%define pdvipsk_ver p1.7a
%define mendexk_ver 2.6e
%define dvipdfm_ver 0.13.2d
%define dvipdfmx_ver 0
%if %{f8_packaging}
%define dvipdfmx_ver 0
%define dvipng_ver 1.9
%endif
@ -27,7 +27,7 @@
Name: texlive
Version: %{texlive_ver}
Release: 22%{?dist}
Release: 23%{?dist}
Summary: Binaries for the TeX formatting system
Group: Applications/Publishing
@ -229,7 +229,7 @@ Summary: TeX typesetting engine using Unicode with OpenType or AAT support
Group: Applications/Publishing
Requires: texlive = %{version}-%{release}
Requires: texlive-texmf-xetex = %{version}
Requires: dvipdfmx
#Requires: dvipdfmx
%description xetex
XeTeX is a TeX typesetting engine using Unicode and supporting modern
@ -384,6 +384,7 @@ Requires: texlive-texmf-dvips = %{texlive_ver}
%description -n dvipdfm
DVI to PDF translator.
%if %{f8_packaging}
%package -n dvipdfmx
Summary: Extended version of the dvipdfm DVI to PDF translator
Version: %{dvipdfmx_ver}
@ -405,6 +406,7 @@ goal is to support as many features as pdfTeX developed by Han The Thanh.
This project is a combined work of the dvipdfm-jpn project by Shunsaku
Hirata and its modified one, dvipdfm-kor, by Jin-Hwan Cho.
%endif
# without this define, the version is overriden by separated subpackages
# versions
@ -487,6 +489,7 @@ popd
%endif
## Japanese pTeX
%if %{f8_packaging}
# create customized cid-x.map for dvipdfmx (#418091)
cat <<EOF >> texk/dvipdfmx/data/config/cid-x.map
%%
@ -499,6 +502,7 @@ gbm H !GothicBBB-Medium
rmlv V !Ryumin-Light
gbmv V !GothicBBB-Medium
EOF
%endif
# set platex to Japanese pLaTeX. original one is moved to platex-pl
sed -e s/^platex/platex-pl/g \
@ -720,6 +724,13 @@ rm %{buildroot}%{_mandir}/man1/texfind.1* %{buildroot}%{_mandir}/man1/fdf2tex.1*
%if !%{f8_packaging}
# remove dvipng, it's now packaged separately (#431356)
rm %{buildroot}%{_bindir}/dvipng %{buildroot}%{_mandir}/man1/dvipng.1* %{buildroot}%{_infodir}/dvipng.info*
# remove dvipdfmx, it's now packaged separately (#433225)
rm -rf %{buildroot}%{_texmf_main}/texk/dvipdfmx/ \
%{buildroot}%{_texmf_main}/dvipdfm/ \
%{buildroot}%{_texmf_conf}/dvipdfm/
rm %{buildroot}%{_bindir}/dvipdfmx
rm %{buildroot}%{_bindir}/xdvipdfmx
%endif
@ -823,6 +834,8 @@ fi
%{_bindir}/ctangle
%{_bindir}/ctie
%{_bindir}/cweave
%{_bindir}/dmp
%{_bindir}/dvitomp
%{_bindir}/etex
%{_bindir}/fmtutil
%{_bindir}/fmtutil-sys
@ -842,6 +855,7 @@ fi
%{_bindir}/lamed
%{_bindir}/mag
%{_bindir}/makeindex
%{_bindir}/makempx
%{_bindir}/mf-nowin
%{_bindir}/mft
%{_bindir}/mkindex
@ -851,6 +865,8 @@ fi
%{_bindir}/mktexlsr
%{_bindir}/mktexmf
%{_bindir}/mktextfm
%{_bindir}/mpost
%{_bindir}/mpto
%{_bindir}/newer
%{_bindir}/ofm2opl
%{_bindir}/omega
@ -910,6 +926,8 @@ fi
%{_mandir}/man1/ctie.1*
%{_mandir}/man1/cweave.1*
%{_mandir}/man1/cweb.1*
%{_mandir}/man1/dmp.1*
%{_mandir}/man1/dvitomp.1*
%{_mandir}/man1/eplain.1*
%{_mandir}/man1/etex.1*
%{_mandir}/man1/fmtutil.1*
@ -929,6 +947,7 @@ fi
%{_mandir}/man1/lambda.1*
%{_mandir}/man1/mag.1*
%{_mandir}/man1/makeindex.1*
%{_mandir}/man1/makempx.1*
%{_mandir}/man1/mf-nowin.1*
%{_mandir}/man1/mft.1*
%{_mandir}/man1/mkindex.1*
@ -938,6 +957,8 @@ fi
%{_mandir}/man1/mktexlsr.1*
%{_mandir}/man1/mktexmf.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*
@ -1137,6 +1158,7 @@ fi
%{_mandir}/man1/dvipdfm.1*
%{_mandir}/man1/dvipdft.1*
%if %{f8_packaging}
%files -n dvipdfmx
%defattr(-,root,root,-)
%doc texk/dvipdfmx/AUTHORS texk/dvipdfmx/ChangeLog
@ -1146,6 +1168,7 @@ fi
%{_bindir}/dvipdfmx
%{_bindir}/xdvipdfmx
%{_texmf_main}/dvipdfm/
%endif
%files east-asian
%doc %{_texmf_main}/doc/pdvipsk/
@ -1187,15 +1210,10 @@ fi
%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
@ -1210,12 +1228,7 @@ fi
%{_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*
@ -1226,6 +1239,10 @@ fi
%{_mandir}/man1/texutil.1*
%changelog
* Tue Mar 04 2008 Jindrich Novy <jnovy@redhat.com> - 2007-23
- move MetaPost back to the main package from texlive-context
- don't package dvipdfmx, it is now packaged separately (#433225)
* Mon Mar 03 2008 Jindrich Novy <jnovy@redhat.com> - 2007-22
- specify required version more properly for subpackages
- move xelatex to texlive-xetex