auto-import xorg-x11-font-utils-6.99.99.902-1 on branch devel from

xorg-x11-font-utils-6.99.99.902-1.src.rpm
This commit is contained in:
mharris 2005-11-11 22:49:34 +00:00
parent ff53e42d85
commit d6cf899ea6
3 changed files with 40 additions and 21 deletions

View File

@ -1,5 +1,5 @@
bdftopcf-0.99.1.tar.bz2
fonttosfnt-0.99.1.tar.bz2
font-util-0.99.1.tar.bz2
mkfontdir-0.99.1.tar.bz2
mkfontscale-0.99.1.tar.bz2
font-util-0.99.1.tar.bz2
bdftopcf-0.99.2.tar.bz2
fonttosfnt-0.99.2.tar.bz2

View File

@ -1,5 +1,5 @@
d5bdf1b76bcdfd8ac0a7a35a43a9a55d bdftopcf-0.99.1.tar.bz2
4b2227ff198324bba114e2b54b0f33e3 fonttosfnt-0.99.1.tar.bz2
006214458f6f419b12bcd7590c5e4b66 font-util-0.99.1.tar.bz2
3de12742390bf016fa1c26e8115eb63e mkfontdir-0.99.1.tar.bz2
841fdb77891c0a47f2d50d13e4bc1bfc mkfontscale-0.99.1.tar.bz2
006214458f6f419b12bcd7590c5e4b66 font-util-0.99.1.tar.bz2
9012ac38b8db3181d8ddc33776bd7186 bdftopcf-0.99.2.tar.bz2
cf91952043a11ab1684c6ce607eb143d fonttosfnt-0.99.2.tar.bz2

View File

@ -13,16 +13,16 @@
Summary: X.Org X11 font utilities
Name: xorg-x11-%{pkgname}
Version: 6.99.99.901
Release: 3
Version: 6.99.99.902
Release: 1
License: MIT/X11
Group: User Interface/X
URL: http://www.x.org
Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/bdftopcf-%{upstreamversion}.tar.bz2
Source1: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/fonttosfnt-%{upstreamversion}.tar.bz2
Source2: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/mkfontdir-%{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
Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/bdftopcf-0.99.2.tar.bz2
Source1: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/fonttosfnt-0.99.2.tar.bz2
Source2: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/mkfontdir-0.99.1.tar.bz2
Source3: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/mkfontscale-0.99.1.tar.bz2
Source4: http://xorg.freedesktop.org/releases/X11R7.0-RC1/everything/font-util-0.99.1.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pkgconfig
@ -63,30 +63,33 @@ and generation.
%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
%build
# Build bdftopcf
# Build all apps
{
pushd bdftopcf-%{upstreamversion}
%configure
make
popd
for app in bdftopcf fonttosfnt mkfontdir mkfontscale font-util ; do
pushd $app-*
%configure
make
popd
done
}
%if 0
# Build fonttosfnt
{
pushd fonttosfnt-%{upstreamversion}
pushd fonttosfnt-*
%configure
make
popd
}
# Build mkfontdir
{
pushd mkfontdir-%{upstreamversion}
pushd mkfontdir-*
%configure
make
popd
}
# Build mkfontscale
{
pushd mkfontscale-%{upstreamversion}
pushd mkfontscale-
%configure
make
popd
@ -99,9 +102,20 @@ and generation.
make
popd
}
%endif
%install
rm -rf $RPM_BUILD_ROOT
# Install all apps
{
for app in bdftopcf fonttosfnt mkfontdir mkfontscale ; do
pushd $app-*
%makeinstall
popd
done
}
%if 0
# Install bdftopcf
{
pushd bdftopcf-%{upstreamversion}
@ -126,6 +140,7 @@ rm -rf $RPM_BUILD_ROOT
%makeinstall
popd
}
%endif
# Install font-util
{
pushd font-util-%{upstreamversion}
@ -164,6 +179,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1x/ucs2any.1x*
%changelog
* Wed Nov 9 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
- Glob util/map-* files in file manifest.
- Added missing "Obsoletes: xorg-x11-font-utils".