rpms/poppler/devel poppler.spec,1.18,1.19

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/poppler/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5821

Modified Files:
	poppler.spec 
Log Message:
- update conflicts: xpdf line to be versioned



Index: poppler.spec
===================================================================
RCS file: /cvs/dist/rpms/poppler/devel/poppler.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- poppler.spec	11 Jan 2006 20:23:18 -0000	1.18
+++ poppler.spec	18 Jan 2006 17:15:10 -0000	1.19
@@ -30,7 +30,7 @@
 Summary: Command line utilities for converting PDF files.
 Group: Applications/Text
 Requires: %name = %{version}
-Conflicts: xpdf
+Conflicts: xpdf < 1:3.01-8
 
 %description utils
 Poppler, a PDF rendering library, it's a fork of the xpdf PDF
@@ -72,6 +72,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jan 18 2006 Ray Strode <rstrode at redhat.com> - 0.5.0-3
+- update conflicts: xpdf line to be versioned
+
 * Wed Jan 11 2006 Kristian Høgsberg <krh at redhat.com> - 0.5.0-2.0
 - Update to 0.5.0 and add poppler-utils subpackage.
 - Flesh out poppler-utils subpackage.