- 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.
This commit is contained in:
mharris
parent
7c339c090d
commit
becc2dc8bd
@ -1,11 +1,20 @@
|
||||
%define pkgname font-utils
|
||||
|
||||
# NOTE: When enabled, this provides symbolic links in /usr/X11R6/bin which
|
||||
# provide backward compatibility for utilities/scripts that hard code paths
|
||||
# to /usr/X11R6/bin/mkfontdir et al. This compatibility support will be
|
||||
# disabled and removed in a future OS release, so 3rd party application
|
||||
# developers and package maintainers should update their software as soon
|
||||
# as possible.
|
||||
%define with_X11R6_compat 1
|
||||
%define _x11r6bindir /usr/X11R6/bin
|
||||
|
||||
Summary: X.Org X11 font utilities
|
||||
Name: xorg-x11-%{pkgname}
|
||||
# IMPORTANT: If package ever gets renamed to something else, remove the Epoch line!
|
||||
Epoch: 1
|
||||
Version: 1.0.1
|
||||
Release: 1.2
|
||||
Release: 2
|
||||
License: MIT/X11
|
||||
Group: User Interface/X
|
||||
URL: http://www.x.org
|
||||
@ -57,9 +66,9 @@ Obsoletes: XFree86-font-utils, xorg-x11-font-utils
|
||||
Conflicts: XFree86
|
||||
# NOTE: The fonts/util subdir moved from xorg-x11-base-fonts to
|
||||
# xorg-x11-font-utils in 6.7.99.903-3
|
||||
Conflicts: xorg-x11-base-fonts <= 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
|
||||
Conflicts: xorg-x11-tools <= 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,
|
||||
@ -98,29 +107,44 @@ rm -rf $RPM_BUILD_ROOT
|
||||
done
|
||||
}
|
||||
|
||||
%if %{with_X11R6_compat}
|
||||
{
|
||||
mkdir -p $RPM_BUILD_ROOT%{_x11r6bindir}
|
||||
|
||||
for util in mkfontdir mkfontscale ; do
|
||||
ln -sf ../../..%{_bindir}/$util $RPM_BUILD_ROOT%{_x11r6bindir}/$util
|
||||
done
|
||||
}
|
||||
%endif
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
# FIXME: Include missing docs sometime
|
||||
%doc
|
||||
%dir %{_bindir}
|
||||
%{_bindir}/bdftopcf
|
||||
%{_bindir}/bdftruncate
|
||||
%{_bindir}/fonttosfnt
|
||||
%{_bindir}/mkfontdir
|
||||
%{_bindir}/mkfontscale
|
||||
%{_bindir}/ucs2any
|
||||
%dir %{_datadir}
|
||||
# NOTE: These compat symlinks will be removed in a future OS release.
|
||||
# Developers and package maintainers should update their software to handle
|
||||
# the X11R7 changes in a clean manner.
|
||||
%if %{with_X11R6_compat}
|
||||
%dir %{_x11r6bindir}
|
||||
%{_x11r6bindir}/mkfontdir
|
||||
%{_x11r6bindir}/mkfontscale
|
||||
%endif
|
||||
%dir %{_datadir}/X11
|
||||
%dir %{_datadir}/X11/fonts
|
||||
%dir %{_datadir}/X11/fonts/util
|
||||
%{_datadir}/X11/fonts/util/map-*
|
||||
%{_datadir}/aclocal/fontutil.m4
|
||||
%dir %{_libdir}/pkgconfig
|
||||
%{_libdir}/pkgconfig/fontutil.pc
|
||||
%dir %{_mandir}
|
||||
%dir %{_mandir}/man1
|
||||
#%dir %{_mandir}/man1x
|
||||
%{_mandir}/man1/bdftopcf.1x*
|
||||
%{_mandir}/man1/bdftruncate.1x*
|
||||
%{_mandir}/man1/fonttosfnt.1x*
|
||||
@ -129,10 +153,19 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%{_mandir}/man1/ucs2any.1x*
|
||||
|
||||
%changelog
|
||||
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1:1.0.1-1.2
|
||||
* 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
|
||||
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.
|
||||
|
||||
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> 1:1.0.1-1.2
|
||||
- bump again for double-long bug on ppc(64)
|
||||
|
||||
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1:1.0.1-1.1
|
||||
* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> 1:1.0.1-1.1
|
||||
- rebuilt for new gcc4.1 snapshot and glibc changes
|
||||
|
||||
* Wed Jan 18 2006 Mike A. Harris <mharris@redhat.com> 1:1.0.1-1
|
||||
@ -170,16 +203,16 @@ rm -rf $RPM_BUILD_ROOT
|
||||
* Mon Nov 14 2005 Jeremy Katz <katzj@redhat.com> 6.99.99.902-2
|
||||
- require newer filesystem (#172610)
|
||||
|
||||
* Wed Nov 9 2005 Mike A. Harris <mharris@redhat.com> 6.99.99.902-1
|
||||
* Wed Nov 09 2005 Mike A. Harris <mharris@redhat.com> 6.99.99.902-1
|
||||
- Updated bdftopcf, fonttosfnt, mkfontdir, mkfontscale to version 0.99.1 from
|
||||
X11R7 RC1.
|
||||
|
||||
* Wed Nov 9 2005 Mike A. Harris <mharris@redhat.com> 6.99.99.901-3
|
||||
* Wed Nov 09 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
|
||||
* Sun Nov 06 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.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user