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

auto-import xorg-x11-font-utils-7.1-4.fc7 on branch devel from

Browse Source 
xorg-x11-font-utils-7.1-4.fc7.src.rpm
This commit is contained in:
Adam Jackson 2007-01-05 23:42:08 +00:00
parent 5438961d21
commit 37c593cd13
3 changed files with 20 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.cvsignore
View File

@ -1,3 +1,5 @@
*.tar.bz2
*.tar.gz
clog
bdftopcf-1.0.0.tar.bz2
font-util-1.0.1.tar.bz2
mkfontdir-1.0.2.tar.bz2
mkfontscale-1.0.1.tar.bz2
fonttosfnt-1.0.3.tar.bz2

2
sources
View File

@ -1,5 +1,5 @@
f489db67914ca4d9d2fa0331132f342b bdftopcf-1.0.0.tar.bz2
b81535f78fe05732931f02841e5ca37b font-util-1.0.1.tar.bz2
efe452ec264ee0fddbe9300873164dec fonttosfnt-1.0.1.tar.bz2
94da9dcd2447300e8fdada896d7ed433 mkfontdir-1.0.2.tar.bz2
1e74e68eb9e8e91c6b7b615d80dc5ee1 mkfontscale-1.0.1.tar.bz2
b0ebd86029571239b9d7b0c61191b591 fonttosfnt-1.0.3.tar.bz2

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

@ -1,36 +1,25 @@
%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
# NOTE: Keep version set to the X11Rx.y release the package is based upon.
Version: 7.1
# Bump release for updates.
Release: 2
Release: 4%{?dist}
License: MIT/X11
Group: User Interface/X
URL: http://www.x.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: ftp://ftp.x.org/pub/individual/app/bdftopcf-1.0.0.tar.bz2
Source1: ftp://ftp.x.org/pub/individual/app/fonttosfnt-1.0.1.tar.bz2
Source1: ftp://ftp.x.org/pub/individual/app/fonttosfnt-1.0.3.tar.bz2
Source2: ftp://ftp.x.org/pub/individual/app/mkfontdir-1.0.2.tar.bz2
Source3: ftp://ftp.x.org/pub/individual/app/mkfontscale-1.0.1.tar.bz2
Source4: ftp://ftp.x.org/pub/individual/app/font-util-1.0.1.tar.bz2
Patch0: font-util-1.0.1-mapdir-use-datadir-fix.patch
Patch1: font-util-1.0.1-autoconf-add-with-fontdir-option.patch
Patch2: fonttosfnt-1.0.1-freetype22-build-fix.patch
BuildRequires: pkgconfig
# xorg-x11-libXfont-devel needed for bdftopcf
@ -80,7 +69,6 @@ and generation.
%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
%patch0 -p0 -b .font-util-mapdir-use-datadir-fix
%patch1 -p0 -b .autoconf-add-with-fontdir-option
%patch2 -p1 -b .freetype22
%build
# Build all apps
@ -110,16 +98,6 @@ 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
@ -133,14 +111,6 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/mkfontdir
%{_bindir}/mkfontscale
%{_bindir}/ucs2any
# 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
@ -148,14 +118,20 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/aclocal/fontutil.m4
%{_libdir}/pkgconfig/fontutil.pc
#%dir %{_mandir}/man1x
%{_mandir}/man1/bdftopcf.1x*
%{_mandir}/man1/bdftruncate.1x*
%{_mandir}/man1/fonttosfnt.1x*
%{_mandir}/man1/mkfontdir.1x*
%{_mandir}/man1/mkfontscale.1x*
%{_mandir}/man1/ucs2any.1x*
%{_mandir}/man1/bdftopcf.1*
%{_mandir}/man1/bdftruncate.1*
%{_mandir}/man1/fonttosfnt.1*
%{_mandir}/man1/mkfontdir.1*
%{_mandir}/man1/mkfontscale.1*
%{_mandir}/man1/ucs2any.1*
%changelog
* Fri Jan 05 2007 Adam Jackson <ajax@redhat.com> 1:7.1-4.fc7
- fonttosfnt 1.0.3
* Thu Aug 17 2006 Adam Jackson <ajackson@redhat.com> 1:7.1-3
- Remove X11R6 symlinks.
* Fri Jul 14 2006 Adam Jackson <ajackson@redhat.com> 1:7.1-2
- Added fonttosfnt-1.0.1-freetype22-build-fix.patch to fix a build failure
with new freetype 2.2.