rpms/poppler/devel poppler.spec,1.20,1.21

[fedora-cvs-commits at redhat.com]

Author: rstrode

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

Modified Files:
	poppler.spec 
Log Message:
- change xpdf conflict version to be <= instead of <



Index: poppler.spec
===================================================================
RCS file: /cvs/dist/rpms/poppler/devel/poppler.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- poppler.spec	18 Jan 2006 17:22:39 -0000	1.20
+++ poppler.spec	18 Jan 2006 18:17:17 -0000	1.21
@@ -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 @@
 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 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jan 18 2006 Ray Strode <rstrode at redhat.com> - 0.5.0-4
+- change xpdf conflict version to be <= instead of <
+
 * Wed Jan 18 2006 Ray Strode <rstrode at redhat.com> - 0.5.0-3
 - update conflicts: xpdf line to be versioned