rpms/xorg-x11-font-utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Glob util/map-* files in file manifest.

Browse Source 
- Added missing "Obsoletes: xorg-x11-font-utils".
- Added "BuildRequires: pkgconfig".
This commit is contained in:
mharris 2005-11-10 00:21:05 +00:00
parent 7c1da3119a
commit af23055914
1 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
xorg-x11-font-utils.spec
View File

@ -25,6 +25,7 @@ Source3: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/mkfontscale
Source4: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/font-util-%{upstreamversion}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pkgconfig
# xorg-x11-libXfont-devel needed for bdftopcf
BuildRequires: libXfont-devel
# xorg-x11-libX11-devel needed for fonttosfnt
@ -43,7 +44,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
Obsoletes: XFree86-font-utils, xorg-x11-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.
@ -150,23 +151,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_libdir}/X11
%dir %{_libdir}/X11/fonts
%dir %{_libdir}/X11/fonts/util
%{_libdir}/X11/fonts/util/map-ISO8859-1
%{_libdir}/X11/fonts/util/map-ISO8859-10
%{_libdir}/X11/fonts/util/map-ISO8859-11
%{_libdir}/X11/fonts/util/map-ISO8859-13
%{_libdir}/X11/fonts/util/map-ISO8859-14
%{_libdir}/X11/fonts/util/map-ISO8859-15
%{_libdir}/X11/fonts/util/map-ISO8859-16
%{_libdir}/X11/fonts/util/map-ISO8859-2
%{_libdir}/X11/fonts/util/map-ISO8859-3
%{_libdir}/X11/fonts/util/map-ISO8859-4
%{_libdir}/X11/fonts/util/map-ISO8859-5
%{_libdir}/X11/fonts/util/map-ISO8859-6
%{_libdir}/X11/fonts/util/map-ISO8859-7
%{_libdir}/X11/fonts/util/map-ISO8859-8
%{_libdir}/X11/fonts/util/map-ISO8859-9
%{_libdir}/X11/fonts/util/map-JISX0201.1976-0
%{_libdir}/X11/fonts/util/map-KOI8-R
%{_libdir}/X11/fonts/util/map-*
%dir %{_libdir}/pkgconfig
%{_libdir}/pkgconfig/fontutil.pc
%dir %{_mandir}
@ -178,18 +163,12 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1x/mkfontscale.1x*
%{_mandir}/man1x/ucs2any.1x*
#%{_x11bindir}/bdftruncate
#%{_x11mandir}/man1x/bdftruncate.1x*
## The 'util' subdir is used by ucs2any, mkfontdir et al.
#%dir %{_x11fontdir}/util
#%{_x11fontdir}/util/*
## FIXME: ucs2any should be moved to %{name}-font-utils
#%{_x11bindir}/ucs2any
## FIXME: ucs2any should be moved to font-utils subpackage
#%{_x11mandir}/man1/ucs2any.1*
%changelog
* Wed Nov 9 2005 Mike A. Harris <mharris@redhat.com> 6.99.99.901-3
- Glob util/map-* files in file manifest.
- Added missing "Obsoletes: xorg-x11-font-utils".
- Added "BuildRequires: pkgconfig".
* Sun Nov 6 2005 Mike A. Harris <mharris@redhat.com> 6.99.99.901-2
- Added font-util-0.99.1 to package, from X11R7 RC1 release, which provides
ucs2any, bdftruncate.