- remove dvipdfmx completely, also for F8 (related #437448)

- kpathsea requires texlive again (#437458)

texlive.spec

@@ -8,7 +8,6 @@
 %define mendexk_ver	2.6e
 %define dvipdfm_ver	0.13.2d
 %if %{f8_packaging}
-%define dvipdfmx_ver	0
 %define dvipng_ver	1.9
 %endif
 
@@ -27,7 +26,7 @@
 
 Name:		texlive
 Version:	%{texlive_ver}
-Release:	26%{?dist}
+Release:	27%{?dist}
 Summary:	Binaries for the TeX formatting system
 
 Group:		Applications/Publishing
@@ -331,7 +330,7 @@ ConTeXt is a document preparation system based on TeX.
 Summary: Shared library needed by kpathsea and info files
 Group:   Development/Libraries
 Obsoletes: tetex-fonts < 3.0-99
-#Requires: texlive = %{version}-%{release}
+Requires: texlive = %{version}-%{release}
 
 %description -n kpathsea
 Shared library needed by kpathsea and info files.
@@ -385,30 +384,6 @@ Requires: texlive-texmf-dvips = %{texlive_ver}
 %description -n dvipdfm
 DVI to PDF translator.
 
-%if %{f8_packaging}
-%package -n dvipdfmx
-Summary: Extended version of the dvipdfm DVI to PDF translator
-Version: %{dvipdfmx_ver}
-Group: Applications/Publishing
-#Url: http://project.ktug.or.kr/dvipdfmx/
-#Source0: http://project.ktug.or.kr/dvipdfmx/snapshot/release/dvipdfmx-%{dvipdfmx_ver}.tar.gz
-# for cmap files
-Requires: texlive-texmf-fonts = %{texlive_ver}
-Provides: texlive-dvipdfmx
-Requires: ghostscript
-
-%description -n dvipdfmx
-The dvipdfmx (formerly dvipdfm-cjk) project provides an eXtended version
-of the dvipdfm, a DVI to PDF translator developed by Mark A. Wicks.
-
-The primary goal of this project is to support multi-byte character
-encodings and large character sets for East Asian languages. The secondary
-goal is to support as many features as pdfTeX developed by Han The Thanh.
-
-This project is a combined work of the dvipdfm-jpn project by Shunsaku
-Hirata and its modified one, dvipdfm-kor, by Jin-Hwan Cho.
-%endif
-
 # without this define, the version is overriden by separated subpackages
 # versions
 %define version %{texlive_ver}
@@ -492,21 +467,6 @@ popd
 %endif
 
 ## Japanese pTeX
-%if %{f8_packaging}
-# create customized cid-x.map for dvipdfmx (#418091)
-cat <<EOF >> texk/dvipdfmx/data/config/cid-x.map
-%%
-%% ASCII pTeX Examples
-%%
-
-%% Ryumin and GothicBBB found in PostScript printers:
-rml  H !Ryumin-Light
-gbm  H !GothicBBB-Medium
-rmlv V !Ryumin-Light
-gbmv V !GothicBBB-Medium
-EOF
-%endif
-
 # set platex to Japanese pLaTeX. original one is moved to platex-pl
 sed -e s/^platex/platex-pl/g \
     -e s/^pdfplatex/pdfplatex-pl/g \
@@ -731,9 +691,6 @@ rm -rf %{buildroot}%{_texmf_main}/texconfig/{g,v,x,README,generic}
 # move the configuration files that should be under user control
 mkdir -p %{buildroot}%{_texmf_conf}/{web2c/,dvipdfm/}
 mv %{buildroot}%{_texmf_main}/web2c/mktexdir.opt %{buildroot}%{_texmf_conf}/web2c/
-%if %{f8_packaging}
-mv %{buildroot}%{_texmf_main}/dvipdfm/cid-x.map %{buildroot}%{_texmf_conf}/dvipdfm/
-%endif
 
 # separated projects
 rm %{buildroot}%{_bindir}/devnag
@@ -742,6 +699,11 @@ rm %{buildroot}%{_bindir}/afm2pl %{buildroot}%{_mandir}/man1/afm2pl.1*
 # remove unused ConTeXt stuff
 rm %{buildroot}%{_mandir}/man1/texfind.1* %{buildroot}%{_mandir}/man1/fdf2tex.1*
 
+# remove (x)dvipdfmx related stuff
+rm -f %{buildroot}%{_bindir}/dvipdfmx
+rm -f %{buildroot}%{_bindir}/xdvipdfmx
+rm -rf %{buildroot}%{_texmf_main}/dvipdfm
+
 %clean
 rm -rf %{buildroot}
 
@@ -1166,20 +1128,6 @@ fi
 %{_mandir}/man1/dvipdfm.1*
 %{_mandir}/man1/dvipdft.1*
 
-%if %{f8_packaging}
-%files -n dvipdfmx
-%defattr(-,root,root,-)
-%doc texk/dvipdfmx/AUTHORS texk/dvipdfmx/ChangeLog
-%doc texk/dvipdfmx/COPYING texk/dvipdfmx/README
-%dir %{_texmf_conf}/dvipdfm/
-%if %{f8_packaging}
-%config(noreplace) %{_texmf_conf}/dvipdfm/cid-x.map
-%{_bindir}/dvipdfmx
-%{_bindir}/xdvipdfmx
-%endif
-%{_texmf_main}/dvipdfm/
-%endif
-
 %files east-asian
 %doc %{_texmf_main}/doc/pdvipsk/
 %doc %{_texmf_main}/doc/ptex/
@@ -1249,6 +1197,10 @@ fi
 %{_mandir}/man1/texutil.1*
 
 %changelog
+* Fri Mar 14 2008 Jindrich Novy <jnovy@redhat.com> - 2007-27
+- remove dvipdfmx completely, also for F8 (related #437448)
+- kpathsea requires texlive again (#437458)
+
 * Thu Mar 13 2008 Jindrich Novy <jnovy@redhat.com> - 2007-26
 - rebuild against the new poppler 0.7.2 (poppler's soname was bumped)