From 4ec36d0f04ce58b9207cfbddfa41a468ab423373 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@fedoraproject.org>
Date: Wed, 18 Jan 2006 17:15:10 +0000
Subject: [PATCH] - update conflicts: xpdf line to be versioned

---
 poppler.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/poppler.spec b/poppler.spec
index a59e7bf..29c45e6 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -30,7 +30,7 @@ compile applications based on poppler.
 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 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jan 18 2006 Ray Strode <rstrode@redhat.com> - 0.5.0-3
+- update conflicts: xpdf line to be versioned
+
 * Wed Jan 11 2006 Kristian Høgsberg <krh@redhat.com> - 0.5.0-2.0
 - Update to 0.5.0 and add poppler-utils subpackage.
 - Flesh out poppler-utils subpackage.