From 4ea8192a3a79e6830c68d591ec72bbb05aa15660 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@fedoraproject.org>
Date: Wed, 18 Jan 2006 18:17:17 +0000
Subject: [PATCH] - change xpdf conflict version to be <= instead of <

---
 poppler.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/poppler.spec b/poppler.spec
index 65388e6..8323c74 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -1,7 +1,7 @@
 Summary: Pdf rendering library
 Name: poppler
 Version: 0.5.0
-Release: 3
+Release: 4
 License: GPL
 Group: Development/Libraries
 Source0: %{name}-%{version}.tar.gz
@@ -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 < 1:3.01-8
+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-4
+- change xpdf conflict version to be <= instead of <
+
 * Wed Jan 18 2006 Ray Strode <rstrode@redhat.com> - 0.5.0-3
 - update conflicts: xpdf line to be versioned