|
mharris |
2d62a2f |
%define pkgname font-utils
|
|
mharris |
2d62a2f |
|
|
mharris |
becc2dc |
# NOTE: When enabled, this provides symbolic links in /usr/X11R6/bin which
|
|
mharris |
becc2dc |
# provide backward compatibility for utilities/scripts that hard code paths
|
|
mharris |
becc2dc |
# to /usr/X11R6/bin/mkfontdir et al. This compatibility support will be
|
|
mharris |
becc2dc |
# disabled and removed in a future OS release, so 3rd party application
|
|
mharris |
becc2dc |
# developers and package maintainers should update their software as soon
|
|
mharris |
becc2dc |
# as possible.
|
|
mharris |
becc2dc |
%define with_X11R6_compat 1
|
|
mharris |
becc2dc |
%define _x11r6bindir /usr/X11R6/bin
|
|
mharris |
becc2dc |
|
|
mharris |
2d62a2f |
Summary: X.Org X11 font utilities
|
|
mharris |
2d62a2f |
Name: xorg-x11-%{pkgname}
|
|
mharris |
f6c3228 |
# IMPORTANT: If package ever gets renamed to something else, remove the Epoch line!
|
|
mharris |
f6c3228 |
Epoch: 1
|
|
mharris |
259ff20 |
# NOTE: Keep version set to the X11Rx.y release the package is based upon.
|
|
mharris |
259ff20 |
Version: 7.1
|
|
mharris |
259ff20 |
# Bump release for updates.
|
|
|
e262e49 |
Release: 1.1
|
|
mharris |
2d62a2f |
License: MIT/X11
|
|
mharris |
2d62a2f |
Group: User Interface/X
|
|
mharris |
2d62a2f |
URL: http://www.x.org
|
|
mharris |
f6c3228 |
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
mharris |
f6c3228 |
|
|
mharris |
1ced00b |
Source0: ftp://ftp.x.org/pub/individual/app/bdftopcf-1.0.0.tar.bz2
|
|
mharris |
1ced00b |
Source1: ftp://ftp.x.org/pub/individual/app/fonttosfnt-1.0.1.tar.bz2
|
|
mharris |
1ced00b |
Source2: ftp://ftp.x.org/pub/individual/app/mkfontdir-1.0.2.tar.bz2
|
|
mharris |
1ced00b |
Source3: ftp://ftp.x.org/pub/individual/app/mkfontscale-1.0.1.tar.bz2
|
|
mharris |
1ced00b |
Source4: ftp://ftp.x.org/pub/individual/app/font-util-1.0.1.tar.bz2
|
|
mharris |
259ff20 |
|
|
mharris |
259ff20 |
Patch0: font-util-1.0.1-mapdir-use-datadir-fix.patch
|
|
mharris |
259ff20 |
Patch1: font-util-1.0.1-autoconf-add-with-fontdir-option.patch
|
|
mharris |
2d62a2f |
|
|
mharris |
af23055 |
BuildRequires: pkgconfig
|
|
mharris |
2d62a2f |
# xorg-x11-libXfont-devel needed for bdftopcf
|
|
mharris |
2d62a2f |
BuildRequires: libXfont-devel
|
|
mharris |
2d62a2f |
# xorg-x11-libX11-devel needed for fonttosfnt
|
|
mharris |
2d62a2f |
BuildRequires: libX11-devel
|
|
mharris |
2d62a2f |
# xorg-x11-libfontenc-devel needed for fonttosfnt, mkfontscale
|
|
mharris |
f6c3228 |
BuildRequires: libfontenc-devel >= 0.99.2-2
|
|
mharris |
2d62a2f |
# freetype-devel needed for bdftopcf, fonttosfnt, mkfontscale
|
|
mharris |
2d62a2f |
BuildRequires: freetype-devel
|
|
mharris |
2d62a2f |
# zlib-devel needed for bdftopcf
|
|
mharris |
2d62a2f |
BuildRequires: zlib-devel
|
|
mharris |
2d62a2f |
# xorg-x11-proto-devel is needed for mkfontscale, which includes headers
|
|
mharris |
2d62a2f |
# from it directly.
|
|
mharris |
2d62a2f |
BuildRequires: xorg-x11-proto-devel
|
|
mharris |
2d62a2f |
|
|
mharris |
9a4a533 |
BuildRequires: autoconf
|
|
mharris |
9a4a533 |
|
|
mharris |
9a4a533 |
Requires(pre): xorg-x11-filesystem >= 0.99.2-3
|
|
|
1b50e86 |
|
|
mharris |
f6c3228 |
# NOTE: This versioned pre-dependency is needed to ensure that the bugfix for
|
|
mharris |
f6c3228 |
# bug #173875 is installed in order for mkfontscale/mkfontdir to work
|
|
mharris |
f6c3228 |
# properly. It is a "pre" dep, to ensure libfontenc gets installed before
|
|
mharris |
f6c3228 |
# xorg-font-utils, before any fonts in an rpm upgrade or multi-transaction
|
|
mharris |
f6c3228 |
# set, avoiding a possible race condition.
|
|
mharris |
f6c3228 |
Requires(pre): libfontenc >= 0.99.2-2
|
|
mharris |
f6c3228 |
|
|
mharris |
2d62a2f |
Provides: %{pkgname}
|
|
mharris |
7c1da31 |
Provides: bdftopcf, fonttosfnt, mkfontdir, mkfontscale, bdftruncate, ucs2any
|
|
mharris |
2d62a2f |
# NOTE: XFree86-font-utils package contains mkfontdir, mkfontscale, so this
|
|
mharris |
2d62a2f |
# is needed for upgrades to work properly from OS releases that had XFree86
|
|
mharris |
e63ac5a |
Obsoletes: XFree86-font-utils
|
|
mharris |
0c88138 |
# NOTE: XFree86 package used to contain bdftopcf, mkfontdir, mkfontscale so
|
|
mharris |
0c88138 |
# this is needed for upgrades to work.
|
|
mharris |
0c88138 |
Obsoletes: XFree86
|
|
mharris |
2d62a2f |
# NOTE: The fonts/util subdir moved from xorg-x11-base-fonts to
|
|
mharris |
2d62a2f |
# xorg-x11-font-utils in 6.7.99.903-3
|
|
mharris |
becc2dc |
Obsoletes: xorg-x11-base-fonts <= 6.7.99.903-3
|
|
mharris |
2d62a2f |
# NOTE: ucs2any moved from xorg-x11-tools to xorg-x11-font-utils in 6.7.99.903-3
|
|
mharris |
becc2dc |
Obsoletes: xorg-x11-tools <= 6.7.99.903-3
|
|
mharris |
2d62a2f |
|
|
mharris |
2d62a2f |
%description
|
|
mharris |
2d62a2f |
X.Org X11 font utilities required for font installation, conversion,
|
|
mharris |
2d62a2f |
and generation.
|
|
mharris |
2d62a2f |
|
|
mharris |
2d62a2f |
%prep
|
|
mharris |
7c1da31 |
%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
|
|
mharris |
f6c3228 |
%patch0 -p0 -b .font-util-mapdir-use-datadir-fix
|
|
mharris |
9a4a533 |
%patch1 -p0 -b .autoconf-add-with-fontdir-option
|
|
mharris |
2d62a2f |
|
|
mharris |
2d62a2f |
%build
|
|
mharris |
d6cf899 |
# Build all apps
|
|
mharris |
2d62a2f |
{
|
|
mharris |
d6cf899 |
for app in bdftopcf fonttosfnt mkfontdir mkfontscale font-util ; do
|
|
mharris |
d6cf899 |
pushd $app-*
|
|
mharris |
f6c3228 |
# FIXME: We run autoconf to activate font-util-0.99.1-mapdir-use-datadir-fix.patch
|
|
mharris |
f6c3228 |
case $app in
|
|
mharris |
f6c3228 |
font-util)
|
|
mharris |
f6c3228 |
autoconf
|
|
mharris |
f6c3228 |
;;
|
|
mharris |
f6c3228 |
esac
|
|
mharris |
d6cf899 |
%configure
|
|
mharris |
d6cf899 |
make
|
|
mharris |
d6cf899 |
popd
|
|
mharris |
d6cf899 |
done
|
|
mharris |
2d62a2f |
}
|
|
mharris |
7c1da31 |
|
|
mharris |
2d62a2f |
%install
|
|
mharris |
2d62a2f |
rm -rf $RPM_BUILD_ROOT
|
|
mharris |
d6cf899 |
# Install all apps
|
|
mharris |
d6cf899 |
{
|
|
mharris |
f6c3228 |
for app in bdftopcf fonttosfnt mkfontdir mkfontscale font-util; do
|
|
mharris |
d6cf899 |
pushd $app-*
|
|
mharris |
f6c3228 |
make install DESTDIR=$RPM_BUILD_ROOT
|
|
mharris |
d6cf899 |
popd
|
|
mharris |
d6cf899 |
done
|
|
mharris |
d6cf899 |
}
|
|
mharris |
d6cf899 |
|
|
mharris |
becc2dc |
%if %{with_X11R6_compat}
|
|
mharris |
becc2dc |
{
|
|
mharris |
becc2dc |
mkdir -p $RPM_BUILD_ROOT%{_x11r6bindir}
|
|
mharris |
becc2dc |
|
|
mharris |
becc2dc |
for util in mkfontdir mkfontscale ; do
|
|
mharris |
becc2dc |
ln -sf ../../..%{_bindir}/$util $RPM_BUILD_ROOT%{_x11r6bindir}/$util
|
|
mharris |
becc2dc |
done
|
|
mharris |
becc2dc |
}
|
|
mharris |
becc2dc |
%endif
|
|
mharris |
becc2dc |
|
|
mharris |
2d62a2f |
%clean
|
|
mharris |
2d62a2f |
rm -rf $RPM_BUILD_ROOT
|
|
mharris |
2d62a2f |
|
|
mharris |
2d62a2f |
%files
|
|
mharris |
2d62a2f |
%defattr(-,root,root,-)
|
|
mharris |
becc2dc |
# FIXME: Include missing docs sometime
|
|
mharris |
2d62a2f |
%doc
|
|
mharris |
2d62a2f |
%{_bindir}/bdftopcf
|
|
mharris |
7c1da31 |
%{_bindir}/bdftruncate
|
|
mharris |
2d62a2f |
%{_bindir}/fonttosfnt
|
|
mharris |
2d62a2f |
%{_bindir}/mkfontdir
|
|
mharris |
2d62a2f |
%{_bindir}/mkfontscale
|
|
mharris |
7c1da31 |
%{_bindir}/ucs2any
|
|
mharris |
becc2dc |
# NOTE: These compat symlinks will be removed in a future OS release.
|
|
mharris |
becc2dc |
# Developers and package maintainers should update their software to handle
|
|
mharris |
becc2dc |
# the X11R7 changes in a clean manner.
|
|
mharris |
becc2dc |
%if %{with_X11R6_compat}
|
|
mharris |
becc2dc |
%dir %{_x11r6bindir}
|
|
mharris |
becc2dc |
%{_x11r6bindir}/mkfontdir
|
|
mharris |
becc2dc |
%{_x11r6bindir}/mkfontscale
|
|
mharris |
becc2dc |
%endif
|
|
mharris |
f6c3228 |
%dir %{_datadir}/X11
|
|
mharris |
f6c3228 |
%dir %{_datadir}/X11/fonts
|
|
mharris |
f6c3228 |
%dir %{_datadir}/X11/fonts/util
|
|
mharris |
f6c3228 |
%{_datadir}/X11/fonts/util/map-*
|
|
mharris |
9a4a533 |
%{_datadir}/aclocal/fontutil.m4
|
|
mharris |
7c1da31 |
%{_libdir}/pkgconfig/fontutil.pc
|
|
mharris |
becc2dc |
#%dir %{_mandir}/man1x
|
|
mharris |
9a4a533 |
%{_mandir}/man1/bdftopcf.1x*
|
|
mharris |
9a4a533 |
%{_mandir}/man1/bdftruncate.1x*
|
|
mharris |
9a4a533 |
%{_mandir}/man1/fonttosfnt.1x*
|
|
mharris |
9a4a533 |
%{_mandir}/man1/mkfontdir.1x*
|
|
mharris |
9a4a533 |
%{_mandir}/man1/mkfontscale.1x*
|
|
mharris |
9a4a533 |
%{_mandir}/man1/ucs2any.1x*
|
|
mharris |
7c1da31 |
|
|
mharris |
2d62a2f |
%changelog
|
|
|
e262e49 |
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - sh: line 0: fg: no job control
|
|
|
e262e49 |
- rebuild
|
|
|
e262e49 |
|
|
mharris |
259ff20 |
* Wed Jun 21 2006 Mike A. Harris <mharris@redhat.com> 1:7.1-1
|
|
mharris |
259ff20 |
- Update to font-util-1.0.1 from X11R7.1
|
|
mharris |
259ff20 |
- Set package version to X11 release the tarballs are based from.
|
|
mharris |
259ff20 |
|
|
|
38ff362 |
* Thu Apr 26 2006 Adam Jackson <ajackson@redhat.com> 1:1.0.2-2
|
|
|
38ff362 |
- Update mkfontdir
|
|
|
38ff362 |
|
|
mharris |
e63ac5a |
* Wed Feb 22 2006 Mike A. Harris <mharris@redhat.com> 1:1.0.1-3
|
|
mharris |
c35373e |
- Remove "Obsoletes: xorg-x11-font-utils" as the package should not obsolete
|
|
mharris |
e63ac5a |
itself. Leftover from the original package template it seems. (#182439)
|
|
mharris |
e63ac5a |
|
|
mharris |
becc2dc |
* Fri Feb 17 2006 Mike A. Harris <mharris@redhat.com> 1:1.0.1-2
|
|
mharris |
becc2dc |
- Added with_X11R6_compat macro to conditionalize inclusion of mkfontdir and
|
|
mharris |
becc2dc |
mkfontscale symlinks in the old X11R6 locations, pointing to the X11R7
|
|
mharris |
becc2dc |
binaries. This will provide backward compatibilty for Fedora Core 5, however
|
|
mharris |
becc2dc |
3rd party developers and rpm package maintainers should update to using the
|
|
mharris |
becc2dc |
new X11R7 locations immediately, as these compatibility links are temporary,
|
|
mharris |
becc2dc |
and will be removed from a future OS release.
|
|
mharris |
becc2dc |
- Remove system directories from file manifest to appease the banshees.
|
|
mharris |
becc2dc |
|
|
mharris |
becc2dc |
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> 1:1.0.1-1.2
|
|
|
7c339c0 |
- bump again for double-long bug on ppc(64)
|
|
|
7c339c0 |
|
|
mharris |
becc2dc |
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> 1:1.0.1-1.1
|
|
|
2c12865 |
- rebuilt for new gcc4.1 snapshot and glibc changes
|
|
|
2c12865 |
|
|
mharris |
2307b9d |
* Wed Jan 18 2006 Mike A. Harris <mharris@redhat.com> 1:1.0.1-1
|
|
mharris |
2307b9d |
- Updated all utilities to the versions shipped in X11R7.0.
|
|
mharris |
2307b9d |
|
|
mharris |
9a4a533 |
* Thu Dec 15 2005 Mike A. Harris <mharris@redhat.com> 1:1.0.0-1
|
|
mharris |
9a4a533 |
- Updated all utilities to version 1.0.0 from X11R7 RC4.
|
|
mharris |
9a4a533 |
- Updated font-util-1.0.0-mapdir-use-datadir-fix.patch to work with RC4.
|
|
mharris |
9a4a533 |
- Added font-util-1.0.0-autoconf-add-with-fontdir-option.patch to add a new
|
|
mharris |
9a4a533 |
variable "fontdir" to the fontutil.pc file which all of the font packages
|
|
mharris |
9a4a533 |
can autodetect and use instead of having to put manual fontdir overrides
|
|
mharris |
9a4a533 |
in every single rpm package.
|
|
mharris |
9a4a533 |
|
|
mharris |
9a4a533 |
* Tue Dec 13 2005 Mike A. Harris <mharris@redhat.com> 1:0.99.2-1
|
|
mharris |
9a4a533 |
- Updated bdftopcf, fonttosfnt to version 0.99.3, and mkfontdir, mkfontscale,
|
|
mharris |
9a4a533 |
and font-util to version 0.99.2 from X11R7 RC3.
|
|
mharris |
9a4a533 |
- Changed manpage dir from man1x back to man1 due to another upstream change.
|
|
mharris |
9a4a533 |
- Added fontutil.m4 to file manifest.
|
|
mharris |
9a4a533 |
|
|
mharris |
f6c3228 |
* Tue Nov 22 2005 Mike A. Harris <mharris@redhat.com> 1:0.99.1-1
|
|
mharris |
f6c3228 |
- Changed package version to 0.99.1 to match the upstream font-util tarball
|
|
mharris |
f6c3228 |
version, and added "Epoch: 1" to the package for upgrades.
|
|
mharris |
f6c3228 |
- Added font-util-0.99.1-mapdir-use-datadir-fix.patch to fix the font-util
|
|
mharris |
f6c3228 |
mapfiles data to install into datadir instead of libdir (#173943)
|
|
mharris |
f6c3228 |
- Added "Requires(pre): libfontenc >= 0.99.2-2" to force a version of
|
|
mharris |
f6c3228 |
libfontenc to be installed that fixes bug #173453, and to also force it
|
|
mharris |
f6c3228 |
to be installed before xorg-x11-font-utils in a multi-package rpm
|
|
mharris |
f6c3228 |
transaction, which will ensure that when font packages get installed
|
|
mharris |
f6c3228 |
during upgrades via anaconda or yum, that the right libfontenc is being
|
|
mharris |
f6c3228 |
used by mkfontscale/mkfontdir.
|
|
mharris |
f6c3228 |
- Added ">= 0.99.2-2" to BuildRequires for libfontenc, as a convenience to
|
|
mharris |
f6c3228 |
people rebuilding xorg-x11-font-utils, as they'll need to install the new
|
|
mharris |
f6c3228 |
libfontenc now anyway before they can install the font-utils package.
|
|
mharris |
f6c3228 |
|
|
|
1b50e86 |
* Mon Nov 14 2005 Jeremy Katz <katzj@redhat.com> 6.99.99.902-2
|
|
|
1b50e86 |
- require newer filesystem (#172610)
|
|
|
1b50e86 |
|
|
mharris |
becc2dc |
* Wed Nov 09 2005 Mike A. Harris <mharris@redhat.com> 6.99.99.902-1
|
|
mharris |
d6cf899 |
- Updated bdftopcf, fonttosfnt, mkfontdir, mkfontscale to version 0.99.1 from
|
|
mharris |
d6cf899 |
X11R7 RC1.
|
|
mharris |
d6cf899 |
|
|
mharris |
becc2dc |
* Wed Nov 09 2005 Mike A. Harris <mharris@redhat.com> 6.99.99.901-3
|
|
mharris |
af23055 |
- Glob util/map-* files in file manifest.
|
|
mharris |
af23055 |
- Added missing "Obsoletes: xorg-x11-font-utils".
|
|
mharris |
af23055 |
- Added "BuildRequires: pkgconfig".
|
|
mharris |
af23055 |
|
|
mharris |
becc2dc |
* Sun Nov 06 2005 Mike A. Harris <mharris@redhat.com> 6.99.99.901-2
|
|
mharris |
7c1da31 |
- Added font-util-0.99.1 to package, from X11R7 RC1 release, which provides
|
|
mharris |
7c1da31 |
ucs2any, bdftruncate.
|
|
mharris |
7c1da31 |
|
|
mharris |
02eb718 |
* Wed Oct 26 2005 Mike A. Harris <mharris@redhat.com> 6.99.99.901-1
|
|
mharris |
02eb718 |
- Updated bdftopcf, fonttosfnt, mkfontdir, mkfontscale to version 0.99.1 from
|
|
mharris |
02eb718 |
X11R7 RC1.
|
|
mharris |
02eb718 |
- Bumped package version to 6.99.99.901, the X11R7 RC1 release version tag.
|
|
mharris |
02eb718 |
- Updated file manifest to to find the manpages in "man1x".
|
|
mharris |
02eb718 |
|
|
mharris |
2d62a2f |
* Wed Aug 24 2005 Mike A. Harris <mharris@redhat.com> 6.99.99.0-1
|
|
mharris |
2d62a2f |
- Initial build.
|