diff --git a/texlive.spec b/texlive.spec index 88d0a48..c69f985 100644 --- a/texlive.spec +++ b/texlive.spec @@ -1,11 +1,11 @@ # This spec file is based on texjive project created by Michael A. Peters. # Adopted and modified for Fedora by Jindrich Novy. -%define f8_packaging 0 +%define f8_packaging 0 %define texlive_ver 2007 -%define ptex_src_ver 3.1.10 +%define ptex_src_ver 3.1.10 %define pdvipsk_ver p1.7a -%define mendexk_ver 2.6e +%define mendexk_ver 2.6e %define dvipdfm_ver 0.13.2d %define dvipdfmx_ver 0 %if %{f8_packaging} @@ -27,7 +27,7 @@ Name: texlive Version: %{texlive_ver} -Release: 19%{?dist} +Release: 20%{?dist} Summary: Binaries for the TeX formatting system Group: Applications/Publishing @@ -59,76 +59,76 @@ Source1002: ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/mendex/mendexk%{mendexk_ver ###### # and sane defaults to build against can be inserted via sed -Patch5: texlive-2007-browser.patch -Patch9: texlive-teckit.patch +Patch5: texlive-2007-browser.patch +Patch9: texlive-teckit.patch -Patch21: texlive-more_paths.patch -Patch22: texlive-fedora_paths.patch +Patch21: texlive-more_paths.patch +Patch22: texlive-fedora_paths.patch ###### # TeX patches ###### -Patch10: texlive-2007-dvipdfm-security.patch -Patch11: texlive-2007-makej.patch -Patch12: texlive-2007-badscript.patch -Patch17: texlive-2007-tmpcleanup.patch -Patch19: texlive-2007-kpse-extensions.patch -Patch20: texlive-CVE-2007-4033.patch -Patch25: texlive-dvipsoverflow.patch -Patch26: texlive-dviljktemp.patch -Patch27: texlive-poppler.patch -Patch28: texlive-man-notetex.patch -Patch29: texlive-man-context.patch +Patch10: texlive-2007-dvipdfm-security.patch +Patch11: texlive-2007-makej.patch +Patch12: texlive-2007-badscript.patch +Patch17: texlive-2007-tmpcleanup.patch +Patch19: texlive-2007-kpse-extensions.patch +Patch20: texlive-CVE-2007-4033.patch +Patch25: texlive-dvipsoverflow.patch +Patch26: texlive-dviljktemp.patch +Patch27: texlive-poppler.patch +Patch28: texlive-man-notetex.patch +Patch29: texlive-man-context.patch ###### # mpeters contributed patches ###### # fixes man pages to utf-8 -Patch41: texlive-2007-kuesterei-man.patch -Patch42: texlive-2007-copyright-utf8-man.patch +Patch41: texlive-2007-kuesterei-man.patch +Patch42: texlive-2007-copyright-utf8-man.patch # use proper shellbang -Patch43: texlive-2007-epstopdf-shellbang.patch +Patch43: texlive-2007-epstopdf-shellbang.patch ###### # Debian patches -###### -Patch100: texlive-Build_script.patch -Patch101: texlive-mktexlsr_fixes.patch -Patch102: texlive-fix_pkfix_invocation.patch -Patch104: texlive-12a_fix_thumbpdf_invocation.patch -Patch105: texlive-12b_fix_a2ping_invocation.patch -Patch106: texlive-12c_fix_pdfcrop_invocation.patch -Patch107: texlive-12d_fix_ebong_invocation.patch -Patch108: texlive-12e_fix_vpe_invocation.patch -Patch109: texlive-texdoc.patch -Patch114: texlive-dvips_fontbug_fix_upstream.patch -Patch115: texlive-maketexmf.patch -Patch117: texlive-fmtutil_keep_failedlog.patch -Patch119: texlive-checklib_fixes.patch -Patch120: texlive-dvipdfm_timezone.patch -Patch123: texlive-fix_makempx_installation.patch +###### +Patch100: texlive-Build_script.patch +Patch101: texlive-mktexlsr_fixes.patch +Patch102: texlive-fix_pkfix_invocation.patch +Patch104: texlive-12a_fix_thumbpdf_invocation.patch +Patch105: texlive-12b_fix_a2ping_invocation.patch +Patch106: texlive-12c_fix_pdfcrop_invocation.patch +Patch107: texlive-12d_fix_ebong_invocation.patch +Patch108: texlive-12e_fix_vpe_invocation.patch +Patch109: texlive-texdoc.patch +Patch114: texlive-dvips_fontbug_fix_upstream.patch +Patch115: texlive-maketexmf.patch +Patch117: texlive-fmtutil_keep_failedlog.patch +Patch119: texlive-checklib_fixes.patch +Patch120: texlive-dvipdfm_timezone.patch +Patch123: texlive-fix_makempx_installation.patch ###### # Mandriva patches ###### -Patch202: texlive-pdftex.patch +Patch202: texlive-pdftex.patch ###### # Suse patches -###### -Patch300: texlive-source-icu.patch -Patch301: texlive-source-t1lib.patch -Patch302: texlive-source-warns.patch -Patch303: texlive-source-x11r7.patch -Patch306: texlive-source-CVE-2007-0650.patch +###### +Patch300: texlive-source-icu.patch +Patch301: texlive-source-t1lib.patch +Patch302: texlive-source-warns.patch +Patch303: texlive-source-x11r7.patch +Patch306: texlive-source-CVE-2007-0650.patch # 1000-: Japanese pTeX Patch1000: dvipsk-jpatch-pdvips.patch Patch1004: texlive-2007-jp-platex209.patch Patch1005: texlive-2007-pdvips.patch Patch1006: texlive-2007-ptex-3.1.10.patch -Patch1007: texlive-2007-fmtutil-ptex.patch +Patch1007: texlive-2007-fmtutil-ptex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -250,13 +250,13 @@ Provides: tex(dvips) Requires: psutils %description dvips -Dvips converts .dvi files, for example those produced by the TeX text +Dvips converts .dvi files, for example those produced by the TeX text formatting system, to PostScript(TM) format. If you are installing texlive, so that you can use the TeX text formatting system without direct PDF compilation, consider to install -texlive-dvips. In addition, you will need to install texlive-latex -(a higher level formatting package which provides an easier-to-use +texlive-dvips. In addition, you will need to install texlive-latex +(a higher level formatting package which provides an easier-to-use interface for TeX), and xdvi (for previewing .dvi files in X). %package dviutils @@ -280,6 +280,7 @@ Requires: texlive = %{version}-%{release}, texlive-dvips = %{version}-%{release} Requires: netpbm-progs # make sure main and fonts package installed before running post Requires(post): %{_bindir}/fmtutil %{_bindir}/fmtutil-sys +Requires(post): %{_bindir}/texconfig-sys /sbin/install-info BuildRequires: ghostscript netpbm-progs Obsoletes: tetex < 3.0-99 Obsoletes: tetex-latex < 3.0-99 @@ -296,18 +297,20 @@ compile LaTeX files directly to PDF format. The TeX documentation is located in the texlive-doc package. -%package japanese -Summary: Japanese support for TeXLive +%package east-asian +Summary: Support for East Asian languages in TeXLive Group: Applications/Publishing Requires: texlive = %{version} Requires: texlive-latex = %{version} Requires: texlive-texmf-dvips = %{version} -Requires: texlive-texmf-errata-japanese = %{version} +Requires: texlive-texmf-errata-east-asian = %{version} +Provides: texlive-japanese = %{version}-%{release} Provides: tex(japanese) +Provides: tex(east-asian) Requires: mendexk -%description japanese -Japanese support for TeXLive. +%description east-asian +East Asian support for TeXLive. %package context Summary: ConTeXt is a document preparation system based on TeX @@ -350,7 +353,7 @@ Group: Applications/Publishing #Source0: http://download.savannah.gnu.org/releases/dvipng/dvipng-%{dvipng_ver}.tar.gz %description -n dvipng -This program makes PNG and/or GIF graphics from DVI files as obtained +This program makes PNG and/or GIF graphics from DVI files as obtained from TeX and its relatives. %endif @@ -387,6 +390,7 @@ Group: Applications/Publishing # for cmap files Requires: texlive-texmf-fonts = %{texlive_ver} Provides: texlive-dvipdfmx +Requires: ghostscript %description -n dvipdfmx The dvipdfmx (formerly dvipdfm-cjk) project provides an eXtended version @@ -541,32 +545,32 @@ popd --disable-a4 \ %endif --enable-shared=yes \ - --with-system-ncurses \ - --with-system-zlib \ - --with-system-pnglib \ - --with-system-gd \ - --without-system-icu \ + --with-system-ncurses \ + --with-system-zlib \ + --with-system-pnglib \ + --with-system-gd \ + --without-system-icu \ --with-icu-include=%{_includedir}/unicode \ - --with-system-freetype \ + --with-system-freetype \ --with-freetype-include=%{_includedir}/freetype \ - --with-system-freetype2 \ + --with-system-freetype2 \ --with-freetype2-include=%{_includedir}/freetype2 \ --with-system-t1lib \ - --without-texlive \ - --without-t1utils \ - --without-psutils \ - --without-ps2eps \ + --without-texlive \ + --without-t1utils \ + --without-psutils \ + --without-ps2eps \ --without-pdfopen \ --without-ttf2pk \ - --disable-multiplatform \ - --without-dialog --without-texinfo --without-texi2html \ - --without-tex4htk \ - --without-detex --without-dvi2tty \ + --disable-multiplatform \ + --without-dialog --without-texinfo --without-texi2html \ + --without-tex4htk \ + --without-detex --without-dvi2tty \ %if %{disable_lcdf_typetools} - --with-lcdf-typetools=no \ + --with-lcdf-typetools=no \ %endif - --with-mf-x-toolkit=yes \ - --without-xdvik \ + --with-mf-x-toolkit=yes \ + --without-xdvik \ --without-cxx-runtime-hack # Remove everything except: @@ -635,8 +639,8 @@ rm -rf __fedora_kpathsea mkdir -p __fedora_kpathsea/ mv %{buildroot}%{_texmf_main}/web2c/fmtutil.cnf __fedora_kpathsea/fmtutil.cnf-init -# this file is different from the one in texmf-fonts, since it is -# the one from kpathsea which isn't specific of texlive. It is only +# this file is different from the one in texmf-fonts, since it is +# the one from kpathsea which isn't specific of texlive. It is only # used during build and to set the kpathsea default paths, however. # Kept as documentation together with paths.h since they describe # what the kpathsea default paths are @@ -843,7 +847,6 @@ fi %{_bindir}/mktexfmt %{_bindir}/mktexlsr %{_bindir}/mktexmf -%{_bindir}/mktexpk %{_bindir}/mktextfm %{_bindir}/newer %{_bindir}/ofm2opl @@ -931,7 +934,6 @@ fi %{_mandir}/man1/mktexfmt.1* %{_mandir}/man1/mktexlsr.1* %{_mandir}/man1/mktexmf.1* -%{_mandir}/man1/mktexpk.1* %{_mandir}/man1/mktextfm.1* %{_mandir}/man1/newer.1* %{_mandir}/man1/ofm2opl.1* @@ -989,6 +991,7 @@ fi %{_bindir}/epstopdf %{_bindir}/gsftopk %{_bindir}/mf +%{_bindir}/mktexpk %{_bindir}/pdfcrop %{_bindir}/ps4pdf %{_bindir}/thumbpdf @@ -996,6 +999,7 @@ fi %{_mandir}/man1/epstopdf.1* %{_mandir}/man1/gsftopk.1* %{_mandir}/man1/mf.1* +%{_mandir}/man1/mktexpk.1* %{_mandir}/man1/thumbpdf.1* %files xetex @@ -1132,7 +1136,7 @@ fi %files -n dvipdfmx %defattr(-,root,root,-) -%doc texk/dvipdfmx/AUTHORS texk/dvipdfmx/ChangeLog +%doc texk/dvipdfmx/AUTHORS texk/dvipdfmx/ChangeLog %doc texk/dvipdfmx/COPYING texk/dvipdfmx/README %dir %{_texmf_conf}/dvipdfm/ %config(noreplace) %{_texmf_conf}/dvipdfm/cid-x.map @@ -1140,7 +1144,7 @@ fi %{_bindir}/xdvipdfmx %{_texmf_main}/dvipdfm/ -%files japanese +%files east-asian %doc %{_texmf_main}/doc/pdvipsk/ %doc %{_texmf_main}/doc/ptex/ %{_texmf_main}/fonts/map/pdvips/ @@ -1219,6 +1223,12 @@ fi %{_mandir}/man1/texutil.1* %changelog +* Thu Feb 28 2008 Jindrich Novy - 2007-20 +- move mktexpk to texlive-utils (#435176) +- rename texlive-japanese to texlive-east-asian +- move ghostscript Requires to dvipdfmx +- remove trailing spaces from spec + * Thu Feb 21 2008 Jindrich Novy - 2007-19 - remove dvipng, it's now packaged separately (#431356)