rpms/pdftohtml/FC-5 pdftohtml.spec,1.10,1.11

[Aurelien Bompard (abompard)]

Author: abompard

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

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


Index: pdftohtml.spec
===================================================================
RCS file: /cvs/extras/rpms/pdftohtml/FC-5/pdftohtml.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pdftohtml.spec	22 Feb 2006 08:34:00 -0000	1.10
+++ pdftohtml.spec	2 Oct 2006 08:15:21 -0000	1.11
@@ -1,14 +1,17 @@
-Name:		pdftohtml
-Version:	0.36
-Release:	7%{?dist}
-
-Summary:	PDF to HTML converter
-License:	GPL
-Group:		Applications/Text
-Url:		http://pdftohtml.sourceforge.net/
-Source0:	http://dl.sf.net/pdftohtml/pdftohtml-0.36.tar.gz
+Name:       pdftohtml
+Version:    0.36
+Release:    9%{?dist}
+
+Summary:    PDF to HTML converter
+License:    GPL
+Group:      Applications/Text
+Url:        http://pdftohtml.sourceforge.net/
+Source0:    http://dl.sf.net/pdftohtml/pdftohtml-0.36.tar.gz
 Patch0:     pdftohtml-0.36-gcc41.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Conflicts:  poppler-utils
+
 
 %description
 PDFTOHTML converts Portable Document Format (PDF) files to HTML
@@ -39,6 +42,12 @@
 %{_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
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 0.36-7
 - rebuild