rpms/texlive-texmf/devel texlive-texmf.spec,1.35,1.36
Tom Callaway
spot at fedoraproject.org
Tue Oct 27 22:50:47 UTC 2009
Author: spot
Update of /cvs/pkgs/rpms/texlive-texmf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16662/devel
Modified Files:
texlive-texmf.spec
Log Message:
fix 488091, 502202
Index: texlive-texmf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/texlive-texmf/devel/texlive-texmf.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- texlive-texmf.spec 21 Oct 2009 12:43:26 -0000 1.35
+++ texlive-texmf.spec 27 Oct 2009 22:50:47 -0000 1.36
@@ -14,7 +14,7 @@
Name: texlive-texmf
Version: 2007
-Release: 31%{?dist}
+Release: 32%{?dist}
Summary: Architecture independent parts of the TeX formatting system
Group: Applications/Publishing
@@ -134,6 +134,13 @@ Summary: Texmf files needed for texlive-
Requires: texlive-texmf = %{version}-%{release}
Requires: texlive-texmf-errata-latex = %{version}
Requires: tex-preview
+Obsoletes: tetex-bytefield < 1.2a-7
+Provides: tetex-bytefield = 1.2a-7
+Obsoletes: tetex-prosper < 1.5-7
+Provides: tetex-prosper = 1.5-7
+# The copy in this package is rather old (1.6)
+# We'll use the newer one in tetex-perltex, at least for now.
+Requires: tetex-perltex
%description latex
This package contains the components of the TEXMF tree needed for the
@@ -341,6 +348,10 @@ rm -f texmf/web2c/{mktex.opt,mktexdir,mk
# these files owned by binary texlive-dvips package
rm -rf texmf/dvips/base
+# these files owned by tetex-perltex package
+rm -rf texmf-dist/tex/latex/perltex/
+rm -rf texmf-dist/doc/latex/perltex/
+
# remove ttf2pk stuff from bin-ttfutils
rm -f texmf/doc/man/man1/ttf2pk.1
rm -rf texmf/doc/ttf2pk/
@@ -831,6 +842,11 @@ fi
%doc %{_texmf_main}/doc/
%changelog
+* Mon Oct 26 2009 Tom "spot" Callaway <tcallawa at redhat.com> 2007-32
+- resolve conflict between texlive-texmf (and -doc) and tetex-perltex
+- resolve conflict between texlive-texmf and tetex-prosper
+- resolve conflict between texlive-texmf and tetex-perltex
+
* Tue Oct 20 2009 Jindrich Novy <jnovy at redhat.com> 2007-31
- do not conflict with dvipdfm
- update perl requires filter
More information about the fedora-extras-commits
mailing list