rpms/cups/FC-5 cups.spec,1.153,1.154

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sat Apr 8 18:57:29 UTC 2006


Author: twaugh

Update of /cvs/dist/rpms/cups/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv11660

Modified Files:
	cups.spec 
Log Message:
* Sat Apr  8 2006 Tim Waugh <twaugh at redhat.com>
- Conflict with system-config-printer that adds 'fitplot' option.



Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/FC-5/cups.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- cups.spec	7 Apr 2006 22:27:49 -0000	1.153
+++ cups.spec	8 Apr 2006 18:57:27 -0000	1.154
@@ -71,6 +71,7 @@
 # Other packages may be expecting different backend path.
 Conflicts: foomatic < 3.0.2-33.3
 Conflicts: hplip < 0.9.9-5.1
+Conflicts: system-config-printer < 0.6.151.3
 
 %package devel
 Summary: Common Unix Printing System - development environment
@@ -375,6 +376,9 @@
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Sat Apr  8 2006 Tim Waugh <twaugh at redhat.com>
+- Conflict with system-config-printer that adds 'fitplot' option.
+
 * Fri Apr  7 2006 Tim Waugh <twaugh at redhat.com>
 - Build requires libacl-devel.
 




More information about the fedora-cvs-commits mailing list