rpms/xorg-x11-font-utils/devel xorg-x11-font-utils.spec,1.15,1.16

[fedora-cvs-commits redhat com]

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-font-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25098

Modified Files:
	xorg-x11-font-utils.spec 
Log Message:
Minor spec cleanups


Index: xorg-x11-font-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-font-utils/devel/xorg-x11-font-utils.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-font-utils.spec	23 Feb 2006 02:38:03 -0000	1.15
+++ xorg-x11-font-utils.spec	1 Mar 2006 06:24:03 -0000	1.16
@@ -54,16 +54,14 @@
 # set, avoiding a possible race condition.
 Requires(pre): libfontenc >= 0.99.2-2
 
-
 Provides: %{pkgname}
 Provides: bdftopcf, fonttosfnt, mkfontdir, mkfontscale, bdftruncate, ucs2any
 # NOTE: XFree86-font-utils package contains mkfontdir, mkfontscale, so this
 # is needed for upgrades to work properly from OS releases that had XFree86
 Obsoletes: XFree86-font-utils
-# NOTE: XFree86 package used to contain bdftopcf, so this is needed for
-# upgrades to work.  It also contained mkfontdir/mkfontscale at one point,
-# so we just Conflict without a version specification.
-Conflicts: XFree86
+# NOTE: XFree86 package used to contain bdftopcf, mkfontdir, mkfontscale so
+# this is needed for upgrades to work.
+Obsoletes: XFree86
 # NOTE: The fonts/util subdir moved from xorg-x11-base-fonts to
 # xorg-x11-font-utils in 6.7.99.903-3
 Obsoletes: xorg-x11-base-fonts <= 6.7.99.903-3