From a590a0f387e39a7caa286b09b601de994184ed41 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Mon, 10 Mar 2008 16:37:49 +0000 Subject: [PATCH] - put back dvipdfmx requires for xelatex (#433225) - don't compile unpackaged stuff - enable parallel build --- texlive.spec | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/texlive.spec b/texlive.spec index 2422b0d..def83b9 100644 --- a/texlive.spec +++ b/texlive.spec @@ -27,7 +27,7 @@ Name: texlive Version: %{texlive_ver} -Release: 23%{?dist} +Release: 24%{?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 @@ -576,17 +576,27 @@ popd %if %{disable_lcdf_typetools} --with-lcdf-typetools=no \ %endif - --with-mf-x-toolkit=yes \ --without-xdvik \ - --without-cxx-runtime-hack + --with-mf-x-toolkit=yes \ + --without-cxx-runtime-hack \ +%if !%{f8_packaging} + --without-dvipng \ + --without-dvipdfmx \ + --without-xdvipdfmx +%endif # Remove everything except: # icu: includes some changes # md5: the aladdin md5 code (not a library) %{__rm} -r libs/{curl,expat,freetype,freetype2,gd,howto,jpeg,libgnuw32,libgsw32,libpng,libttf,ncurses,regex,unzip,zlib,type1,t1lib,xpdf}/ -# %%{?_smp_mflags} does not work in texlive-2007/libs/icu-xetex/common +# parallel build fails in libs/icu-xetex/common, build this one sequentially +cd libs/icu-xetex make +cd - + +# compile the rest parallelly +make %{?_smp_mflags} cd texk/web2c/ptex-src-%{ptex_src_ver} ./configure EUC @@ -712,7 +722,9 @@ rm -rf %{buildroot}%{_texmf_main}/texconfig/{g,v,x,README,generic} # move the configuration files that should be under user control mkdir -p %{buildroot}%{_texmf_conf}/{web2c/,dvipdfm/} mv %{buildroot}%{_texmf_main}/web2c/mktexdir.opt %{buildroot}%{_texmf_conf}/web2c/ +%if %{f8_packaging} mv %{buildroot}%{_texmf_main}/dvipdfm/cid-x.map %{buildroot}%{_texmf_conf}/dvipdfm/ +%endif # separated projects rm %{buildroot}%{_bindir}/devnag @@ -721,19 +733,6 @@ rm %{buildroot}%{_bindir}/afm2pl %{buildroot}%{_mandir}/man1/afm2pl.1* # remove unused ConTeXt stuff 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 - - %clean rm -rf %{buildroot} @@ -1164,9 +1163,11 @@ fi %doc texk/dvipdfmx/AUTHORS texk/dvipdfmx/ChangeLog %doc texk/dvipdfmx/COPYING texk/dvipdfmx/README %dir %{_texmf_conf}/dvipdfm/ +%if %{f8_packaging} %config(noreplace) %{_texmf_conf}/dvipdfm/cid-x.map %{_bindir}/dvipdfmx %{_bindir}/xdvipdfmx +%endif %{_texmf_main}/dvipdfm/ %endif @@ -1239,6 +1240,11 @@ fi %{_mandir}/man1/texutil.1* %changelog +* Sat Mar 08 2008 Jindrich Novy - 2007-24 +- put back dvipdfmx requires for xelatex (#433225) +- don't compile unpackaged stuff +- enable parallel build + * Tue Mar 04 2008 Jindrich Novy - 2007-23 - move MetaPost back to the main package from texlive-context - don't package dvipdfmx, it is now packaged separately (#433225)