updated texlive packages: supported VinePlus/5, more; improved some %%post scripts

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

j/jvf/jvf-vl.spec

@@ -14,7 +14,7 @@ Summary: Japanese Virtual Fonts
 Summary(ja): 日本語仮想フォントです.
 Name: jvf
 Version: 2.0
-Release: 5%{?_dist_release}
+Release: 6%{?_dist_release}
 License: distributable
 Group: Applications/Publishing
 Source0: %{vinepl}.tar.gz
@@ -30,6 +30,9 @@ BuildRequires: texlive = %{tlversion}
 ##BuildRequires: makejvf
 BuildArch: noarch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
+
+Obsoletes: texlive-jvf <= 2.0
+
 Vendor: Project Vine
 Distribution: Vine Linux
 
@@ -164,6 +167,10 @@ exit 0
 
 
 %changelog
+* Sat Jan 15 2011 Munehiro Yamamoto <munepi@vinelinux.org> 2.0-6
+- added Obsoletes: texlive-jvf <= 2.0
+  - for TeX Live 2009 of VinePlus/5, supported texlive-jvf
+
 * Sun May 16 2010 Munehiro Yamamoto <munepi@vinelinux.org> 2.0-5
 - use texlive-2009 + ptexlive-20100322
   - dropped Requires: tetex, BuildRequires: tetex

m/mathabx-type1/mathabx-type1-vl.spec

@@ -20,7 +20,7 @@ Summary: The mathabx font series: extended and extendable series of mathematical
 Summary(ja): mathabx: TeX 用の新しい数式フォント
 Name: mathabx-type1
 Version: 2005
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 Source0: mathabx-%{mathabxdate}.tar.bz2
 Source1: abxtype1-%{mathabxdate}.tar.bz2
 Source2: mathabx_docs-%{mathabxdate}.tar.bz2
@@ -32,6 +32,7 @@ BuildArch: noarch
 PreReq: sed, sh-utils
 
 Requires: texlive-collection-fontsextra
+Obsoletes: texlive-mathabx-type1 <= 2005
 Obsoletes: mathabx <= 2005-1
 
 Vendor: Project Vine
@@ -115,6 +116,10 @@ exit 0
 
 
 %changelog
+* Sat Jan 15 2011 Munehiro Yamamoto <munepi@vinelinux.org> 2005-3
+- added Obsoletes: texlive-mathabx-type1 <= 2005
+  - for TeX Live 2009 of VinePlus/5, supported texlive-mathabx-type1
+
 * Sun Aug 08 2010 Munehiro Yamamoto <munepi@vinelinux.org> 2005-2
 - renamed to mathabx-type1
 - TeX Live 2009

t/texlive-common/texlive-common-vl.spec

@@ -1,6 +1,20 @@
 ## -*- coding: utf-8-unix -*-
 %bcond_with firstbuild
 
+%if %{?_dist_release} == "vl6"
+Provides:    jadetex
+Obsoletes:   jadetex tetex dvipdfmx xdvik xdvik-motif
+%endif
+%if %{?_dist_release} == "vl5"
+Provides:    jadetex
+Conflicts:   tetex dvipdfmx xdvik xdvik-motif jvf
+%endif
+Obsoletes:   tetex-latex tetex-afm tetex-type1 tetex-devel
+Obsoletes:   pTeX pLaTeX2e pLaTeX2e_Macros dvipsk
+Obsoletes:   dvipdfm texmacro-aps
+Obsoletes:   makejvf <= 1.1a
+Conflicts:   task-texmacro-phys < 1.1
+
 %define tex_destdir	%{_datadir}
 %define texmf		%{tex_destdir}/texmf
 %define texlive_src	%{tex_destdir}/texlive-sources
@@ -10,6 +24,8 @@
 %define exec_mktexlsr  [ -x %{_bindir}/texconfig-sys ] && PATH=%{_bindir}:$PATH %{_bindir}/texconfig-sys rehash
 %define exec_texhash  [ -x %{_bindir}/texhash ] && PATH=%{_bindir}:$PATH %{_bindir}/texhash
 %define exec_updmap   [ -x %{_bindir}/updmap-sys ] && PATH=%{_bindir}:$PATH %{_bindir}/updmap-sys --nostop
+## NOTE: For only texlive-common, if %exec_fmtutil fails, 
+## we show the STDERR of %exec_fmtutil. 
 %define exec_fmtutil  [ -x %{_bindir}/fmtutil-sys ] && PATH=%{_bindir}:$PATH %{_bindir}/fmtutil-sys --all >/dev/null
 %define exec_upddeffont    [ -x %{_sbindir}/update-defaultfont ] && %{_sbindir}/update-defaultfont 2> /dev/null
 %define vartexfonts %{_var}/lib/texmf
@@ -25,7 +41,7 @@ Summary: Common base for all TeX Live packages
 Summary(ja): TeX Live パッケージの共通ベース
 Name: texlive-common
 Version: 2009
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 License: distributable
 Group: Applications/Publishing
 URL: http://www.tug.org/texlive/
@@ -91,16 +107,17 @@ TeX に関するたくさんの一般的なドキュメントを含んでいま
 %{exec_texhash}
 echo -n "    "
 echo -n "Running updmap ... " && %{exec_updmap} >/dev/null 2>&1 && echo "done."
+rm -f %{texmf}/updmap.lock
 echo -n "    "
 echo -n "Running fmtutil ... " && %{exec_fmtutil} && echo "done."
 
 exit 0
 
 
-%postun
-%{exec_texhash}
-echo -n "    "
-echo -n "Running updmap ... " && %{exec_updmap} >/dev/null 2>&1 && echo "done."
+# %postun
+# %{exec_texhash}
+# echo -n "    "
+# echo -n "Running updmap ... " && %{exec_updmap} >/dev/null 2>&1 && echo "done."
 # echo -n "    "
 # echo -n "Running fmtutil ... " && %{exec_fmtutil} && echo "done."
 
@@ -108,8 +125,16 @@ exit 0
 
 
 %changelog
+* Fri Jan 14 2011 Munehiro Yamamoto <munepi@vinelinux.org> 2009-3
+- added to remove %%{texmf}/updmap.lock in %%post
+  - When texlive-common is installed, this lock generating 
+    texlive-collection-* leaves. 
+- dropped %%postun
+- added some comments for the definition of %%exec_fmtutil
+
 * Sat Jan 08 2011 Munehiro Yamamoto <munepi@vinelinux.org> 2009-2
 - changed Requires: -> Requires(pre): for all requirements
+- merged dependencies of Provides:/Obsoletes: tags from texlive-vl.spec
 
 * Mon Jul 19 2010 Munehiro Yamamoto <munepi@vinelinux.org> 2009-1
 - TeX Live 2009

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

@@ -98,7 +98,7 @@ find . -type f -name .cvsignore | xargs -r %__rm -fv
     %__mkdir_p tmp
     for i in *.*; do nkf $i > tmp/$i; done
     %__mv tmp/* .
-    %__rmdir tmp
+    %__rm -rf tmp
 )
 
 

t/texlive-sources/texlive-sources-vl.spec

@@ -16,7 +16,7 @@ Summary: A collection of sources for TeX Live packages
 Summary(ja): TeX Live のソース集
 Name: texlive-sources
 Version: 2009
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: distributable
 Group: Applications/Publishing
 URL: http://www.tug.org/texlive/
@@ -35,12 +35,7 @@ Source3: ftp://tug.org/historic/systems/texlive/2009/%{pkgname}-%{texlivever}-ex
 %{?nosrc:NoSource: 3}
 
 BuildRequires: tar
-%if %{?_dist_release} == "vl6"
 BuildRequires: xz
-%endif
-%if %{?_dist_release} == "vl5"
-BuildRequires: lzma
-%endif
 
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -88,13 +83,16 @@ ftp://tug.org/historic/systems/texlive/2009/ 上の
 
     %__tar Jxf %{SOURCE2} || exit 1
     %__mv %{pkgname}-%{texlivever}-texmf/* . || exit 1
-    %__tar Jxf %{SOURCE3}  || exit 1
+    %__tar Jxf %{SOURCE3} || exit 1
     %__mv %{pkgname}-%{texlivever}-extra/* . || exit 1
 
     # %__mkdir_p tlpkg || exit 1
     # %__install -m0644 %{SOURCE10} tlpkg/texlive.tlpdb || exit 1
 
     %__rm -r %{pkgname}-%{texlivever}-{texmf,extra} || exit 1
+
+    ## remove arch dependent binaries
+    %__rm -f texmf-dist/source/latex/splitindex/splitindex-{OpenBSD,Linux}-i386
 )
 
 %clean
@@ -105,6 +103,8 @@ ftp://tug.org/historic/systems/texlive/2009/ 上の
 %{texlivedir}-sources
 
 %changelog
+* Sat Nov 06 2010 Munehiro Yamamoto <munepi@vinelinux.org> 2009-2
+- supported Vine Linux 5
+
 * Sun May 09 2010 Munehiro Yamamoto <munepi@vinelinux.org> 2009-1
 - TeX Live 2009
-

t/texlive-vtlpkg/texlive-vtlpkg-vl.spec

@@ -2,7 +2,7 @@ Summary: TeX Live packaging utilities for Vine Linux
 Summary(ja): Vine Linux 用 TeX Live パッケージングユーティリティ
 Name: texlive-vtlpkg
 Version: 2009
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 License: GPLv2+
 Group: Development/Tools
 Url: http://trac.vinelinux.org/wiki/TeXEnvironment
@@ -51,6 +51,10 @@ tlpdb2rpmspec を提供しています。
 
 
 %changelog
+* Wed Jan 12 2011 Munehiro Yamamoto <munepi@vinelinux.org> 2009-3
+- updated tlpdb2rpmspec.sh.in: 
+  - improved %%post
+
 * Sun Sep 26 2010 Munehiro Yamamoto <munepi@vinelinux.org> 2009-2
 - updated tlpdb2rpmspec.sh.in: 
   - removed arch dependent binaries (texlive-collection-latexextra)

t/texlive/ptexlive-20100711-pxdvik-vine.patch

@@ -89,6 +89,23 @@ Diff finished.  Sun May 16 16:04:33 2010
  
  !!! Motif fonts. Meaning of the tags is:
  !!! NORMAL: Ordinary text, labels etc.
+@@ -160,11 +166,11 @@ xdviSelFile*international: false
+ !!! TOPIC_HEADING: Heading for help text in help window
+ !!!
+ *fontList: \
+--*-*-medium-r-*-*-12-*-*-*-*-*-*-*:=NORMAL,\
+--*-*-medium-r-*-*-12-*-*-*-*-*-*-*:=UNMARKED,\
+--*-*-bold-r-*-*-12-*-*-*-*-*-*-*:=MARKED,\
+--*-*-bold-r-*-*-12-*-*-*-*-*-*-*:=TOPIC_LABEL,\
+--*-*-bold-r-*-*-14-*-*-*-*-*-*-*:=TOPIC_HEADING
++-*-*-medium-r-*-*-12-*-*-*-*-*-*-*=NORMAL,\
++-*-*-medium-r-*-*-12-*-*-*-*-*-*-*=UNMARKED,\
++-*-*-bold-r-*-*-12-*-*-*-*-*-*-*=MARKED,\
++-*-*-bold-r-*-*-12-*-*-*-*-*-*-*=TOPIC_LABEL,\
++-*-*-bold-r-*-*-14-*-*-*-*-*-*-*=TOPIC_HEADING
+ 
+ 
+ !!! Color used for page border, image bounding boxes and the ruler in `Ruler mode'.
 
 
 diff -up xdvik-22.84.14/texk/xdvik/xdvi-sh.in.\~1.2.2.7.\~ xdvik-22.84.14/texk/xdvik/xdvi-sh.in

t/texlive/texlive-20091107-xdvik-vine.patch

@@ -0,0 +1,99 @@
+diff -up ptexlive-20100711/build/texlive-20091107-source/texk/xdvik/texmf/XDvi.orig ptexlive-20100711/build/texlive-20091107-source/texk/xdvik/texmf/XDvi 
+--- ptexlive-20100711/build/texlive-20091107-source/texk/xdvik/texmf/XDvi.orig	2008-07-02 00:42:36.000000000 +0900
++++ ptexlive-20100711/build/texlive-20091107-source/texk/xdvik/texmf/XDvi	2011-01-15 11:27:58.000000000 +0900
+@@ -118,14 +118,16 @@ Ctrl<Btn5Down>:set-shrink-factor(-)\n\
+ 
+ 
+ !!! help topics label for Xaw
+-*help_label.font: -*-helvetica-bold-r-*-*-14-*-*-*-*-*-*-*
++!*help_label.font: -*-helvetica-bold-r-*-*-14-*-*-*-*-*-*-*
++*help_label.font: -*-*-bold-r-*-*-14-*-*-*-*-*-*-*
+ 
+ !!!------------------------------------------------------------------------------
+ !!!-------------------------------- Motif tooltips ------------------------------
+ !!!------------------------------------------------------------------------------
+ !!! background color and font:
+ *tipShell.background: cornsilk
+-*tipShell.fontSet: -*-helvetica-medium-r-*-*-12-*-*-*-*-*-*
++!*tipShell.fontSet: -*-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*,-*-*-medium-r-*-*-12-*-*-*-*-*-*-*
++*tipShell.fontSet: -*-*-medium-r-*-*-12-*-*-*-*-*-*-*
+ 
+ !!! time the mouse needs to stay on a button until tooltips pop up,
+ !!! in milliseconds; set to a negative value to disable:
+@@ -135,9 +137,15 @@ Ctrl<Btn5Down>:set-shrink-factor(-)\n\
+ !!!------------------------------------------------------------------------------
+ !!!------------------------------ Fonts and colors ------------------------------
+ !!!------------------------------------------------------------------------------
+-*font:     -*-helvetica-medium-r-*-*-12-*-*-*-*-*-*
++!*font:    -*-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*
++!*fontSet: -*-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*,-*-*-medium-r-*-*-12-*-*-*-*-*-*-*
++*font:    -*-*-medium-r-*-*-12-*-*-*-*-*-*-*
++*fontSet: -*-*-medium-r-*-*-12-*-*-*-*-*-*-*
+ !!! Use a smaller font for the statusline in the Xaw version:
+-*statusline.font: -*-helvetica-medium-r-*-*-10-*-*-*-*-*-*
++!*statusline.font:    -*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*
++!*statusline.fontSet: -*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*,-*-*-medium-r-*-*-10-*-*-*-*-*-*-*
++*statusline.font:    -*-*-medium-r-*-*-10-*-*-*-*-*-*-*
++*statusline.fontSet: -*-*-medium-r-*-*-10-*-*-*-*-*-*-*
+ 
+ !!! Motif fonts. Meaning of the tags is:
+ !!! NORMAL: Ordinary text, labels etc.
+@@ -147,11 +155,11 @@ Ctrl<Btn5Down>:set-shrink-factor(-)\n\
+ !!! TOPIC_HEADING: Heading for help text in help window
+ !!!
+ *fontList: \
+--*-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*=NORMAL,\
+--*-helvetica-medium-r-*-*-12-*-*-*-*-*-*-*=UNMARKED,\
+--*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*=MARKED,\
+--*-helvetica-bold-r-*-*-12-*-*-*-*-*-*-*=TOPIC_LABEL,\
+--*-helvetica-bold-r-*-*-14-*-*-*-*-*-*-*=TOPIC_HEADING
++-*-*-medium-r-*-*-12-*-*-*-*-*-*-*=NORMAL,\
++-*-*-medium-r-*-*-12-*-*-*-*-*-*-*=UNMARKED,\
++-*-*-bold-r-*-*-12-*-*-*-*-*-*-*=MARKED,\
++-*-*-bold-r-*-*-12-*-*-*-*-*-*-*=TOPIC_LABEL,\
++-*-*-bold-r-*-*-14-*-*-*-*-*-*-*=TOPIC_HEADING
+ 
+ 
+ !!! Color used for page border, image bounding boxes and the ruler in `Ruler mode'.
+@@ -368,3 +376,24 @@ Ctrl<Btn5Down>:set-shrink-factor(-)\n\
+ !!!-------------- used for internal checking - DO NOT CHANGE THIS! --------------
+ !!!------------------------------------------------------------------------------
+ *appDefaultsFileVersion: 20030303
++
++
++!!! ------- added by Vine Linux -------
++
++!*.shrinkFactor: 5
++!*.geometry: 950x700+0+0
++!*.expert: true
++!*.smallPanel: false
++
++*.editor: emacsclient --no-wait +%l %f
++!*.editor: gnuclient -q +%l %f
++!*.editor: gvim --servername xdvi --remote +%l %f
++!*.editor: nc -noask +%l %f
++
++*.wwwBrowser: firefox %s
++!*.wwwBrowser: mozilla -remote "openURL(%s,new-tab)"
++!*.wwwBrowser: mozilla -remote "openURL(%s,new-window)"
++!*.wwwBrowser: htmlview %s
++!*.wwwBrowser: xterm -e w3m %s
++!*.wwwBrowser: xterm -e lynx %s
++!*.wwwBrowser: xterm -e wget %s
+
+Diff finished.  Sat Jan 15 11:29:00 2011
+
+diff -up ptexlive-20100711/build/texlive-20091107-source/texk/xdvik/xdvi-sh.in\~ ptexlive-20100711/build/texlive-20091107-source/texk/xdvik/xdvi-sh.in
+--- ptexlive-20100711/build/texlive-20091107-source/texk/xdvik/xdvi-sh.in~	2008-07-02 00:42:36.000000000 +0900
++++ ptexlive-20100711/build/texlive-20091107-source/texk/xdvik/xdvi-sh.in	2011-01-15 11:17:06.990570552 +0900
+@@ -50,4 +50,8 @@ if test -n "$xdviappfile"; then
+   XFILESEARCHPATH="$xdviapppath:${XFILESEARCHPATH-%D}"; export XFILESEARCHPATH
+ fi
+ 
++# Forcely avoid to show 
++# Warning: Missing charsets in String to FontSet conversion
++export LANG=C
++
+ exec @final_exec_name@ $NAMEOPT ${1+"$@"}
+
+Diff finished.  Sat Jan 15 11:17:12 2011

t/texlive/texlive-vl.spec

@@ -32,15 +32,13 @@
 %define exec_upddeffont    [ -x %{_sbindir}/update-defaultfont ] && %{_sbindir}/update-defaultfont 2> /dev/null
 %define vartexfonts %{_var}/lib/texmf
 
-# define zlib_version	#(rpm -q --queryformat \%\\{version\\} zlib)
-
 Autoreq: 0
 
 Summary: The TeX text formatting system
 Summary(ja): TeX 文書整形システム
 Name: texlive
 Version: 2009
-Release: 12%{?_dist_release}
+Release: 13%{?_dist_release}
 License: distributable
 Group: Applications/Publishing
 ## The TeX Live is located on http://www.tug.org/texlive/
@@ -108,8 +106,9 @@ Patch1:		texlive-%{texlivesrcver}-set-selfautodir.patch
 ##Patch1:	texlive-2009-texmfcnf-selfautodir-vine.patch
 Patch2:		texlive-%{texlivesrcver}-texmfcnf-vine.patch
 
-## pxdvi
+## (p)xdvik
 Patch10:	ptexlive-%{ptexlivever}-pxdvik-vine.patch
+Patch11:	texlive-%{texlivesrcver}-xdvik-vine.patch
 
 ## dvipdfmx
 Patch20:	ptexlive-%{ptexlivever}-dvipdfmx-vine.patch
@@ -170,12 +169,7 @@ Requires(post): ed mktemp
 Requires(post): vutils >= 2.0.5
 %{!?with_firstbuild:BuildRequires: texlive-common = %{version}}
 BuildRequires: texlive-sources = %{version}
-%if %{?_dist_release} == "vl6"
 BuildRequires: xz
-%endif
-%if %{?_dist_release} == "vl5"
-BuildRequires: p7zip >= 9.04
-%endif
 BuildRequires: unzip
 BuildRequires: bison flex
 BuildRequires: zlib-devel
@@ -195,24 +189,6 @@ BuildRequires: fontconfig-devel
 BuildRequires: nkf
 BuildRequires: t1utils
 
-%if %{?_dist_release} == "vl6"
-Provides:    jadetex
-Obsoletes:   jadetex <= 3.12-9
-Obsoletes:   tetex <= 3.0-12
-Obsoletes:   dvipdfmx <= 20090522
-Obsoletes:   xdvik <= 22.84.14, xdvik-motif <= 22.84.14
-%endif
-%if %{?_dist_release} == "vl5"
-Conflicts:   jadetex tetex dvipdfmx xdvik xdvik-motif jvf
-%endif
-
-Obsoletes:   tetex-latex tetex-afm tetex-type1 tetex-devel
-Obsoletes:   pTeX pLaTeX2e pLaTeX2e_Macros dvipsk
-Obsoletes:   dvipdfm texmacro-aps
-Obsoletes:   makejvf <= 1.1a
-Conflicts:   task-texmacro-phys < 1.1
-# Provides:  tetex-latex
-
 Buildroot:    %{_tmppath}/%{name}-%{version}-root
 
 Vendor:       Project Vine
@@ -310,11 +286,7 @@ This package includes header files of the ptexenc library.
 %setup -q -n ptexlive-%{ptexlivever}
 
 ## extract texlive-source
-%if %{?_dist_release} == "vl6"
 %__tar Jxf %{texlive_src}/source/%{name}-%{texlivesrcver}-source.tar.xz || exit 1
-%elseif %{?_dist_release} == "vl5"
-7za e -so %{texlive_src}/source/%{name}-%{texlivesrcver}-source.tar.xz 2>/dev/null | %__tar xf - || exit 1
-%endif
 
 ## move texlive-source to build/
 %__mkdir_p build && \
@@ -378,12 +350,6 @@ conf_option --enable-shared
 EOF
 %endif
 
-%if %{?_dist_release} == "vl5"
-%__cat <<EOF >> ptexlive.cfg
-XZ="7za x -so"
-EOF
-%endif
-
 %__cat <<EOF >> ptexlive.cfg
 conf_option --enable-kanji-iconv
 
@@ -397,8 +363,9 @@ EOF
 ## texmf.cnf for Vine Linux
 %patch2 -p1 -b .orig
 
-## pxdvik for Vine Linux
+## (p)xdvik for Vine Linux
 %patch10 -p1 -b .orig
+%patch11 -p1 -b .orig
 
 ## dvipdfmx for Vine Linux
 %patch20 -p1 -b .orig
@@ -827,10 +794,17 @@ fi
 
 
 %changelog
+* Sat Jan 15 2011 Munehiro Yamamoto <munepi@vinelinux.org> 2009-13
+- updated ptexlive-20100711-pxdvik-vine.patch 
+  and added texlive-20091107-xdvik-vine.patch
+  - fixed to adjust X resources in texmf/xdvi/XDvi for (p)xdvi
+
 * Sat Jan 08 2011 Munehiro Yamamoto <munepi@vinelinux.org> 2009-12
 - supported Vine Linux 5
   - for vl5, changed a requirement of Japanese VF package
     - added Requires: texlive-jvf = 2009 (vl5)
+- dropped dependencies of Provides:/Obsoletes: tags
+  - merged these dependencies in texlive-common-vl.spec
 
 * Wed Dec 01 2010 Shu KONNO <owa@bg.wakwak.com> 2009-11
 - rebuilt with poppler-0.14.2 (libpoppler has been up to so.7)

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

@@ -23,7 +23,7 @@ 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: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 BuildArch: noarch
 # #Source0: http://psitau.at.infoseek.co.jp/otfstable.zip
 # Source0: otfstable-%{version}.tar.bz2
@@ -57,6 +57,8 @@ Requires:     ghostscript
 
 Buildroot:    %{_tmppath}/%{name}-%{version}-root
 
+Obsoletes: texlive-texmacro-otf <= 1.5.6.1
+
 Distribution: Vine Linux
 Vendor:       Project Vine
 
@@ -204,6 +206,10 @@ exit 0
 %{mapdir}
 
 %changelog 
+* Sat Jan 15 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.5.6.1-2
+- added Obsoletes: texlive-texmacro-otf <= 1.5.6.1
+  - for TeX Live 2009 of VinePlus/5, supported texlive-texmacro-otf
+
 * Sat Jul 03 2010 Munehiro Yamamoto <munepi@vinelinux.org> 1.5.6.1-1
 - new upstream release
 - TeX Linux 2009

x/xdvi-search-el/xdvi-search-el-vl.spec

@@ -5,7 +5,7 @@ Summary: TeX src-special files for emacsen
 Summary(ja): TeX src-special を Emacsen 上で使用するための elisp
 Name: xdvi-search-el
 Version: 2009
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 ## This file xdvi-search.el is contained in TeX Live 2009
 Source0: xdvi-search.el
 
@@ -19,6 +19,7 @@ License: GPL
 Group: Applications/Editors/Emacs
 Requires(post,preun): emacsen-common
 
+Obsoletes: texlive-xdvi-search-el <= 2009
 Obsoletes: xdvik-search <= 22.84.14
 
 BuildArch: noarch
@@ -94,6 +95,10 @@ fi
 
 
 %changelog
+* Sat Jan 15 2011 Munehiro Yamamoto <munepi@vinelinux.org> 2009-2
+- added Obsoletes: texlive-xdvi-search-el <= 2009
+  - for TeX Live 2009 of VinePlus/5, supported texlive-xdvi-search-el
+
 * Sat Aug 07 2010 Munehiro Yamamoto <munepi@vinelinux.org> 2009-1
 - ported from xdvik-22.84.14-6
 - TeX Live 2009