Attachment 290622 Details for Bug 427176 – patch for texlive.spec and texlive-2007-jp-platex209.patch

[patch] patch for texlive.spec and texlive-2007-jp-platex209.patch

texlive-fmtutil-ptex.diff (text/plain), 8.51 KB, created by Patrice Dumas on 2008-01-01 23:45:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Patrice Dumas

Created: 2008-01-01 23:45:25 UTC

Size: 8.51 KB

patch

obsolete

>? .build-2007-6.fc9.log
>? fmtutil-ptex.cnf
>? i386
>? mendexk2.6e
>? ptex-src-3.1.10
>? texlive-2007
>? texlive-2007-6.fc9.src.rpm
>? texlive-2007-fmtutil-ptex.patch
>? texlive.spec-font_dep
>Index: texlive-2007-jp-platex209.patch
>===================================================================
>RCS file: /cvs/pkgs/rpms/texlive/devel/texlive-2007-jp-platex209.patch,v
>retrieving revision 1.1
>diff -u -3 -p -r1.1 texlive-2007-jp-platex209.patch
>--- texlive-2007-jp-platex209.patch	2 Dec 2007 08:03:19 -0000	1.1
>+++ texlive-2007-jp-platex209.patch	1 Jan 2008 23:39:05 -0000
>@@ -1,57 +1,78 @@
>---- ptex-src-3.1.8/Makefile.in.orig	2004-12-03 17:33:13.000000000 +0900
>-+++ ptex-src-3.1.8/Makefile.in	2004-12-16 15:54:25.407886051 +0900
>-@@ -6,8 +6,8 @@
>- default: programs formats
>+diff -up ptex-src-3.1.10/Makefile.in.fmts ptex-src-3.1.10/Makefile.in
>+--- ptex-src-3.1.10/Makefile.in.fmts	2006-06-05 03:50:47.000000000 +0200
>++++ ptex-src-3.1.10/Makefile.in	2008-01-01 23:28:57.000000000 +0100
>+@@ -3,11 +3,9 @@ version = @WEB2CVERSION@
>+ configopt = @configopt@
>+ configkcode = @configkcode@
>+ 
>+-default: programs formats
>++default: programs texmf.cnf
>  
>  programs=ptex tftopl pltotf pdvitype jbibtex
> -euc-formats=ptex-euc.fmt platex-euc.fmt
> -sjis-formats=ptex-sjis.fmt platex-sjis.fmt
>-+euc-formats=ptex-euc.fmt platex-euc.fmt platex209-euc.fmt
>-+sjis-formats=ptex-sjis.fmt platex-sjis.fmt platex209-sjis.fmt
>  
>  ac_include ../../make/paths.mk
>  
>-@@ -186,6 +186,14 @@
>- 	$(dumpenv) $(MAKE) progname=platex files="platex.ltx" prereq-check
>- 	$(dumpenv) ./ptex --ini --kanji=sjis --progname=platex --jobname=platex-sjis \\input platex.ltx </dev/null
>- 
>-+platex209-euc.fmt: ptex texmf.cnf
>-+	$(dumpenv) $(MAKE) progname=platex files="plplain.ini" prereq-check
>-+	$(dumpenv) ./ptex --ini --kanji=euc --progname=platex --jobname=platex209-euc \\input platex.ltx </dev/null
>-+
>-+platex209-sjis.fmt: ptex texmf.cnf
>-+	$(dumpenv) $(MAKE) progname=platex files="plplain.ini" prereq-check
>-+	$(dumpenv) ./ptex --ini --kanji=sjis --progname=platex --jobname=platex209-sjis \\input platex.ltx </dev/null
>-+
>+@@ -162,30 +160,12 @@ $(kpathsea):
>+ 
>+ # 
>+ # Making formats and bases.
>+-formats=$(euc-formats) $(sjis-formats)
>+-formats: $(formats)
>+ 
>+ texmf.cnf: $(kpathsea_dir)/texmf.cnf
>+ 	$(SHELL) $(thisdir)/mkconf $(kpathsea_dir)/texmf.cnf > texmf.cnf
>+ 
>+ dumpenv = TEXMFCNF=$(thisdir)
>+ 
>+-ptex-euc.fmt: ptex texmf.cnf
>+-	$(dumpenv) $(MAKE) progname=ptex files="ptex.tex min10.tfm" prereq-check
>+-	$(dumpenv) ./ptex --ini --kanji=euc --progname=ptex --jobname=ptex-euc \\input ptex.tex \\dump </dev/null
>+-
>+-ptex-sjis.fmt: ptex texmf.cnf
>+-	$(dumpenv) $(MAKE) progname=ptex files="ptex.tex min10.tfm" prereq-check
>+-	$(dumpenv) ./ptex --ini --kanji=sjis --progname=ptex --jobname=ptex-sjis \\input ptex.tex \\dump </dev/null
>+-
>+-platex-euc.fmt: ptex texmf.cnf
>+-	$(dumpenv) $(MAKE) progname=platex files="platex.ltx" prereq-check
>+-	$(dumpenv) ./ptex --ini --kanji=euc --progname=platex --jobname=platex-euc \\input platex.ltx </dev/null
>+-
>+-platex-sjis.fmt: ptex texmf.cnf
>+-	$(dumpenv) $(MAKE) progname=platex files="platex.ltx" prereq-check
>+-	$(dumpenv) ./ptex --ini --kanji=sjis --progname=platex --jobname=platex-sjis \\input platex.ltx </dev/null
>+-
>  # This is meant to be called recursively, with $(files) set.
>  prereq-check: $(kpathsea_dir)/kpsewhich
>  	$(dumpenv) $(kpathsea_dir)/kpsewhich --progname=$(progname) $(files) >/dev/null || $(MAKE) prereq-lose >/dev/null
>-@@ -222,17 +230,19 @@
>+@@ -209,7 +189,6 @@ $(kpathsea_dir)/kpsewhich: $(kpathsea)
>+ install: install-exec install-data
>+ 	$(top_srcdir)/kpathsea/mktexlsr
>+ install-exec:: install-links
>+-install-data:: install-formats
>+ 
>+ # Installation directories.
>+ $(bindir)::
>+@@ -223,17 +202,7 @@ install-programs: $(programs) $(bindir)
>  
>  # The links to ptex for each format.
>  install-links: install-programs $(bindir)
> -	cd $(bindir) && (rm -f iniptex virptex platex; $(LN) ptex platex)
>-+	cd $(bindir) && (rm -f iniptex virptex platex platex209; $(LN) ptex platex ; $(LN) ptex platex209)
>- 
>- # Always do plain.*, so examples from the TeXbook (etc.) will work.
>- install-formats: $(formats) $(web2cdir)
>- 	for f in $(formats); do $(INSTALL_DATA) $$f $(web2cdir)/$$f; done
>+-
>+-# Always do plain.*, so examples from the TeXbook (etc.) will work.
>+-install-formats: $(formats) $(web2cdir)
>+-	for f in $(formats); do $(INSTALL_DATA) $$f $(web2cdir)/$$f; done
> -	cd $(web2cdir) && (rm -f ptex-jis.fmt platex-jis.fmt ;\
>-+	cd $(web2cdir) && (rm -f ptex-jis.fmt platex-jis.fmt platex209-jis.fmt ;\
>- 		$(LN) ptex-euc.fmt ptex-jis.fmt ;\
>+-		$(LN) ptex-euc.fmt ptex-jis.fmt ;\
> -		$(LN) platex-euc.fmt platex-jis.fmt)
> -	cd $(web2cdir) && (rm -f ptex.fmt platex.fmt ;\
>-+		$(LN) platex-euc.fmt platex-jis.fmt ;\
>-+		$(LN) platex209-euc.fmt platex209-jis.fmt)
>-+	cd $(web2cdir) && (rm -f ptex.fmt platex.fmt platex209.fmt ;\
>- 		$(LN) ptex-$(configkcode).fmt ptex.fmt ;\
>+-		$(LN) ptex-$(configkcode).fmt ptex.fmt ;\
> -		$(LN) platex-$(configkcode).fmt platex.fmt )
>-+		$(LN) platex-$(configkcode).fmt platex.fmt ;\
>-+		$(LN) platex209-$(configkcode).fmt platex209.fmt)
>++	cd $(bindir) && (rm -f iniptex virptex platex platex209; $(LN) ptex platex ; $(LN) ptex platex209)
>  
>  # Auxiliary files.
>  install-data::
>-@@ -321,6 +331,7 @@
>+@@ -323,6 +292,7 @@ distclean:: clean
>  	rm -fr failure
>  	rm -f ptex.web ptex.ch ptex.p ptex.pool ptex.log ptex-euc.fmt ptex-sjis.fmt
>  	rm -f platex.log platex-euc.fmt platex-sjis.fmt texsys.aux platex
>Index: texlive.spec
>===================================================================
>RCS file: /cvs/pkgs/rpms/texlive/devel/texlive.spec,v
>retrieving revision 1.10
>diff -u -3 -p -r1.10 texlive.spec
>--- texlive.spec	31 Dec 2007 19:16:48 -0000	1.10
>+++ texlive.spec	1 Jan 2008 23:39:05 -0000
>@@ -51,7 +51,6 @@ Source1001:	ftp://ftp.ascii.co.jp/pub/Te
> Source1002:	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/mendex/mendexk%{mendexk_ver}.tar.gz
> Source1003:	vfontmap
> 
>-
> # Don't run brp-python-bytecompile
> %define __os_install_post  /usr/lib/rpm/redhat/brp-compress /usr/lib/rpm/redhat/brp-strip %{__strip} /usr/lib/rpm/redhat/brp-strip-static-archive %{__strip} /usr/lib/rpm/redhat/brp-strip-comment-note %{__strip} %{__objdump} %{nil}
> 
>@@ -139,6 +138,7 @@ Patch1003:	texlive-2007-pxdvi.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
> 
> BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
>@@ -151,8 +151,8 @@ BuildRequires:	Xaw3d-devel
> BuildRequires:	poppler-devel >= 0.6.2-2
> BuildRequires:	teckit-devel
> # buildrequire texlive-texmf-fonts and texlive-texmf-latex for ptex
>-BuildRequires:	texlive-texmf-fonts = %{version}
>-BuildRequires:	texlive-texmf-latex = %{version}
>+#BuildRequires:	texlive-texmf-fonts = %{version}
>+#BuildRequires:	texlive-texmf-latex = %{version}
> # pxdvi buildrequires freetype >= 2.1.10
> %if %{enable_japanese}
> BuildRequires:  freetype-devel >= 2.1.10
>@@ -475,6 +475,8 @@ chmod -x texk/dvipdfm/encodings.c
> %patch305 -p0
> %patch306 -p0
> 
>+%patch1007 -p1 -b .ptex
>+
> 
> #pushd texk/kpathsea
> #%{__sed} -i 's?^TEXMF =.*?TEXMF = {\$TEXMFCONFIG,\$TEXMFVAR,\$TEXMFHOME,\$TEXMFSYSCONFIG,\!\!\$TEXMFSYSVAR,\!\!\$TEXMFLOCAL,\!\!\$TEXMFMAIN,\!\!\$TEXMFDIST}?' texmf.in
>@@ -519,7 +521,7 @@ sed -e s/^platex/platex-pl/g \
> tar xfz %{SOURCE1000} -C texk/web2c/
> cd texk/web2c/ptex-src-%{ptex_src_ver}
> sed -i -e  's|/{ptex/{platex,generic,},tex/{latex,generic,}}|/{ptex/platex,{p,}tex/latex,{p,}tex/generic,{p,}tex}|g' -e 's/| uniq//g' mkconf
>-%patch1004 -p1
>+%patch1004 -p1 -b .fmts
> %patch1006 -p1
> cd -
> 
>@@ -714,6 +716,10 @@ desktop-file-install --vendor tetex --de
>   --add-category Graphics                              \
>   xdvi.desktop
> 
>+# remove pool files, they belong to texlive-texmf
>+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
>@@ -769,9 +775,6 @@ cd -
> # remove useless files in texconfig
> rm -rf %{buildroot}%{_texmf_main}/texconfig/{g,v,x,README,generic}
> 
>-# remove pool files, they belong to texlive-texmf
>-rm -rf %{buildroot}%{_texmf_main}/web2c/*.pool
>-
> # 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/
>@@ -1054,7 +1057,7 @@ fi
> %{_texmf_main}/bibtex/
> # Japanese pTeX
> %if %{enable_japanese}
>-%{_texmf_main}/web2c/*.fmt
>+%{_texmf_main}/web2c/ptex.pool
> %endif
> %dir %{_texmf_main}/doc
> %doc %{_texmf_main}/doc/bibtex8/

Actions: View | Diff

Attachments on bug 427176: 290622 | 290623 | 290624 | 290625