rpms/texlive-texmf/devel texlive-texmf.spec,1.14,1.15

[Jindrich Novy (jnovy)]

Author: jnovy

Update of /cvs/extras/rpms/texlive-texmf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24570

Modified Files:
	texlive-texmf.spec 
Log Message:
* Thu Feb 28 2008 Jindrich Novy <jnovy at redhat.com> - 2007-14
- rename texlive-texmf-japanese to texlive-texmf-east-asian
- use better approach in installation of cmap files for dvipdfmx
  (#418091), thanks to Patrice Dumas
- drop useless ghostscript Requires from texlive-texmf-fonts,
  drop xdg-utils Requires from texlive-texmf (#428489)



Index: texlive-texmf.spec
===================================================================
RCS file: /cvs/extras/rpms/texlive-texmf/devel/texlive-texmf.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- texlive-texmf.spec	25 Feb 2008 06:47:14 -0000	1.14
+++ texlive-texmf.spec	29 Feb 2008 12:16:47 -0000	1.15
@@ -12,7 +12,7 @@
 
 Name:		texlive-texmf
 Version:	2007
-Release:	13%{?dist}
+Release:	14%{?dist}
 Summary:	Architecture independent parts of the TeX formatting system
 
 Group:		Applications/Publishing
@@ -62,7 +62,6 @@
 BuildRequires:  sed >= 3.95 ghostscript lzma
 
 Requires:	texlive-texmf-errata = %{version}
-Requires:	xdg-utils
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
@@ -113,8 +112,6 @@
 Summary:	Font files needed for TeXLive
 Requires:	texlive-texmf-dvips = %{version}-%{release}
 Requires:	texlive-texmf-errata-fonts = %{version}
-# required for dvipdfmx
-Requires:	ghostscript
 
 %description fonts
 This package contains the components of the TEXMF tree needed for the
@@ -130,13 +127,15 @@
 This package contains the components of the TEXMF tree needed for the
 texlive-latex package.
 
-%package japanese
+%package east-asian
 Group:		Applications/Publishing
-Summary:	Texmf files needed for texlive-japanese
+Summary:	Texmf files needed for texlive-east-asian
 Requires:	texlive-texmf = %{version}-%{release}
+Obsoletes:	texlive-texmf-japanese < 2007-14
+Provides:	texlive-texmf-japanese = %{version}-%{release}
 
-%description japanese
-Architecture independent files for Japanese support in TeXLive.
+%description east-asian
+Architecture independent files for support of east East Asian languages in TeXLive.
 
 %package context
 Group:		Applications/Publishing
@@ -338,33 +337,22 @@
 cp -a %{SOURCE10} %{buildroot}%{_texmf_main}/default.ls-R
 cp -a %{SOURCE11} %{buildroot}%{_texmf_var}/default.ls-R
 
-cp -a texmf/* %{buildroot}%{_texmf_main}
-cp -a texmf-var/* %{buildroot}%{_texmf_var}
-cp -a texmf-dist/* %{buildroot}%{_texmf_vendor}
-
-install -d -m755 %{buildroot}%{_texmf_main}/fonts/{cmap,sfd,type3,type42}
-
-# add symbolic links for cmap. required for dvipdfmx
-if [ -d "/usr/share/ghostscript/`gs --version| cut -d . -f 1-2`/Resource/CMap" ] ; then
-  ln -s /usr/share/ghostscript/`gs --version| cut -d . -f 1-2`/Resource/CMap/* \
-        %{buildroot}%{_texmf_main}/fonts/cmap
-elif [ -d "/usr/share/ghostscript/Resource/CMap" ] ; then
-  ln -s /usr/share/ghostscript/Resource/CMap/* \
-        %{buildroot}%{_texmf_main}/fonts/cmap
-fi
-
-#required for dvipdfmx
-if [ -d "%{_datadir}/ghostscript/`gs --version| cut -d . -f 1-2`/Resource/CMap"] ; then
+# ghostscript cmap required for dvipdfmx
+if [ -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/"
 fi
 if [ z"$cmap_dir" != 'z' ]; then
-  pushd texmf/web2c
-  %{__sed} -i 's?^CMAPFONTS = .*?CMAPFONTS = .;$TEXMF/fonts/cmap//;'"$cmap_dir"'?' texmf.cnf
-  popd
+  %{__sed} -i 's?^CMAPFONTS = .*?CMAPFONTS = .;$TEXMF/fonts/cmap//;'"$cmap_dir"'?' texmf/web2c/texmf.cnf
 fi
 
+cp -a texmf/* %{buildroot}%{_texmf_main}
+cp -a texmf-var/* %{buildroot}%{_texmf_var}
+cp -a texmf-dist/* %{buildroot}%{_texmf_vendor}
+
+install -d -m755 %{buildroot}%{_texmf_main}/fonts/{cmap,sfd,type3,type42}
+
 # move the configuration files and symlink them
 install -d -m755 %{buildroot}%{_texmf_conf}/web2c
 mv %{buildroot}%{_texmf_main}/web2c/mktex.cnf %{buildroot}%{_texmf_conf}/web2c/
@@ -449,7 +437,7 @@
 %post doc
 [ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
 
-%post japanese
+%post east-asian
 [ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
 
 %post context
@@ -476,7 +464,7 @@
 %postun doc
 [ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
 
-%postun japanese
+%postun east-asian
 [ -x %{_bindir}/texconfig-sys ] && %{_bindir}/texconfig-sys rehash 2> /dev/null || :
 
 %postun context
@@ -576,7 +564,7 @@
 # texmf-var
 %{_texmf_var}/default.ls-R
 
-%files japanese
+%files east-asian
 %defattr(-,root,root,-)
 %dir %{_texmf_main}/ptex
 %{_texmf_main}/jbibtex
@@ -657,6 +645,13 @@
 %doc %{_texmf_main}/doc/
 
 %changelog
+* Thu Feb 28 2008 Jindrich Novy <jnovy at redhat.com> - 2007-14
+- rename texlive-texmf-japanese to texlive-texmf-east-asian
+- use better approach in installation of cmap files for dvipdfmx
+  (#418091), thanks to Patrice Dumas
+- drop useless ghostscript Requires from texlive-texmf-fonts,
+  drop xdg-utils Requires from texlive-texmf (#428489)
+
 * Mon Feb 25 2008 Jindrich Novy <jnovy at redhat.com> - 2007-13
 - ship config file for dvipdfm (#434165), thanks to Patrice Dumas
 - obsolete/provide tetex-lineno (#426929)