rpms/xorg-x11-font-utils/devel xorg-x11-font-utils.spec,1.31,1.32
Adam Jackson
ajax at fedoraproject.org
Thu Jul 23 13:58:46 UTC 2009
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-font-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32019
Modified Files:
xorg-x11-font-utils.spec
Log Message:
* Thu Jul 23 2009 Adam Jackson <ajax at redhat.com> 7.2-8
- Un-require xorg-x11-filesystem
- Other general spec cleanup.
Index: xorg-x11-font-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-font-utils/devel/xorg-x11-font-utils.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- xorg-x11-font-utils.spec 26 Feb 2009 11:28:57 -0000 1.31
+++ xorg-x11-font-utils.spec 23 Jul 2009 13:58:15 -0000 1.32
@@ -5,7 +5,7 @@ Name: xorg-x11-%{pkgname}
# IMPORTANT: If package ever gets renamed to something else, remove the Epoch line!
Epoch: 1
Version: 7.2
-Release: 7%{?dist}
+Release: 8%{?dist}
License: MIT
Group: User Interface/X
URL: http://www.x.org
@@ -21,44 +21,16 @@ Patch0: font-util-1.0.1-mapdir-use-datad
Patch1: font-util-1.0.1-autoconf-add-with-fontdir-option.patch
BuildRequires: pkgconfig
-# xorg-x11-libXfont-devel needed for bdftopcf
BuildRequires: libXfont-devel
-# xorg-x11-libX11-devel needed for fonttosfnt
BuildRequires: libX11-devel
-# xorg-x11-libfontenc-devel needed for fonttosfnt, mkfontscale
BuildRequires: libfontenc-devel >= 0.99.2-2
-# freetype-devel needed for bdftopcf, fonttosfnt, mkfontscale
BuildRequires: freetype-devel
-# zlib-devel needed for bdftopcf
BuildRequires: zlib-devel
-# xorg-x11-proto-devel is needed for mkfontscale, which includes headers
-# from it directly.
-BuildRequires: xorg-x11-proto-devel
BuildRequires: autoconf
-Requires(pre): xorg-x11-filesystem >= 0.99.2-3
-
-# NOTE: This versioned pre-dependency is needed to ensure that the bugfix for
-# bug #173875 is installed in order for mkfontscale/mkfontdir to work
-# properly. It is a "pre" dep, to ensure libfontenc gets installed before
-# xorg-font-utils, before any fonts in an rpm upgrade or multi-transaction
-# set, avoiding a possible race condition.
-Requires(pre): libfontenc >= 0.99.2-2
-
Provides: %{pkgname}
Provides: bdftopcf, fonttosfnt, mkfontdir, mkfontscale, 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, 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
-# NOTE: ucs2any moved from xorg-x11-tools to xorg-x11-font-utils in 6.7.99.903-3
-Obsoletes: xorg-x11-tools <= 6.7.99.903-3
%description
X.Org X11 font utilities required for font installation, conversion,
@@ -126,8 +98,6 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/mkfontdir
%{_bindir}/mkfontscale
%{_bindir}/ucs2any
-# blech. this one should be in -filesystem
-%dir %{_datadir}/X11
%dir %{_datadir}/X11/fonts
%dir %{_datadir}/X11/fonts/util
%{_datadir}/X11/fonts/util/map-*
@@ -146,6 +116,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jul 23 2009 Adam Jackson <ajax at redhat.com> 7.2-8
+- Un-require xorg-x11-filesystem
+- Other general spec cleanup.
+
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:7.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
More information about the Fedora-fonts-bugs-list
mailing list