improve many things :)

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

t/texlive/texlive-vl.spec

@@ -63,7 +63,7 @@ Summary: The TeX text formatting system
 Summary(ja): TeX 文書整形システム
 Name: texlive
 Version: 2012
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: distributable
 Group: Applications/Publishing
 URL: http://www.tug.org/texlive/
@@ -123,7 +123,7 @@ Requires:    libjpeg
 Requires:    t1lib
 Requires:    freetype2
 Requires:    openMotif
-Requires:    poppler >= 0.18
+Requires:    poppler >= 0.20
 Requires:    openssl
 Requires:    libpaper
 Requires:    fontconfig
@@ -153,7 +153,7 @@ BuildRequires: XOrg-devel
 BuildRequires: freetype2-devel >= 2.1.10
 BuildRequires: autoconf >= 2.68
 BuildRequires: openMotif-devel
-BuildRequires: poppler-devel >= 0.12
+BuildRequires: poppler-devel >= 0.20
 BuildRequires: openssl-devel
 BuildRequires: libpaper-devel
 BuildRequires: fontconfig-devel
@@ -340,14 +340,6 @@ TL_MAKE=%__make ./Build || exit 1
 ## prepare %%install session
 [ -n "%{buildroot}" -a "%{buildroot}" != / ] && %__rm -rf %{buildroot}
 
-## The following lines are useful for the call of 
-## "rpmbuild -ba --short-circuit ~/rpm/SPECS/texlive-vl.spec"
-%__rm -rf inst
-(
-    cd Work
-    %__make world
-)
-
 ## copy inst dir. to /usr
 %__mkdir_p %{buildroot}
 %__cp -a inst %{buildroot}%{_prefix} || exit 1
@@ -499,10 +491,12 @@ done
 ## use our map files for dvipdfmx
 %__mkdir_p %{buildroot}%{aliasttfdir}
 %__mkdir_p %{buildroot}%{texmfsysvar}/fonts/map/dvipdfmx/vine
-touch %{buildroot}%{texmfsysvar}/fonts/map/dvipdfmx/vine/ptex-vine.map
-touch %{buildroot}%{texmfsysvar}/fonts/map/dvipdfmx/vine/uptex-vine.map
-touch %{buildroot}%{texmfsysvar}/fonts/map/dvipdfmx/vine/otf-vine.map
-touch %{buildroot}%{texmfsysvar}/fonts/map/dvipdfmx/vine/otf-up-vine.map
+for x in ptex uptex otf otf-up; do 
+    touch %{buildroot}%{texmfsysvar}/fonts/map/dvipdfmx/vine/${x}-vine.map
+done
+for x in FutoGo-Bold FutoMin-Bold Gothic-Medium MaruGo-Medium Mincho-Medium; do
+    touch %{buildroot}%{aliasttfdir}/${x}.ttf
+done
 
 ## install updmap-kanji.html
 %__mkdir_p %{build_texmf}/doc/fonts/jfontmaps
@@ -539,19 +533,15 @@ touch %{build_texmf}-dist/ls-R
 touch %{buildroot}%{texmfsysconfig}/ls-R
 touch %{buildroot}%{texmfsysvar}/ls-R
 
-# ## compress info files
-# %__rm -f %{buildroot}%{_infodir}/dir
-%__rm -f %{buildroot}%{_infodir}/*
-
-## remove tlmgr
+## remove unpackaging files
+find %{buildroot} | %__grep -e "\\.\(la\|a\)$" | xargs %__rm -f || exit 1
+find %{buildroot} | %__grep -e "\\.\(diff\|patch\)$" | xargs %__rm -f || exit 1
 %__rm -f %{buildroot}%{_bindir}/tlmgr || exit 1
-
-## remove asymptote
+find %{build_texmf}/fonts/map -type d | %__grep "updmap" | xargs %__rm -rf || exit 1
 find %{buildroot} -type d | grep asymptote | xargs %__rm -rf || exit 1
+%__rm -f %{build_texmf}/dvipdfm/config/config-win32 || exit 1
+%__rm -f %{buildroot}%{_infodir}/*
 
-## remove unpackaging files
-find %{buildroot} | %__grep -e "\\.\(la\|a\)$" | xargs %__rm -f
-find %{buildroot} | %__grep -e "\\.\(diff\|patch\)$" | xargs %__rm -f
 
 ### Files list
 find %{buildroot} -type f -or -type l | \
@@ -560,16 +550,26 @@ find %{buildroot} -type f -or -type l | \
     %__grep -v "%{_includedir}" | \
     %__grep -v "%{_libdir}" | \
     %__grep -v "%{_infodir}" | \
-    %__sed -e "s|.*\.\(cnf\|cfg\)$|%config(noreplace) &|" \
-	   -e "s|.*ls-R$|%ghost &|" \
-	   -e "s|^.*/updmap$|%config &|" \
-	   -e "s|%{texmf}*/dvips/config/\(psfonts.*\|ps2pk.*\|pdftex.*\|dvipdfm.*\|.*35\)\.map$|%ghost &|" \
-	   -e "s|%{texmf}*/web2c/.*\.\(fmt\|efmt\|log\|base\|mem\|oft\)$|%config &|" \
-	   -e "s|%{texmf}*/dvips/config/config\.\(generic\|pdf\|ps\|www\)$|%config &|" \
+    %__sed -e "s|.*ls-R$|%ghost &|" \
+           -e "s|%{texmfsysvar}/fonts/map/dvipdfmx/vine/.*\.map$|%ghost &|" \
+           -e "s|%{aliasttfdir}/.*\.ttf$|%ghost &|" \
+           -e "s|.*/updmap.*\.cfg$|%config(noreplace) &|" \
+           -e "s|.*/dvipdfmx\.cfg$|%config(noreplace) &|" \
+           -e "s|.*xdvi\.cfg$|%config(noreplace) &|" \
+           -e "s|.*\.cnf$|%config(noreplace) &|" \
+	   -e "s|%{texmf}*/xdvi/XDvi|%config(noreplace) &|" \
+           -e "s|%{texmf}/web2c/texmfcnf\.lua$|%config(noreplace) &|" \
+	   -e "s|^.*/updmap/$|%config &|" \
+           -e "s|%{texmf}*/texconfig/tcfmgr.map$|%config &|" \
+	   -e "s|%{texmf}*/dvips/config/.*$|%config &|" \
+           -e "s|%{texmf}*/dvips/tetex/config.*$|%config &|" \
+           -e "s|%{texmf}*/dvipdfm/config/config$|%config &|" \
+           -e "s|%{texmf}*/fonts/map/dvips/tetex/.*.map$|%config &|" \
+           -e "s|%{texmf}*/fonts/map/dvipdfmx/.*.map$|%config &|" \
 	   -e "s|%{texmf}*/tex/generic/config/.*|%config &|" \
-	   -e "s|%{texmf}*/pdftex/config/pdftex.cfg$|%config &|" \
-	   -e "s|%{texmf}*/xdvi/vfontmap$|%config &|" \
-	   -e "s|%{texmf}*/xdvi/XDvi|%config &|" \
+           -e "s|%{texmf}*/ttf2pk/ttf2pk\.cfg$|%config &|" \
+           -e "s|%{texmf}*/hbf2gf/.*\.cfg$|%config &|" \
+           -e "s|%{texmf}*/chktex/chktexrc$|%config &|" \
 	   -e "s|%{_mandir}/.*|&*|" \
 	> %{_builddir}/filelist.full
 
@@ -617,7 +617,7 @@ echo "done."
 
 %preun
 if [ "$1" = 0 ]; then
-    %__rm -rf %{vartexfonts} %{aliasttfdir}/*
+    %__rm -rf %{vartexfonts}
 fi
 exit 0
 
@@ -669,7 +669,8 @@ if [ -d "%{_datadir}/ghostscript/$(gs --version| cut -d . -f 1-2)/Resource/CMap"
 elif [ -d "%{_datadir}/ghostscript/Resource/CMap" ] ; then
     %__ln_s %{_datadir}/ghostscript/Resource/CMap %{texmf}/fonts/cmap/ghostscript
 fi
-%{exec_texhash}
+%touch_run texhash
+exit 0
 
 
 %files -f %{_builddir}/filelist.full
@@ -704,6 +705,12 @@ fi
 
 
 %changelog
+* Mon Nov 26 2012 Munehiro Yamamoto <munepi@vinelinux.org> 2012-2
+- fixed Source7: updmap.cfg.texlive-20120701 
+  (upto /etc/texmf/web2c/updmap.cfg)
+- fixex %%triggerin -- ghostscript
+  - replaced %%exec_texhash with %%touch_run texhash
+
 * Wed Nov 21 2012 Munehiro Yamamoto <munepi@vinelinux.org> 2012-1
 - TeX Live 2012 + tlptexlive 20121107