rpms/pdftohtml/devel pdftohtml.spec,1.11,1.12

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/pdftohtml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25006/devel

Modified Files:
	pdftohtml.spec 
Log Message:
conflict with poppler-utils (bug 208790)


Index: pdftohtml.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftohtml/devel/pdftohtml.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pdftohtml.spec	30 Aug 2006 15:57:54 -0000	1.11
+++ pdftohtml.spec	2 Oct 2006 08:15:22 -0000	1.12
@@ -1,6 +1,6 @@
 Name:       pdftohtml
 Version:    0.36
-Release:    8%{?dist}
+Release:    9%{?dist}
 
 Summary:    PDF to HTML converter
 License:    GPL
@@ -10,6 +10,9 @@
 Patch0:     pdftohtml-0.36-gcc41.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Conflicts:  poppler-utils
+
+
 %description
 PDFTOHTML converts Portable Document Format (PDF) files to HTML
 format. This release converts text and links. Bold and italic face are
@@ -39,6 +42,9 @@
 %{_bindir}/%{name}
 
 %changelog
+* Mon Oct 02 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.36-9
+- conflicts with poppler-utils, which also provides /usr/bin/pdftohtml
+
 * Wed Aug 30 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.36-8
 - rebuild