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

auto-import xorg-x11-font-utils-6.99.99.901-2 on branch devel from

Browse Source 
xorg-x11-font-utils-6.99.99.901-2.src.rpm
This commit is contained in:
mharris 2005-11-06 14:23:11 +00:00
parent 02eb718fcb
commit 7c1da3119a
3 changed files with 63 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -2,3 +2,4 @@ bdftopcf-0.99.1.tar.bz2
fonttosfnt-0.99.1.tar.bz2 fonttosfnt-0.99.1.tar.bz2
mkfontdir-0.99.1.tar.bz2 mkfontdir-0.99.1.tar.bz2
mkfontscale-0.99.1.tar.bz2 mkfontscale-0.99.1.tar.bz2
font-util-0.99.1.tar.bz2

1
sources
View File

@ -2,3 +2,4 @@ d5bdf1b76bcdfd8ac0a7a35a43a9a55d bdftopcf-0.99.1.tar.bz2
4b2227ff198324bba114e2b54b0f33e3 fonttosfnt-0.99.1.tar.bz2 4b2227ff198324bba114e2b54b0f33e3 fonttosfnt-0.99.1.tar.bz2
3de12742390bf016fa1c26e8115eb63e mkfontdir-0.99.1.tar.bz2 3de12742390bf016fa1c26e8115eb63e mkfontdir-0.99.1.tar.bz2
841fdb77891c0a47f2d50d13e4bc1bfc mkfontscale-0.99.1.tar.bz2 841fdb77891c0a47f2d50d13e4bc1bfc mkfontscale-0.99.1.tar.bz2
006214458f6f419b12bcd7590c5e4b66 font-util-0.99.1.tar.bz2

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

@ -14,14 +14,15 @@
Summary: X.Org X11 font utilities Summary: X.Org X11 font utilities
Name: xorg-x11-%{pkgname} Name: xorg-x11-%{pkgname}
Version: 6.99.99.901 Version: 6.99.99.901
Release: 1 Release: 2
License: MIT/X11 License: MIT/X11
Group: User Interface/X Group: User Interface/X
URL: http://www.x.org URL: http://www.x.org
Source0: http://xorg.freedesktop.org/X11R7.0-RC0/everything/bdftopcf-%{upstreamversion}.tar.bz2 Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/bdftopcf-%{upstreamversion}.tar.bz2
Source1: http://xorg.freedesktop.org/X11R7.0-RC0/everything/fonttosfnt-%{upstreamversion}.tar.bz2 Source1: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/fonttosfnt-%{upstreamversion}.tar.bz2
Source2: http://xorg.freedesktop.org/X11R7.0-RC0/everything/mkfontdir-%{upstreamversion}.tar.bz2 Source2: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/mkfontdir-%{upstreamversion}.tar.bz2
Source3: http://xorg.freedesktop.org/X11R7.0-RC0/everything/mkfontscale-%{upstreamversion}.tar.bz2 Source3: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/mkfontscale-%{upstreamversion}.tar.bz2
Source4: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/font-util-%{upstreamversion}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# xorg-x11-libXfont-devel needed for bdftopcf # xorg-x11-libXfont-devel needed for bdftopcf
@ -39,7 +40,7 @@ BuildRequires: zlib-devel
BuildRequires: xorg-x11-proto-devel BuildRequires: xorg-x11-proto-devel
Provides: %{pkgname} Provides: %{pkgname}
Provides: bdftopcf, fonttosfnt, mkfontdir, mkfontscale Provides: bdftopcf, fonttosfnt, mkfontdir, mkfontscale, bdftruncate, ucs2any
# NOTE: XFree86-font-utils package contains mkfontdir, mkfontscale, so this # NOTE: XFree86-font-utils package contains mkfontdir, mkfontscale, so this
# is needed for upgrades to work properly from OS releases that had XFree86 # is needed for upgrades to work properly from OS releases that had XFree86
Obsoletes: XFree86-font-utils Obsoletes: XFree86-font-utils
@ -50,17 +51,15 @@ Conflicts: XFree86
# NOTE: The fonts/util subdir moved from xorg-x11-base-fonts to # NOTE: The fonts/util subdir moved from xorg-x11-base-fonts to
# xorg-x11-font-utils in 6.7.99.903-3 # xorg-x11-font-utils in 6.7.99.903-3
Conflicts: xorg-x11-base-fonts <= 6.7.99.903-3 Conflicts: xorg-x11-base-fonts <= 6.7.99.903-3
# FIXME: modular X seems to be abscent of ucs2any so far, so I'll update this
# when I find it later... -- mharris
# NOTE: ucs2any moved from xorg-x11-tools to xorg-x11-font-utils in 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 Conflicts: xorg-x11-tools <= 6.7.99.903-3
%description %description
X.Org X11 font utilities required for font installation, conversion, X.Org X11 font utilities required for font installation, conversion,
and generation. and generation.
%prep %prep
%setup -q -c %{name}-%{version} -a1 -a2 -a3 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
%build %build
# Build bdftopcf # Build bdftopcf
@ -92,32 +91,47 @@ and generation.
popd popd
} }
# Build font-util
{
pushd font-util-%{upstreamversion}
%configure
make
popd
}
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
# Build bdftopcf # Install bdftopcf
{ {
pushd bdftopcf-%{upstreamversion} pushd bdftopcf-%{upstreamversion}
%makeinstall %makeinstall
popd popd
} }
# Build fonttosfnt # Install fonttosfnt
{ {
pushd fonttosfnt-%{upstreamversion} pushd fonttosfnt-%{upstreamversion}
%makeinstall %makeinstall
popd popd
} }
# Build mkfontdir # Install mkfontdir
{ {
pushd mkfontdir-%{upstreamversion} pushd mkfontdir-%{upstreamversion}
%makeinstall %makeinstall
popd popd
} }
# Build mkfontscale # Install mkfontscale
{ {
pushd mkfontscale-%{upstreamversion} pushd mkfontscale-%{upstreamversion}
%makeinstall %makeinstall
popd popd
} }
# Install font-util
{
pushd font-util-%{upstreamversion}
# %%makeinstall
make install DESTDIR=$RPM_BUILD_ROOT
popd
}
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -127,15 +141,43 @@ rm -rf $RPM_BUILD_ROOT
%doc %doc
%dir %{_bindir} %dir %{_bindir}
%{_bindir}/bdftopcf %{_bindir}/bdftopcf
%{_bindir}/bdftruncate
%{_bindir}/fonttosfnt %{_bindir}/fonttosfnt
%{_bindir}/mkfontdir %{_bindir}/mkfontdir
%{_bindir}/mkfontscale %{_bindir}/mkfontscale
%{_bindir}/ucs2any
%dir %{_libdir}
%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
%dir %{_libdir}/pkgconfig
%{_libdir}/pkgconfig/fontutil.pc
%dir %{_mandir} %dir %{_mandir}
%dir %{_mandir}/man1x %dir %{_mandir}/man1x
%{_mandir}/man1x/bdftopcf.1x* %{_mandir}/man1x/bdftopcf.1x*
%{_mandir}/man1x/bdftruncate.1x*
%{_mandir}/man1x/fonttosfnt.1x*
%{_mandir}/man1x/mkfontdir.1x* %{_mandir}/man1x/mkfontdir.1x*
%{_mandir}/man1x/mkfontscale.1x* %{_mandir}/man1x/mkfontscale.1x*
%{_mandir}/man1x/fonttosfnt.1x* %{_mandir}/man1x/ucs2any.1x*
#%{_x11bindir}/bdftruncate #%{_x11bindir}/bdftruncate
#%{_x11mandir}/man1x/bdftruncate.1x* #%{_x11mandir}/man1x/bdftruncate.1x*
@ -148,6 +190,10 @@ rm -rf $RPM_BUILD_ROOT
#%{_x11mandir}/man1/ucs2any.1* #%{_x11mandir}/man1/ucs2any.1*
%changelog %changelog
* 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.
* Wed Oct 26 2005 Mike A. Harris <mharris@redhat.com> 6.99.99.901-1 * Wed Oct 26 2005 Mike A. Harris <mharris@redhat.com> 6.99.99.901-1
- Updated bdftopcf, fonttosfnt, mkfontdir, mkfontscale to version 0.99.1 from - Updated bdftopcf, fonttosfnt, mkfontdir, mkfontscale to version 0.99.1 from
X11R7 RC1. X11R7 RC1.