updated jvf: ready for TeX Live

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

j/jvf/jvf-vl.spec

@@ -1,27 +1,31 @@
-%define _prefix		/usr
+%define tlversion	2009
-%define texmf		%{_prefix}/share/texmf
+
-%define build_texmf	$RPM_BUILD_ROOT%{texmf}
+%define texmf		%{_datadir}/texmf
+%define build_texmf	%{buildroot}%{texmf}
 %define vinepl		vine.pls-1.2
 %define tfmdir		%{texmf}/fonts/tfm/ptex
 
-%define exec_texhash	[ -x %{_prefix}/bin/texhash ] && /usr/bin/env - %{_prefix}/bin/texhash 2> /dev/null
+%define exec_texhash	[ -x %{_bindir}/texhash ] && /usr/bin/env - %{_bindir}/texhash 2> /dev/null
+
+#% define pltotf	%{_bindir}/pltotf
+%define pltotf		%{_bindir}/ppltotf
 
 Summary: Japanese Virtual Fonts
 Summary(ja): 日本語仮想フォントです.
 Name: jvf
 Version: 2.0
-Release: 4%{?_dist_release}
+Release: 5%{?_dist_release}
 License: distributable
 Group: Applications/Publishing
 Source0: %{vinepl}.tar.gz
 Source1: http://www.matsusaka-u.ac.jp/~okumura/jsclasses/jis-pl.zip
-PreReq: sh-utils
+Requires(post): sh-utils
-Requires: tetex
+Requires: texlive = %{tlversion}
 BuildRequires: nkf
 BuildRequires: unzip
-BuildRequires: tetex
+BuildRequires: texlive = %{tlversion}
-##!! %{_prefix}/bin/pltotf %{tfmdir}/min5.tfm are provided by tetex
+##!! %{_bindir}/pltotf %{tfmdir}/min5.tfm are provided by tetex
-##BuildRequires: %{_prefix}/bin/pltotf %{tfmdir}/min5.tfm
+##BuildRequires: %{_bindir}/pltotf %{tfmdir}/min5.tfm
 ## /usr/bin/makejvf is provided from tetex, which is with ptexenc. 
 ##BuildRequires: makejvf
 BuildArch: noarch
@@ -40,13 +44,13 @@ dvipsk の実行に必要な, 日本語仮想フォント(virtual fonts)、
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
 %setup -q -n %{vinepl}
-unzip -oqq %{SOURCE1}
+%__unzip -oqq %{SOURCE1}
 
 %build
 ## Macro definition
 mkvf(){ # <$1: jfm name> <$2: jfm name of PS font>
     for size in 5 6 7 8 9 10 ; do
-        %{_prefix}/bin/makejvf %{tfmdir}/$1${size}.tfm $2
+        %{_bindir}/makejvf %{tfmdir}/$1${size}.tfm $2 || exit 1
     done
 }
 
@@ -60,62 +64,62 @@ mkvf tgoth gbmv
 for pl in jis jisi tjis tjisi \
           min mini tmin tmini; do
     nkf --jis --overwrite $pl.pl
-    %{_prefix}/bin/pltotf $pl.pl
+    %{pltotf} $pl.pl
 done
-ln -sf jis.tfm   jisg.tfm
+%__ln_s -f jis.tfm   jisg.tfm
-ln -sf jisi.tfm  jisgi.tfm
+%__ln_s -f jisi.tfm  jisgi.tfm
-ln -sf tjis.tfm  tjisg.tfm
+%__ln_s -f tjis.tfm  tjisg.tfm
-ln -sf tjisi.tfm tjisgi.tfm
+%__ln_s -f tjisi.tfm tjisgi.tfm
 
-%{_prefix}/bin/makejvf  jis.tfm   rml
+%{_bindir}/makejvf  jis.tfm   rml
-%{_prefix}/bin/makejvf tjis.tfm   rmlv  # 縦
+%{_bindir}/makejvf tjis.tfm   rmlv  # 縦
-%{_prefix}/bin/makejvf  jisi.tfm  rmli  # italic
+%{_bindir}/makejvf  jisi.tfm  rmli  # italic
-%{_prefix}/bin/makejvf tjisi.tfm  rmlvi
+%{_bindir}/makejvf tjisi.tfm  rmlvi
 
-%{_prefix}/bin/makejvf  jisg.tfm  gbm
+%{_bindir}/makejvf  jisg.tfm  gbm
-%{_prefix}/bin/makejvf tjisg.tfm  gbmv
+%{_bindir}/makejvf tjisg.tfm  gbmv
-%{_prefix}/bin/makejvf  jisgi.tfm gbmi
+%{_bindir}/makejvf  jisgi.tfm gbmi
-%{_prefix}/bin/makejvf tjisgi.tfm gbmvi
+%{_bindir}/makejvf tjisgi.tfm gbmvi
 
 ## new JIS font metric
 # make *.tfm
 for pl in jis jisn jis-v jisn-v; do
-    %{_prefix}/bin/pltotf $pl.pl
+    %{pltotf} $pl.pl
 done
-ln -sf jis.tfm    jisg.tfm
+%__ln_s -f jis.tfm    jisg.tfm
-ln -sf jis-v.tfm  jisg-v.tfm
+%__ln_s -f jis-v.tfm  jisg-v.tfm
-ln -sf jisn.tfm   jisgn.tfm
+%__ln_s -f jisn.tfm   jisgn.tfm
-ln -sf jisn-v.tfm jisgn-v.tfm
+%__ln_s -f jisn-v.tfm jisgn-v.tfm
 
 # make *.vf
-%{_prefix}/bin/makejvf jis.tfm     rml
+%{_bindir}/makejvf jis.tfm     rml
-%{_prefix}/bin/makejvf jisn.tfm    rmln # 中点修正
+%{_bindir}/makejvf jisn.tfm    rmln # 中点修正
-%{_prefix}/bin/makejvf jis-v.tfm   rmlv # 縦
+%{_bindir}/makejvf jis-v.tfm   rmlv # 縦
-%{_prefix}/bin/makejvf jisn-v.tfm  rmlnv
+%{_bindir}/makejvf jisn-v.tfm  rmlnv
 
-%{_prefix}/bin/makejvf jisg.tfm    gbm
+%{_bindir}/makejvf jisg.tfm    gbm
-%{_prefix}/bin/makejvf jisgn.tfm   gbmn
+%{_bindir}/makejvf jisgn.tfm   gbmn
-%{_prefix}/bin/makejvf jisg-v.tfm  gbmv
+%{_bindir}/makejvf jisg-v.tfm  gbmv
-%{_prefix}/bin/makejvf jisgn-v.tfm gbmnv
+%{_bindir}/makejvf jisgn-v.tfm gbmnv
 
 
 # extrafonts metric and vf fonts
 for i in goth gyo pop lei dfmin dfgt dfgyo dfpop dflei lxmin lxgt lxpop lxmgt lxgtb dfminb dfkaib dfpostb dffry dfbrrb ; do
-    ln -sf min.tfm    ${i}.tfm
+    %__ln_s -f min.tfm    ${i}.tfm
-    ln -sf mini.tfm   ${i}i.tfm
+    %__ln_s -f mini.tfm   ${i}i.tfm
-    ln -sf tmin.tfm  t${i}.tfm
+    %__ln_s -f tmin.tfm  t${i}.tfm
-    ln -sf tmini.tfm t${i}i.tfm
+    %__ln_s -f tmini.tfm t${i}i.tfm
 done
 for i in min goth gyo pop lei dfmin dfgt dfgyo dfpop dflei lxmin lxgt lxpop lxmgt lxgtb dfminb dfkaib dfpostb dffry dfbrrb; do
-    %{_prefix}/bin/makejvf ${i}.tfm ${i}
+    %{_bindir}/makejvf ${i}.tfm ${i}
-    %{_prefix}/bin/makejvf ${i}i.tfm ${i}i
+    %{_bindir}/makejvf ${i}i.tfm ${i}i
-    %{_prefix}/bin/makejvf t${i}.tfm t${i}
+    %{_bindir}/makejvf t${i}.tfm t${i}
-    %{_prefix}/bin/makejvf t${i}i.tfm t${i}i
+    %{_bindir}/makejvf t${i}i.tfm t${i}i
-
+
-#    ln -sf ${i}.vf df${i}.vf
+#    %__ln_s -f ${i}.vf df${i}.vf
-#    ln -sf ${i}i.vf df${i}i.vf
+#    %__ln_s -f ${i}i.vf df${i}i.vf
-#    ln -sf t${i}.vf dft${i}.vf
+#    %__ln_s -f t${i}.vf dft${i}.vf
-#    ln -sf t${i}i.vf dft${i}i.vf
+#    %__ln_s -f t${i}i.vf dft${i}i.vf
 done
 
 # change same file to symbolic link
@@ -123,7 +127,7 @@ for f in *.vf; do
     if [ ! -L $f ]; then
 	for g in *.vf; do
 	    if [ ! -L $g -a $f != $g ]; then
-		cmp $f $g > /dev/null && (rm -f $g; ln -s $f $g)
+		cmp $f $g > /dev/null && (%__rm -f $g; %__ln_s $f $g)
 	    fi
 	done
     fi
@@ -131,14 +135,14 @@ done
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%__rm -rf $RPM_BUILD_ROOT
-mkdir -p %{build_texmf}/fonts/{tfm,source,vf}/ptex
+%__mkdir_p %{build_texmf}/fonts/{tfm,source,vf}/ptex
-cp -dfp *.tfm %{build_texmf}/fonts/tfm/ptex/
+%__cp -dfp *.tfm %{build_texmf}/fonts/tfm/ptex/
-cp -dfp *.pl  %{build_texmf}/fonts/source/ptex/
+%__cp -dfp *.pl  %{build_texmf}/fonts/source/ptex/
-cp -dfp *.vf  %{build_texmf}/fonts/vf/ptex/
+%__cp -dfp *.vf  %{build_texmf}/fonts/vf/ptex/
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%__rm -rf $RPM_BUILD_ROOT
 
 %post
 %{exec_texhash}
@@ -158,7 +162,14 @@ exit 0
 %{texmf}/fonts/source/ptex/
 %{texmf}/fonts/vf/ptex/
 
+
 %changelog
+* Sun May 16 2010 Munehiro Yamamoto <munepi@vinelinux.org> 2.0-5
+- use texlive-2009 + ptexlive-20100322
+  - dropped Requires: tetex, BuildRequires: tetex
+  - addeded Requires: texlive, BuildRequires: texlive
+- use some rpm macros
+
 * Wed Oct 07 2009 Munehiro Yamamoto <munepi@vinelinux.org> 2.0-4
 - added BuildRequires: unzip
 - dropped BuildRequires: %%{_prefix}/bin/pltotf %%{tfmdir}/min5.tfm