updated some spec files of texlive and related packages: supported vl5

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2421 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: 2009
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 License: public domain
 Group: Applications/Publishing
 BuildArch: noarch
@@ -13,9 +13,19 @@ Requires: texlive-collection-luatex = %{version}
 Requires: texlive-collection-pictures = %{version}
 Requires: texlive-collection-genericrecommended = %{version}
 Requires: texlive-collection-pstricks = %{version}
+%if %{?_dist_release} == "vl6"
 Requires: texmacro-otf >= 1.5.6.1
+%endif
+%if %{?_dist_release} == "vl5"
+Requires: texlive-texmacro-otf >= 1.5.6.1
+%endif
 
+%if %{?_dist_release} == "vl6"
 Obsoletes: task-tetex <= 3.0
+%endif
+%if %{?_dist_release} == "vl5"
+Conflicts:	task-tetex
+%endif
 Obsoletes: task-platex pk300
 
 BuildRoot: %{_tmppath}/%{name}-root
@@ -220,6 +230,10 @@ This package is a virtual package to install documentation packages of
 %files full-doc
 
 %changelog
+* Fri Dec 31 2010 Munehiro Yamamoto <munepi@vinelinux.org> 2009-3
+- for vl5, added Conflicts: task-tetex
+- for vl5, Requires: texlive-texmacro-otf >= 1.5.6.1
+
 * Wed Dec 29 2010 Munehiro Yamamoto <munepi@vinelinux.org> 2009-2
 - merged task-texlive-full-vl.spec
   - added full, full-doc subpackages

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

@@ -23,7 +23,7 @@ Summary:	A collection of useful macro packages for texlive package
 Summary(ja):	texlive パッケージで使うマクロパッケージ集
 Name:		texlive-macros
 Version:	2009
-Release:	2%{?_dist_release}
+Release:	3%{?_dist_release}
 License:	distributable
 Group:		Applications/Publishing
 
@@ -42,12 +42,17 @@ Source20:	http://prdownloads.sourceforge.jp/mytexpert/26068/jlisting.sty.bz2
 Requires:	perl
 Requires:	texlive = %{version}
 BuildRequires:	texlive = %{version}
-BuildRequires:	jvf nkf unzip
+BuildRequires:	nkf unzip
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
 
+%if %{?_dist_release} == "vl6"
 Obsoletes:	tetex-macros <= 3.0
+%endif
+%if %{?_dist_release} == "vl5"
+Conflicts:	tetex-macros
+%endif
 Obsoletes:	pLaTeX2e_Macros
 
 Distribution:	Vine Linux
@@ -200,6 +205,10 @@ exit 0
 
 
 %changelog
+* Fri Dec 31 2010 Munehiro Yamamoto <munepi@vinelinux.org> 2009-3
+- dropped BuildRequires: jvf
+- for vl5, added Conflicts: tetex-macros
+
 * Tue Aug 10 2010 Munehiro Yamamoto <munepi@vinelinux.org> 2009-2
 - removed %%{exec_updmap} in %%post and %%postun
 

t/texlive/texlive-vl.spec

@@ -1,6 +1,11 @@
 ## -*- coding: utf-8-unix -*-
 %bcond_with firstbuild
 
+%define enable_sharedlib 1
+%if %{?_dist_release} == "vl5"
+%define enable_sharedlib 0
+%endif
+
 %define with_babel 1
 
 %define ptexlivever	20100711
@@ -35,7 +40,7 @@ Summary: The TeX text formatting system
 Summary(ja): TeX 文書整形システム
 Name: texlive
 Version: 2009
-Release: 11%{?_dist_release}
+Release: 12%{?_dist_release}
 License: distributable
 Group: Applications/Publishing
 ## The TeX Live is located on http://www.tug.org/texlive/
@@ -147,11 +152,18 @@ Requires:    fontconfig
 Requires:    perl-Tk
 Requires:    nkf
 Requires:    ghostscript >= 8.63
+%if %{?_dist_release} == "vl6"
 Requires:    libkpathsea = %{version}-%{release}
 Requires:    libptexenc = %{version}-%{release}
+%endif
 %{!?with_firstbuild:Requires: texlive-common = %{version}}
 %{!?with_firstbuild:Requires: texlive-macros = %{version}}
+%if %{?_dist_release} == "vl6"
 %{!?with_firstbuild:Requires: jvf >= 2.0-5}
+%endif
+%if %{?_dist_release} == "vl5"
+%{!?with_firstbuild:Requires: texlive-jvf >= 2.0-5}
+%endif
 Requires:    fontconfig >= 2.6.0-2
 Requires(post,postun): fontconfig >= 2.6.0-2
 Requires(post): ed mktemp
@@ -162,7 +174,7 @@ BuildRequires: texlive-sources = %{version}
 BuildRequires: xz
 %endif
 %if %{?_dist_release} == "vl5"
-BuildRequires: lzma
+BuildRequires: p7zip >= 9.04
 %endif
 BuildRequires: unzip
 BuildRequires: bison flex
@@ -183,11 +195,16 @@ 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
+%endif
 
 Obsoletes:   tetex-latex tetex-afm tetex-type1 tetex-devel
 Obsoletes:   pTeX pLaTeX2e pLaTeX2e_Macros dvipsk
@@ -238,12 +255,14 @@ TeX に関するたくさんの一般的なドキュメントを含んでいま
 Summary: TeX Live: Documentation files of %{name}
 Group: Applications/Publishing
 Requires: %{name} = %{version}-%{release}
+%if %{?_dist_release} != "vl5"
 BuildArch: noarch
+%endif
 
 %description doc
 This package contains documentation files of %{name}.
 
-
+%if %{enable_sharedlib}
 %package -n libkpathsea
 Summary: path search library for the TeX Live
 Summary(ja): TeX Live 用パス検索ライブラリ
@@ -281,6 +300,7 @@ Requires: libptexenc = %{version}-%{release}
 
 %description -n libptexenc-devel
 This package includes header files of the ptexenc library.
+%endif
 
 
 %prep
@@ -290,7 +310,11 @@ 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 && \
@@ -345,7 +369,21 @@ conf_option --with-system-freetype
 conf_option --with-system-freetype2
 conf_option --with-freetype2-include=`freetype-config --cflags | sed -e 's/-I//' -e 's/ .*//'`
 conf_option --with-system-gd
+EOF
+
+%if %{enable_sharedlib}
+%__cat <<EOF >> ptexlive.cfg
 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
 
 conf_option --disable-multiplatform
@@ -380,10 +418,12 @@ cd eptex-%{eptexver}
 #%patch90 -p0 -b .orig
 
 ## libpoppler-0.12
+%if %{?_dist_release} != "vl5"
 (cd build/%{name}-%{texlivesrcver}-source
 %patch100 -p1 -b .xpdf
 %patch101 -p1 -b .xpdf
 )
+%endif
 
 ## apply security patches
 (cd build/%{name}-%{texlivesrcver}-source
@@ -653,8 +693,10 @@ popd
 %__install -m 755 %{SOURCE100} %{buildroot}%{_sysconfdir}/cron.daily/
 
 ## set executable bit for the library
+%if %{enable_sharedlib}
 %__chmod a+x %{buildroot}%{_libdir}/libkpathsea.so.*.*
 %__chmod a+x %{buildroot}%{_libdir}/libptexenc.so.*.*
+%endif
 
 ## remove unpackaging files
 find %{buildroot} | %__grep -e "\\.\(la\|a\)$" | xargs %__rm -f
@@ -720,6 +762,7 @@ if [ "$1" = 0 ]; then
 fi
 
 
+%if %{enable_sharedlib}
 %post -n libkpathsea
 /sbin/ldconfig
 # /sbin/install-info %{_infodir}/kpathsea.info.* %{_infodir}/dir
@@ -737,6 +780,7 @@ fi
 
 %postun -n libptexenc
 /sbin/ldconfig
+%endif
 
 
 %triggerin -- ghostscript
@@ -757,6 +801,7 @@ fi
 %files doc -f filelist.doc
 %defattr(-,root,root)
 
+%if %{enable_sharedlib}
 %files -n libkpathsea
 %defattr(-,root,root)
 %{_libdir}/libkpathsea.so.*
@@ -777,9 +822,15 @@ fi
 %{_libdir}/libptexenc.so
 %dir %{_includedir}/ptexenc
 %{_includedir}/ptexenc/*
+%endif
 
 
 %changelog
+* Sun Dec 26 2010 Munehiro Yamamoto <munepi@vinelinux.org> 2009-12
+- supported Vine Linux 5
+- changed a requirement of Japanese VF package
+  - Requires: texlive-jvf = 2009
+
 * 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)