rpms/foomatic/FC-4 foomatic.spec,1.93,1.94

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/foomatic/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv7071

Modified Files:
	foomatic.spec 
Log Message:
* Sun Jan  8 2006 Tim Waugh <twaugh at redhat.com> 3.0.2-19.1
- Fix hpijs conflict (bug #177230).



Index: foomatic.spec
===================================================================
RCS file: /cvs/dist/rpms/foomatic/FC-4/foomatic.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- foomatic.spec	7 Jun 2005 14:18:41 -0000	1.93
+++ foomatic.spec	8 Jan 2006 10:36:39 -0000	1.94
@@ -8,7 +8,7 @@
 Summary: Foomatic printer database.
 Name:		foomatic
 Version:	3.0.2
-Release: 19
+Release: 19.1
 License:	GPL
 Group: System Environment/Libraries
 
@@ -94,7 +94,7 @@
 
 # We need ghostscript to have the gimp-print-4.2.0 driver, and hpijs 1.1.
 Conflicts: ghostscript < 7.05
-Conflicts: hpijs < 1.5
+Conflicts: hpijs < 0:1.5
 
 %description
 Foomatic is a comprehensive, spooler-independent database of printers,
@@ -289,6 +289,9 @@
 %{_mandir}/*/*
 
 %changelog
+* Sun Jan  8 2006 Tim Waugh <twaugh at redhat.com> 3.0.2-19.1
+- Fix hpijs conflict (bug #177230).
+
 * Tue Jun  7 2005 Tim Waugh <twaugh at redhat.com>
 - Add IEEE 1284 ID for Epson Stylus Photo 870 (bug #159719).