fixed texlive-macros and texmacro-otf

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@7150 ec354946-7b23-47d6-9f5a-488ba84defc7

t/task-texlive/task-texlive-vl.spec

@@ -2,7 +2,7 @@ Summary: Virtual package for TeX Live
 Summary(ja): TeX Live のための仮想パッケージ
 Name: task-texlive
 Version: 2012
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: public domain
 Group: Applications/Publishing
 BuildArch: noarch
@@ -14,7 +14,7 @@ Requires: texlive-collection-luatex = %{version}
 Requires: texlive-collection-pictures = %{version}
 Requires: texlive-collection-genericrecommended = %{version}
 Requires: texlive-collection-fontutils = %{version}
-#Requires: texmacro-otf >= 1.7
+Requires: texmacro-otf >= 1.7
 
 Obsoletes: task-tetex
 Obsoletes: task-platex pk300
@@ -229,6 +229,9 @@ This package is a virtual package to install documentation packages of
 %files full-doc
 
 %changelog
+* Sat Nov 24 2012 Munehiro Yamamoto <munepi@vinelinux.org> 2012-2
+- fixed texlive-macros and texmacro-otf
+
 * Fri Nov 23 2012 Munehiro Yamamoto <munepi@vinelinux.org> 2012-1
 - TeX Live 2012
 

t/texlive-macros/texlive-macros-vl.spec

@@ -11,19 +11,42 @@
 %define jlisting_ver	0.2
 %define bkmk2uni	convert-bkmk2uni
 
-%define exec_texhash	[ -x %{_bindir}/texhash ] && %{_bindir}/env - %{_bindir}/texhash 2> /dev/null
-%define exec_updmap	[ -x %{_bindir}/updmap-sys ] && %{_bindir}/env - %{_bindir}/updmap-sys 2> /dev/null
-
 %define list_macros \
 	jsclasses-%{jsclasses_ver} \
 	jlisting-%{jlisting_ver}
 
+## use some macros for %post, %posttrans
+%define touch_run(%1)	%{expand:( %__mkdir_p /var/run/texlive; touch /var/run/texlive/run-%1; )
+}
+%define exec_upddeffont	[ -x %{_sbindir}/update-defaultfont ] && \\\
+    %{_sbindir}/update-defaultfont 2> /dev/null
+%define exec_texhash	[ -e /var/run/texlive/run-texhash ] && ( \\\
+    [ -x %{_bindir}/texhash ] && \\\
+    echo -n "    "; echo -n "Running texhash... "; \\\
+    %{_bindir}/texhash 2> /dev/null; \\\
+    echo "done." ) && %__rm -f /var/run/texlive/run-texhash;
+%define exec_mtxrun	[ -e /var/run/texlive/run-mtxrun ] && ( \\\
+    [ -x %{_bindir}/mtxrun ] && \\\
+    echo -n "    "; echo -n "Running mtxrun... "; \\\
+    export TEXMF=%{texmf}-dist TEXMFCNF=%{texmf}/web2c TEXMFCACHE=%{texmfsysvar}; \\\
+    %{_bindir}/mtxrun --generate &> /dev/null; \\\
+    echo "done." ) && %__rm -f /var/run/texlive/run-mtxrun; 
+%define exec_fmtutil	[ -e /var/run/texlive/run-fmtutil ] && ( \\\
+    [ -x %{_bindir}/fmtutil-sys ] && \\\
+    echo -n "    "; echo -n "Running fmtutil-sys... "; \\\
+    %{_bindir}/fmtutil-sys --all &> /dev/null; \\\
+    echo "done." ) && %__rm -f /var/run/texlive/run-fmtutil; 
+%define exec_updmap	[ -e /var/run/texlive/run-updmap ] && ( \\\
+    [ -x %{_bindir}/updmap-sys ] && \\\
+    echo -n "    "; echo -n "Running updmap-sys... "; \\\
+    %{_bindir}/updmap-sys --nohash --quiet &> /dev/null; \\\
+    echo "done." ) && %__rm -f /var/run/texlive/run-updmap; 
 
 Summary:	A collection of useful macro packages for texlive package
 Summary(ja):	texlive パッケージで使うマクロパッケージ集
 Name:		texlive-macros
-Version:	2011
+Version:	2012
-Release:	3%{?_dist_release}
+Release:	1%{?_dist_release}
 License:	distributable
 Group:		Applications/Publishing
 
@@ -137,18 +160,18 @@ bunzip2 %{build_texmf}/tex/latex/jlisting/jlisting.sty.bz2
 
 
 %post
-%{exec_texhash}
+%touch_run texhash
-# %{exec_updmap}
 exit 0
 
-
 %postun
 if [ "$1" = 0 ]; then
-    %{exec_texhash}
+   %touch_run texhash
-    # %{exec_updmap}
 fi
 exit 0
 
+%posttrans
+%{exec_texhash}
+exit 0
 
 %clean
 %__rm -rf $RPM_BUILD_ROOT
@@ -166,6 +189,9 @@ exit 0
 
 
 %changelog
+* Sat Nov 24 2012 Munehiro Yamamoto <munepi@vinelinux.org> 2012-1
+- TeX Live 2012
+
 * Thu Feb  9 2012 Munehiro Yamamoto <munepi@vinelinux.org> 2011-3
 - move jlisting package to %%{texmf}/tex/latex/jlisting
 

t/texmacro-otf/texmacro-otf-vl.spec

@@ -1,4 +1,4 @@
-%define tlversion	2011
+%define tlversion	2012
 
 %define hirapropver	0.3
 %define kokanaver	1.0b2
@@ -9,24 +9,46 @@
 %define texvf		%{texmf}/fonts/vf/public
 %define texofm		%{texmf}/fonts/ofm/public
 %define textfm		%{texmf}/fonts/tfm/public
-%define mapdir		%{texmf}/fonts/map/dvipdfm/otf
+%define mapdir		%{texmf}/fonts/map/dvipdfmx
 %define build_texmf	%{buildroot}%{texmf}
 %define build_texvf	%{buildroot}%{texvf}
 %define build_texofm	%{buildroot}%{texofm}
 %define build_textfm	%{buildroot}%{textfm}
 %define build_mapdir	%{buildroot}%{mapdir}
-%define dvipdfmconfig	%{texmf}/dvipdfm/config
 
-%define exec_texhash  [ -x %{_bindir}/texhash ] && PATH=%{_bindir}:$PATH %{_bindir}/texhash
+
-%define exec_updmap	[ -x %{_bindir}/updmap-sys ] && %{_bindir}/env - %{_bindir}/updmap-sys 2> /dev/null
+## use some macros for %post, %posttrans
-%define exec_updmap_otf	[ -x %{_bindir}/updmap-otf ] && %{_bindir}/env - %{_bindir}/updmap-otf auto 2> /dev/null
+%define touch_run(%1)	%{expand:( %__mkdir_p /var/run/texlive; touch /var/run/texlive/run-%1; )
+}
+%define exec_upddeffont	[ -x %{_sbindir}/update-defaultfont ] && \\\
+    %{_sbindir}/update-defaultfont 2> /dev/null
+%define exec_texhash	[ -e /var/run/texlive/run-texhash ] && ( \\\
+    [ -x %{_bindir}/texhash ] && \\\
+    echo -n "    "; echo -n "Running texhash... "; \\\
+    %{_bindir}/texhash 2> /dev/null; \\\
+    echo "done." ) && %__rm -f /var/run/texlive/run-texhash;
+%define exec_mtxrun	[ -e /var/run/texlive/run-mtxrun ] && ( \\\
+    [ -x %{_bindir}/mtxrun ] && \\\
+    echo -n "    "; echo -n "Running mtxrun... "; \\\
+    export TEXMF=%{texmf}-dist TEXMFCNF=%{texmf}/web2c TEXMFCACHE=%{texmfsysvar}; \\\
+    %{_bindir}/mtxrun --generate &> /dev/null; \\\
+    echo "done." ) && %__rm -f /var/run/texlive/run-mtxrun; 
+%define exec_fmtutil	[ -e /var/run/texlive/run-fmtutil ] && ( \\\
+    [ -x %{_bindir}/fmtutil-sys ] && \\\
+    echo -n "    "; echo -n "Running fmtutil-sys... "; \\\
+    %{_bindir}/fmtutil-sys --all &> /dev/null; \\\
+    echo "done." ) && %__rm -f /var/run/texlive/run-fmtutil; 
+%define exec_updmap	[ -e /var/run/texlive/run-updmap ] && ( \\\
+    [ -x %{_bindir}/updmap-sys ] && \\\
+    echo -n "    "; echo -n "Running updmap-sys... "; \\\
+    %{_bindir}/updmap-sys --nohash --quiet &> /dev/null; \\\
+    echo "done." ) && %__rm -f /var/run/texlive/run-updmap; 
 
 Summary: TeX Live macro packages for "VF for OpenType Fonts" by S. Saito
 Summary(ja): TeX Live で使うマクロパッケージ (齋藤修三郎氏による「OpenType Font用VF」)
 Name: texmacro-otf
 Version: %{otfver}
-Release: 3%{?otfbetaver:.%otfbetaver}%{?_dist_release}
+Release: 4%{?otfbetaver:.%otfbetaver}%{?_dist_release}
-BuildArch: noarch
 
 Source0: http://psitau.kitunebi.com/otf%{version}%{?otfbetaver:%otfbetaver}.zip
 #Source1: http://psitau.at.infoseek.co.jp/hiraprop.zip
@@ -38,22 +60,18 @@ Source3: http://psitau.at.infoseek.co.jp/otfmanual.pdf
 Source4: http://psitau.at.infoseek.co.jp/kitunetuki.pdf
 Source5: http://psitau.at.infoseek.co.jp/meijinden.pdf
 
-#Source10: updmap-otf
-#NOTE: we renamed http://www.logic.at/people/preining/texlive/updmap-otf with updmap-otf.sh.v0.9.1
-Source10: updmap-otf.sh.v0.9.1
-# Source20: otf-noEmbed.map
-# Source21: otf-cktx.map
-
-Patch1: texmacro-otf-RmlGbm.patch
-
 URL: http://psitau.kitunebi.com/otf.html
 License: BSD
 Group:  Applications/Publishing
-BuildRequires: texlive = %{tlversion}
+BuildRequires: texlive-common = %{tlversion}
 BuildRequires: perl, nkf
-Requires:     texlive = %{tlversion}
+Requires:     texlive-common = %{tlversion}
 Requires:     ghostscript
+## NOTE: texlive-collection-langcjk-2012 has otf.sty: 
+## /usr/share/texmf-dist/tex/platex/japanese-otf-uptex/otf.sty
+Requires:     texlive-collection-langcjk = %{tlversion}
 
+BuildArch:    noarch
 Buildroot:    %{_tmppath}/%{name}-%{version}-root
 
 Obsoletes: texlive-texmacro-otf <= 1.5.6.1
@@ -110,22 +128,20 @@ popd
 %install
 %__rm -rf %{buildroot}
 
-%__mkdir fontmap test pdf
+%__mkdir_p fontmap test pdf
 %__mkdir_p %{buildroot}%{_bindir}
-%__mkdir_p %{build_texmf}/tex/platex/otf
+%__mkdir_p %{build_texmf}/tex/platex/japanese-otf
-#%__mkdir_p %{build_texmf}-var/updmap-otf
+%__mkdir_p %{build_texvf}/japanese-otf
-%__mkdir_p %{build_texvf}/otf
+%__mkdir_p %{build_textfm}/japanese-otf
-%__mkdir_p %{build_textfm}/otf
+%__mkdir_p %{build_mapdir}/japanese-otf
-%__mkdir_p %{build_mapdir}
 
 %__install -m 644 %{SOURCE3} %{SOURCE4} %{SOURCE5} pdf
-%__install -m 755 %{SOURCE10} %{buildroot}%{_bindir}/updmap-otf
 
 ###### otfstable #####
 (cd otfbeta
-%__install -m 644 sty/* %{build_texmf}/tex/platex/otf
+# %__install -m 644 sty/* %{build_texmf}/tex/platex/japanese-otf
-%__install -m 644 vf/* %{build_texvf}/otf
+# %__install -m 644 vf/* %{build_texvf}/japanese-otf
-%__install -m 644 tfm/* %{build_textfm}/otf
+# %__install -m 644 tfm/* %{build_textfm}/japanese-otf
 
 %__install -m 644 readme.txt ../readme-otf.txt
 %__install -m 644 test/*.tex ../test
@@ -149,49 +165,68 @@ popd
 
 ###### kokana #####
 pushd kokana-%{kokanaver}
-%__install -m 644 otfaltkana.sty %{build_texmf}/tex/platex/otf
+%__install -m 644 otfaltkana.sty %{build_texmf}/tex/platex/japanese-otf
-%__install -m 644 vf/* %{build_texvf}/otf
+%__install -m 644 vf/* %{build_texvf}/japanese-otf
-%__install -m 644 tfm/* %{build_textfm}/otf
+%__install -m 644 tfm/* %{build_textfm}/japanese-otf
 
 %__install -m 644 sample/kokanatest.tex ../test
 %__install -m 644 readme.txt ../readme-kokana.txt
 popd
 
 
-%post
+## remove duplicated files 
-%{exec_texhash}
+%__rm -f \
+      %{build_texmf}/fonts/ofm/public/japanese-otf/hirakaku-w3-h.ofm \
+      %{build_texmf}/fonts/ofm/public/japanese-otf/hirakaku-w6-h.ofm \
+      %{build_texmf}/fonts/ofm/public/japanese-otf/hiramaru-w4-h.ofm \
+      %{build_texmf}/fonts/ofm/public/japanese-otf/hiramin-w3-h.ofm \
+      %{build_texmf}/fonts/ofm/public/japanese-otf/hiramin-w6-h.ofm \
+      %{build_texmf}/fonts/tfm/public/japanese-otf/hirakaku-w3-h.tfm \
+      %{build_texmf}/fonts/tfm/public/japanese-otf/hirakaku-w6-h.tfm \
+      %{build_texmf}/fonts/tfm/public/japanese-otf/hiramaru-w4-h.tfm \
+      %{build_texmf}/fonts/tfm/public/japanese-otf/hiramin-w3-h.tfm \
+      %{build_texmf}/fonts/tfm/public/japanese-otf/hiramin-w6-h.tfm \
+      || exit 1
 
-#%{exec_updmap}
 
-%{exec_updmap_otf}
+%post
+%touch_run texhash
+#% touch_run updmap
 exit 0
 
 %postun
 if [ "$1" = 0 ]; then
-    #%__rm -rf %{texmf}-var/updmap-otf
+   %touch_run texhash
-
+   #% touch_run updmap
-    %{exec_texhash}
-
-    %{exec_updmap}
 fi
 exit 0
 
+%posttrans
+%{exec_texhash}
+#% {exec_updmap}
+exit 0
+
+
 %clean
 %__rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
 %doc readme* fontmap test pdf
-#%dir %{texmf}-var/updmap-otf
+%{texmf}/tex/platex/japanese-otf
-%{_bindir}/updmap-otf
-%{texmf}/tex/platex/otf
 %{texmf}/tex/platex/hiraprop
 %{texvf}
 %{textfm}
 %{texofm}
-%{mapdir}
+# %{mapdir}/japanese-otf
+
 
 %changelog
+* Sat Nov 24 2012 Munehiro Yamamoto <munepi@vinelinux.org> 1.7-4.b5
+- TeX Live 2012
+- add Requires: texlive-collection-langcjk
+  - it contains otf packages v1.7b5
+
 * Sun Apr 15 2012 Munehiro Yamamoto <munepi@vinelinux.org> 1.7-3.b5
 - updated to 1.7b5