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

[Jindrich Novy (jnovy)]

Author: jnovy

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

Modified Files:
	texlive-texmf.spec 
Log Message:
* 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)



Index: texlive-texmf.spec
===================================================================
RCS file: /cvs/extras/rpms/texlive-texmf/devel/texlive-texmf.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- texlive-texmf.spec	19 Feb 2008 15:48:44 -0000	1.13
+++ texlive-texmf.spec	25 Feb 2008 06:47:14 -0000	1.14
@@ -12,7 +12,7 @@
 
 Name:		texlive-texmf
 Version:	2007
-Release:	12%{?dist}
+Release:	13%{?dist}
 Summary:	Architecture independent parts of the TeX formatting system
 
 Group:		Applications/Publishing
@@ -68,6 +68,8 @@
 BuildArch:      noarch
 
 Obsoletes:	tetex-eurofont
+Obsoletes:	tetex-lineno = 4.41
+Provides:	tetex-lineno = 4.42
 
 %description
 texlive-texmf is a texmf distribution based upon TeX Live. All of the files
@@ -387,11 +389,16 @@
 touch %{buildroot}%{_texmf_vendor}/ls-R
 touch %{buildroot}%{_texmf_conf}/ls-R
 
-install -d -m755 %{buildroot}%{_texmf_var}/xdvi
-touch %{buildroot}%{_texmf_var}/xdvi/XDvi
+%if !%{f8_packaging}
+# remove xdvi files, now packaged separately
+rm -rf %{buildroot}%{_texmf_var}/xdvi
+%endif
 
-# remove dvipdfm, it's packaged by the binary texlive packages
-rm -rf %{buildroot}%{_texmf_main}/dvipdfm/
+# remove dvipdfmx files
+rm %{buildroot}%{_texmf_main}/dvipdfm/{dvipdfmx.cfg,EUC-UCS2,README,UniKSCms-UCS2-H,UniKSCms-UCS2-V}
+
+# remove win32 dvipdfm file
+rm %{buildroot}%{_texmf_main}/dvipdfm/config/config-win32
 
 # remove tex4ht, it's packaged separately (#411501)
 rm -rf %{buildroot}%{_texmf_main}/tex/generic/tex4ht
@@ -480,6 +487,9 @@
 %config(noreplace) %{_sysconfdir}/rpm/macros.texlive
 %doc texlive.%{version}.zip.list
 %{_texmf_main}/bibtex/
+%dir %{_texmf_main}/dvipdfm/
+%dir %{_texmf_main}/dvipdfm/config/
+%{_texmf_main}/dvipdfm/config/config
 %dir %{_texmf_main}/fmtutil/
 %{_texmf_main}/makeindex/
 %{_texmf_main}/metafont/
@@ -523,10 +533,12 @@
 %config(noreplace) %{_texmf_conf}/web2c/*.cnf
 %{_texmf_main}/web2c/*.pool
 # var
+%if %{f8_packaging}
+%dir %{_texmf_var}/xdvi
 %config(noreplace) %{_texmf_var}/xdvi/XDvi
+%endif
 %config(noreplace) %{_texmf_var}/web2c/mktex.cnf
 %{_texmf_var}/tex/
-%dir %{_texmf_var}/xdvi
 %dir %{_texmf_var}/fonts
 %dir %{_texmf_var}/fonts/map
 %dir %{_texmf_var}/fonts/map/dvipdfm
@@ -645,6 +657,10 @@
 %doc %{_texmf_main}/doc/
 
 %changelog
+* 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)
+
 * Sun Feb 17 2008 Jindrich Novy <jnovy at redhat.com> - 2007-12
 - package bigfoot, erroneously missing from the original
   TeX Live 2007 (#426507)