[texlive-texmf/f16] add inconsolata

[Tom Callaway]

commit 9a8f21364b2d33898df965b05347f953558fda03
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Mon Nov 7 14:48:01 2011 -0500

    add inconsolata

 sources            |    1 +
 texlive-texmf.spec |   39 ++++++++++++++++++++++++++++++++++++---
 2 files changed, 37 insertions(+), 3 deletions(-)
---
diff --git a/sources b/sources
index f88c1f5..e994337 100644
--- a/sources
+++ b/sources
@@ -7,3 +7,4 @@ c24f99d1fd399acecc2f3070c23f43f1  platex209.tar.bz2
 ba238f7a249967c11c048d1b039e4ead  achemso.zip
 ba9184469d3323fd43b42e1568d4b5f6  IEEEconf.zip
 fbac0afea54208bd8bc7d71a0d8524a1  perltex.zip
+db08c0a520a0dc75a92ebf748be648cb  inconsolata.zip
diff --git a/texlive-texmf.spec b/texlive-texmf.spec
index 0e01290..a442be2 100644
--- a/texlive-texmf.spec
+++ b/texlive-texmf.spec
@@ -14,11 +14,11 @@
 
 Name:		texlive-texmf
 Version:	2007
-Release:	38%{?dist}
+Release:	40%{?dist}
 Summary:	Architecture independent parts of the TeX formatting system
 
 Group:		Applications/Publishing
-License:	Artistic 2.0 and GPLv2 and GPLv2+ and LGPLv2+ and LPPL and MIT and Public Domain and UCD and Utopia
+License:	Artistic 2.0 and GPLv2 and GPLv2+ and LGPLv2+ and LPPL and MIT and OFL and Public Domain and UCD and Utopia
 URL:		http://tug.org/texlive/
 
 # Source0 comes as a result from scripts that look for files in teTeX and assigns appropriate
@@ -29,6 +29,9 @@ Source0:	texlive.texmf-%{version}.tar.lzma
 # Source1 is http://www.tug.org/texlive/Contents/inst/archive/texmf-var.zip
 Source1:	texlive.texmf-var-%{version}.zip
 
+# This is a bit of a hack, but we need this for R
+Source2:	http://mirror.ctan.org/fonts/inconsolata.zip
+
 # pregenerated kpathsea ls-R files in case no binary TeXLive is present to regenerate them
 Source10:	texlive.%{version}.ls-R
 Source11:	texlive.var.%{version}.ls-R
@@ -185,6 +188,9 @@ texlive-context package.
 %setup -q -c -T
 lzma -dc %{SOURCE0} | tar x
 
+# extract inconsolata
+unzip %{SOURCE2}
+
 # extract envlab
 unzip %{SOURCE100}
 # extract perltex
@@ -433,7 +439,9 @@ cp -a %{SOURCE10} %{buildroot}%{_texmf_main}/default.ls-R
 cp -a %{SOURCE11} %{buildroot}%{_texmf_var}/default.ls-R
 
 # ghostscript cmap required for dvipdfmx
-if [ -d "%{_datadir}/ghostscript/`gs --version| cut -d . -f 1-2`/Resource/CMap" ] ; then
+if [ -d "%{_datadir}/poppler/cMap" ] ; then
+  cmap_dir="%{_datadir}/poppler/cMap//"
+elif [ -d "%{_datadir}/ghostscript/`gs --version| cut -d . -f 1-2`/Resource/CMap" ] ; then
   cmap_dir="%{_datadir}/ghostscript/"`gs --version| cut -d . -f 1-2`"/Resource/CMap/"
 elif [ -d "%{_datadir}/ghostscript/Resource/CMap" ] ; then
   cmap_dir="%{_datadir}/ghostscript/Resource/CMap/"
@@ -506,6 +514,24 @@ install -p -m644 perltex/perltex.1 %{buildroot}%{_mandir}/man1
 # fix permissions of /var/lib/texmf/web2c
 chmod 755 %{buildroot}%{_texmf_var}/web2c
 
+# install inconsolata
+mkdir -p %{buildroot}%{_texmf_main}/tex/latex/inconsolata/
+mkdir -p %{buildroot}%{_texmf_main}/fonts/tfm/inconsolata/
+mkdir -p %{buildroot}%{_texmf_main}/fonts/opentype/inconsolata/
+mkdir -p %{buildroot}%{_texmf_main}/fonts/map/dvips/inconsolata/
+mkdir -p %{buildroot}%{_texmf_main}/fonts/type1/inconsolata/
+mkdir -p %{buildroot}%{_texmf_main}/fonts/sfd/inconsolata/
+mkdir -p %{buildroot}%{_texmf_main}/fonts/enc/dvips/inconsolata/
+pushd inconsolata
+install -p -m644 *.sty *.fd %{buildroot}%{_texmf_main}/tex/latex/inconsolata/
+install -p -m644 *.tfm %{buildroot}%{_texmf_main}/fonts/tfm/inconsolata/
+install	-p -m644 *.otf %{buildroot}%{_texmf_main}/fonts/opentype/inconsolata/
+install -p -m644 *.map %{buildroot}%{_texmf_main}/fonts/map/dvips/inconsolata/
+install -p -m644 *.pfb %{buildroot}%{_texmf_main}/fonts/type1/inconsolata/
+install	-p -m644 *.sfd %{buildroot}%{_texmf_main}/fonts/sfd/inconsolata/
+install -p -m644 *.enc %{buildroot}%{_texmf_main}/fonts/enc/dvips/inconsolata/
+popd
+
 # create macro file for building texlive
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 cat <<EOF > %{buildroot}%{_sysconfdir}/rpm/macros.texlive
@@ -863,6 +889,7 @@ fi
 %{_texmf_main}/fonts/map/vtex/
 %dir %{_texmf_main}/fonts/pk
 %dir %{_texmf_main}/fonts/sfd
+%{_texmf_main}/fonts/sfd/inconsolata/
 %{_texmf_main}/fonts/source/
 %{_texmf_main}/fonts/tfm/
 %{_texmf_main}/fonts/type1/
@@ -906,6 +933,12 @@ fi
 %doc %{_texmf_main}/doc/
 
 %changelog
+* Mon Nov  7 2011 Tom Callaway <spot at fedoraproject.org> 2007-40
+- add inconsolata for R
+
+* Thu Sep 21 2011 Jindrich Novy <jnovy at redhat.com> 2007-39
+- fix CMAPFONTS -> point to poppler path (#736242)
+
 * Tue Jul 26 2011 Jindrich Novy <jnovy at redhat.com> 2007-38
 - allow to make LaTeX format from source more than 5 years old
   (it gives a warning instead of an error)