rpms/texlive-texmf/devel texlive-texmf.spec,1.2,1.3

[Jindrich Novy (jnovy)]

Author: jnovy

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

Modified Files:
	texlive-texmf.spec 
Log Message:
- don't conflict with tetex-doc (#413141)
- remove tex4ht from texlive, it's packaged separately (#411501)



Index: texlive-texmf.spec
===================================================================
RCS file: /cvs/extras/rpms/texlive-texmf/devel/texlive-texmf.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- texlive-texmf.spec	2 Dec 2007 16:43:02 -0000	1.2
+++ texlive-texmf.spec	6 Dec 2007 12:36:46 -0000	1.3
@@ -11,7 +11,7 @@
 
 Name:		texlive-texmf
 Version:	2007
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Architecture independent parts of the TeX formatting system
 
 Group:		Applications/Publishing
@@ -85,6 +85,8 @@
 Group:		Applications/Publishing
 Summary:	TeX documentation
 Requires:	texlive-doc-errata = %{version}
+Obsoletes:	tetex-doc < 3.0-99
+Provides:	tetex-doc = 3.0-99
 
 %description -n texlive-doc
 This package contains the documentation for packages installed as part of
@@ -368,6 +370,10 @@
 # remove dvipdfm, it's packaged by the binary texlive packages
 rm -rf %{buildroot}%{_texmf_main}/dvipdfm/
 
+# remove tex4ht, it's packaged separately (#411501)
+rm -rf %{buildroot}%{_texmf_main}/tex/generic/tex4ht
+rm -rf %{buildroot}%{_texmf_main}/tex4ht
+
 # create macro file for building texlive
 mkdir -p %{buildroot}%{_sysconfdir}/rpm
 cat <<EOF > %{buildroot}%{_sysconfdir}/rpm/macros.texlive
@@ -474,7 +480,6 @@
 %{_texmf_main}/tex/plain/
 %{_texmf_main}/tex/texinfo/
 %{_texmf_main}/texdoctk/
-%{_texmf_main}/tex4ht/
 %{_texmf_main}/vtex/
 # will result in a couple files being owned by texmf and texmf-fonts
 #  texmf/tex/generic/babel/{frenchb.cfg,hyphen.cfg}
@@ -597,6 +602,10 @@
 %doc %{_texmf_main}/doc/
 
 %changelog
+* Thu Dec 06 2007 Jindrich Novy <jnovy at redhat.com> - 2007-2
+- don't conflict with tetex-doc (#413141)
+- remove tex4ht from texlive, it's packaged separately (#411501)
+
 * Sun Dec 02 2007 Jindrich Novy <jnovy at redhat.com> - 2007-1
 - drop Requires: texlive, since it's not yet built and
   texlive buildrequires texlive-texmf