update enhancement

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

t/texlive/texlive-vl.spec

@@ -21,6 +21,8 @@
 %define texlivesrcver   20120701
 %define texlivever      20120701
 
+%define enhancement_texlivesrcver   20130106
+
 %define aliasttfdir	%{texmfsysvar}/fonts/truetype/vine
 %define texmfsysconfig	%{_sysconfdir}/texmf
 %define texmfsysvar	%{_var}/lib/texmf
@@ -63,7 +65,7 @@ Summary: The TeX text formatting system
 Summary(ja): TeX 文書整形システム
 Name: texlive
 Version: 2012
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 License: distributable
 Group: Applications/Publishing
 URL: http://www.tug.org/texlive/
@@ -90,6 +92,14 @@ Source7: updmap.cfg.texlive-%{texlivesrcver}
 Source10: pxdvi.desktop
 Source11: texdoctk.desktop
 
+## update enhancement
+# dvipdfmx eptex euptex makejvf mendex pbibtex pdvitype pmpost ppltotf ptex ptftopl upbibtex updvitype uppltotf uptex uptftopl wovp2ovf
+Source50: texlive-source-%{enhancement_texlivesrcver}.tar.xz
+Source51: build-tlptexlive-20130106.zip
+# updmap.pl: fix duplicated-lw35
+# http://www.tug.org/svn/texlive/trunk/Master/texmf-dist/scripts/texlive/updmap.pl?r1=28104&r2=28830&view=patch
+Source52: texlive-20120701-fix-duplicated-lw35.patch
+
 ## find library sonames for libkpathsea and libptexenc
 Source99: find-provides-texlive.sh
 
@@ -110,6 +120,10 @@ Patch2:		texlive-%{texlivesrcver}-texmfcnf-vine.patch
 Patch3:		texlive-%{texlivesrcver}-set-selfautoparent-vine.patch
 Patch10:	texlive-%{texlivesrcver}-pxdvik-vine.patch
 
+Patch51:	texlive-%{enhancement_texlivesrcver}-vine.patch
+Patch52:	texlive-%{enhancement_texlivesrcver}-texmfcnf-vine.patch
+Patch53:	texlive-%{enhancement_texlivesrcver}-set-selfautoparent-vine.patch
+
 ## security
 
 Requires:    coreutils
@@ -242,7 +256,7 @@ This package includes header files of the ptexenc library.
 %prep
 [ -n "%{buildroot}" -a "%{buildroot}" != / ] && %__rm -rf %{buildroot}
 
-%setup -q -n %{name}-%{texlivesrcver}-source -a 1
+%setup -q -n %{name}-%{texlivesrcver}-source -a 1 -a 50
 
 %patch0 -p0 -b .parallel
 %patch1 -p1 -b .vine
@@ -264,11 +278,11 @@ echo "preparing pxdvi"
 # echo "patching pxdvi patches"
 # #patch -d texk/pxdvik -p1 < $(pwd)/build-tlptexlive/xdvik-20111212-texlive2011.diff 
 echo "patching with xdvik-20120415-texlive2011.diff"
-patch -d texk/pxdvik -p1 < $(pwd)/build-tlptexlive/xdvik-20120415-texlive2011.diff
+patch -d texk/pxdvik -p1 < $(pwd)/build-tlptexlive/xdvik-20120415-texlive2011.diff || exit 1
 echo "patching with pxdvik-20111126-density.diff"
-patch -d texk/pxdvik -p1 < $(pwd)/build-tlptexlive/pxdvik-20111126-density.diff
+patch -d texk/pxdvik -p1 < $(pwd)/build-tlptexlive/pxdvik-20111126-density.diff || exit 1
 echo "patching with pxdvik-20111212-uptex.diff"
-patch -d texk/pxdvik -p1 < $(pwd)/build-tlptexlive/pxdvik-20111212-uptex.diff 
+patch -d texk/pxdvik -p1 < $(pwd)/build-tlptexlive/pxdvik-20111212-uptex.diff || exit 1
 sedwrite libs/freetype2/freetype-2.4.*/modules.cfg 's/# (AUX_MODULES \+= otvalid)/\1/'
 sedwrite m4/kpse-pkgs.m4 "s/xdvik/xdvik\npxdvik/"
 
@@ -282,13 +296,30 @@ sedwrite m4/kpse-pkgs.m4 "s/xdvik/xdvik\npxdvik/"
 
 # pmpost
 echo "patching pmpost"
-patch -d texk -p0 < $(pwd)/build-tlptexlive/pmpost-20121106-tl12.diff
-patch -d texk -p0 < $(pwd)/build-tlptexlive/pmpost-svg-20120119-tl11.diff 
+patch -d texk -p0 < $(pwd)/build-tlptexlive/pmpost-20121106-tl12.diff || exit 1
+patch -d texk -p0 < $(pwd)/build-tlptexlive/pmpost-svg-20120119-tl11.diff || exit 1
 
 echo "running reautoconf"
 ./reautoconf || exit 1
 
 
+## patching for update enhancement
+(cd texlive-source-%{enhancement_texlivesrcver} || exit 1
+%patch51 -p1 -b .vine
+%patch52 -p1 -b .vine
+%patch53 -p1 -b .vine
+
+#tlptexlive-20130106
+unzip %{SOURCE51} || exit 1
+echo "creating pxdvi folder"
+%__cp -pR texk/xdvik texk/pxdvik
+echo "applying patches"
+cat "$(pwd)/build-tlptexlive-20130106/patches/series" | while read p r ; do
+    patch -p1 $r < "$(pwd)/build-tlptexlive-20130106/patches/$p" || exit 1
+done
+)
+
+
 %build
 set -x
 unset TEXINPUTS || :
@@ -333,8 +364,54 @@ TL_CONFIGURE_ARGS=" \
 "
 
 export TL_CONF_XDVI_TOOLKIT TL_MAKE_FLAGS TL_CONFIGURE_ARGS
+TL_MAKE=%__make ./Build || exit 1
 
+
+## update enhancement
+export TL_CONFIGURE_ARGS=" \
+    --disable-multiplatform \
+    --disable-native-texlive-build \
+    --with-banner-add=\"/Vine Linux\" \
+    --enable-shared --disable-static \
+    --enable-compiler-warnings=max \
+    --without-cxx-runtime-hack \
+    \
+        --enable-texlive        \
+	--disable-all-pkgs	\
+	--disable-xdvipdfmx	\
+	--disable-xetex		\
+	--enable-ptex		\
+	--enable-eptex		\
+	--enable-uptex		\
+	--enable-euptex		\
+	--enable-omfonts	\
+	--enable-pmp		\
+	--enable-makejvf	\
+	--enable-dvipdfmx	\
+	--enable-tetex		\
+	--enable-texk		\
+	--enable-web2c		\
+	--enable-mendexk	\
+    \
+    --with-system-xpdf \
+    --with-system-gd \
+    --with-system-t1lib \
+    --with-system-libpng \
+    --with-system-zlib \
+    --with-system-freetype2 \
+    --with-freetype2-include=$(freetype-config --cflags | %__sed -e 's/-I//' -e 's/ .*//') \
+    --with-pic \
+    --with-xdvi-x-toolkit=motif \
+    \
+    --disable-xindy --disable-xindy-docs --disable-xindy-make-rules \
+    --disable-dvi2tty \
+    --disable-t1utils --disable-psutils --disable-detex \
+    --disable-dvipng --disable-lcdf-typetools \
+"
+(cd texlive-source-%{enhancement_texlivesrcver} || exit 1
 TL_MAKE=%__make ./Build || exit 1
+)
+
 
 %install
 ## prepare %%install session
@@ -348,12 +425,19 @@ TL_MAKE=%__make ./Build || exit 1
 %endif
 ## replace texmf with that of texlive-sources
 %__rm -rf %{build_texmf} %{build_texmf}-dist || exit 1
-%__tar -C %{buildroot}%{_datadir} -xpf %{SOURCE5} || exit 1
+%__tar -C %{buildroot}%{_datadir} -xf %{SOURCE5} || exit 1
 ## override texmf/web2c/texmf.cnf and texmf/xdvi dir.
 %__cp -a inst/share/texmf/web2c/texmf.cnf %{build_texmf}/web2c/texmf.cnf || exit 1
 %__rm -rf %{build_texmf}/xdvi || exit 1
 %__cp -a inst/share/texmf/xdvi %{build_texmf}/xdvi || exit 1
 
+## update enhancement
+for x in dvipdfmx eptex euptex makejvf mendex pbibtex pdvitype pmpost ppltotf ptex ptftopl upbibtex updvitype uppltotf uptex uptftopl wovp2ovf; do
+    [ -x %{buildroot}%{_bindir}/${x} ] || exit 1
+    %__cp -af texlive-source-%{enhancement_texlivesrcver}/inst/bin/${x} %{buildroot}%{_bindir}/${x} || exit 1
+done
+patch -d %{build_texmf}/scripts/tetex -p0 < %{SOURCE52} || exit 1
+
 ## make some fundamental texmf trees
 %__mkdir_p %{build_texmf}-{local,dist}
 %__mkdir_p %{buildroot}%{texmfsysconfig}
@@ -722,6 +806,11 @@ exit 0
 
 
 %changelog
+* Thu May 16 2013 Munehiro Yamamoto <munepi@vinelinux.org> 2012-4
+- update enhancement binaries TeX Live 2013/dev 20130106 snapshot (tlptexlive-20130106)
+- fixed duplicated lw35 for updmap.pl
+- updated updmap.cfg.texlive-20120701: use ipaex as kanjiEmbed
+
 * Sat Mar  9 2013 Munehiro Yamamoto <munepi@vinelinux.org> 2012-3
 - touch the map files generated by updmap-sys