From 07610a87c67ffaf6b69ff0ce0c81943ce59db578 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@redhat.com>
Date: Tue, 29 Jan 2013 05:48:47 +0100
Subject: [PATCH] Prefer url.sty from texlive (#904888)

---
 latex2html.spec | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/latex2html.spec b/latex2html.spec
index a429993..c79419b 100644
--- a/latex2html.spec
+++ b/latex2html.spec
@@ -3,7 +3,7 @@
 Summary: Converts LaTeX documents to HTML
 Name: latex2html
 Version: 2012
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Publishing
 URL: http://www.latex2html.org/
@@ -19,7 +19,7 @@ Patch3: latex2html-2K.1beta-DB.patch
 Patch4: latex2html-2002-2-1-SHLIB.patch
 Patch5: latex2html-2002-2-1-gsfont.patch
 Patch6: latex2html-2002.2.1-grayimg.patch
-Requires: tex(latex), tex(dvips), netpbm-progs
+Requires: tex(latex), tex(dvips), tex(url.sty), netpbm-progs
 BuildRequires: perl >= 5.003, ghostscript >= 4.03, netpbm-progs >= 9.21, tex(latex)
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -194,6 +194,9 @@ for f in cweb2html/cweb2html makeseg/makeseg makemap ; do
 %endif
 done
 
+# do not clash with texlive, prefer url.sty from texlive instead
+rm -f %{buildroot}%{_datadir}/texmf/tex/latex/html/url.sty
+
 %clean
 rm -rf %{buildroot}
 
@@ -227,6 +230,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/pstoimg.*
 
 %changelog
+* Tue Jan 29 2013 Jindrich Novy <jnovy@redhat.com> 2012-2
+- prefer url.sty from texlive (#904888)
+
 * Wed Nov 21 2012 Jindrich Novy <jnovy@redhat.com> 2012-1
 - update to latex2html 2012
 - update URL