- Added with_X11R6_compat macro to conditionalize inclusion of mkfontdir

and mkfontscale symlinks in the old X11R6 locations, pointing to the
    X11R7 binaries. This will provide backward compatibilty for Fedora Core
    5, however
3rd party developers and rpm package maintainers should update to using the
    new X11R7 locations immediately, as these compatibility links are
    temporary, and will be removed from a future OS release.
- Remove system directories from file manifest to appease the banshees.

xorg-x11-font-utils.spec

@@ -14,7 +14,7 @@ Name: xorg-x11-%{pkgname}
 # IMPORTANT: If package ever gets renamed to something else, remove the Epoch line!
 Epoch: 1
 Version: 1.0.1
-Release: 2
+Release: 3
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -59,7 +59,7 @@ 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, xorg-x11-font-utils
+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.
@@ -153,6 +153,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/ucs2any.1x*
 
 %changelog
+* Wed Feb 22 2006 Mike A. Harris <mharris@redhat.com> 1:1.0.1-3
+- Remove "Obsoletes: xorg-x11-font-util" as the package should not obsolete
+  itself.  Leftover from the original package template it seems.  (#182439)
+
 * Fri Feb 17 2006 Mike A. Harris <mharris@redhat.com> 1:1.0.1-2
 - Added with_X11R6_compat macro to conditionalize inclusion of mkfontdir and
   mkfontscale symlinks in the old X11R6 locations, pointing to the X11R7