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

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

Browse Source 
xorg-x11-font-utils-1.0.0-1.src.rpm
This commit is contained in:
mharris 2005-12-16 15:42:35 +00:00
parent f6c32289ea
commit 9a4a5339ba
3 changed files with 44 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.cvsignore
View File

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

10
sources
View File

@ -1,5 +1,5 @@
006214458f6f419b12bcd7590c5e4b66 font-util-0.99.1.tar.bz2
3de12742390bf016fa1c26e8115eb63e mkfontdir-0.99.1.tar.bz2
841fdb77891c0a47f2d50d13e4bc1bfc mkfontscale-0.99.1.tar.bz2
9012ac38b8db3181d8ddc33776bd7186 bdftopcf-0.99.2.tar.bz2
cf91952043a11ab1684c6ce607eb143d fonttosfnt-0.99.2.tar.bz2
f489db67914ca4d9d2fa0331132f342b bdftopcf-1.0.0.tar.bz2
51bd70c613eade783e16383c02c68c91 font-util-1.0.0.tar.bz2
2e6d3ce38dde31e4c74d68560c13b68c fonttosfnt-1.0.0.tar.bz2
18953929a9a0b713fe3bca9de4e95dd5 mkfontdir-1.0.0.tar.bz2
f3476ef5896252173ed1f7a1003e3661 mkfontscale-1.0.0.tar.bz2

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

@ -1,33 +1,23 @@
%define pkgname font-utils
# FIXME: Upstream tarball is 0.99.0, which would require
# us to add an "Epoch: 1" to this package in order for rpm to upgrade from
# the FC4 (and earlier) monolithic xorg-x11-xfs-6.8.x rpm package. Since
# it is currently unknown what the final upstream tarball version is likely
# to be called, I am avoiding adding Epoch, and instead using a 6.99.99.x
# version number for the time being. This allows us to make sure xfs will
# upgrade from older releases to the new release, allows us to avoid adding
# an Epoch tag possibly unnecessarily - as Epoch is permanent and very evil.
# If upstream later names it "xfs-7.0", then we bump the version to that,
# and everything just works.
%define upstreamversion 0.99.1
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: 0.99.1
Version: 1.0.0
Release: 1
License: MIT/X11
Group: User Interface/X
URL: http://www.x.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
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
Patch0: font-util-0.99.1-mapdir-use-datadir-fix.patch
Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/bdftopcf-1.0.0.tar.bz2
Source1: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/fonttosfnt-1.0.0.tar.bz2
Source2: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/mkfontdir-1.0.0.tar.bz2
Source3: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/mkfontscale-1.0.0.tar.bz2
Source4: http://xorg.freedesktop.org/releases/X11R7.0-RC4/everything/font-util-1.0.0.tar.bz2
Patch0: font-util-1.0.0-mapdir-use-datadir-fix.patch
Patch1: font-util-1.0.0-autoconf-add-with-fontdir-option.patch
BuildRequires: pkgconfig
# xorg-x11-libXfont-devel needed for bdftopcf
@ -44,8 +34,9 @@ BuildRequires: zlib-devel
# from it directly.
BuildRequires: xorg-x11-proto-devel
# FIXME: check if still needed for X11R7
Requires(pre): filesystem >= 2.3.6-1
BuildRequires: autoconf
Requires(pre): xorg-x11-filesystem >= 0.99.2-3
# NOTE: This versioned pre-dependency is needed to ensure that the bugfix for
# bug #173875 is installed in order for mkfontscale/mkfontdir to work
@ -77,6 +68,7 @@ and generation.
%prep
%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
%build
# Build all apps
@ -106,16 +98,6 @@ rm -rf $RPM_BUILD_ROOT
done
}
%if 0
# Install font-util
{
pushd font-util-%{upstreamversion}
# %%makeinstall
make install DESTDIR=$RPM_BUILD_ROOT
popd
}
%endif
%clean
rm -rf $RPM_BUILD_ROOT
@ -134,18 +116,33 @@ rm -rf $RPM_BUILD_ROOT
%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}/man1x
%{_mandir}/man1x/bdftopcf.1x*
%{_mandir}/man1x/bdftruncate.1x*
%{_mandir}/man1x/fonttosfnt.1x*
%{_mandir}/man1x/mkfontdir.1x*
%{_mandir}/man1x/mkfontscale.1x*
%{_mandir}/man1x/ucs2any.1x*
%dir %{_mandir}/man1
%{_mandir}/man1/bdftopcf.1x*
%{_mandir}/man1/bdftruncate.1x*
%{_mandir}/man1/fonttosfnt.1x*
%{_mandir}/man1/mkfontdir.1x*
%{_mandir}/man1/mkfontscale.1x*
%{_mandir}/man1/ucs2any.1x*
%changelog
* Thu Dec 15 2005 Mike A. Harris <mharris@redhat.com> 1:1.0.0-1
- Updated all utilities to version 1.0.0 from X11R7 RC4.
- Updated font-util-1.0.0-mapdir-use-datadir-fix.patch to work with RC4.
- Added font-util-1.0.0-autoconf-add-with-fontdir-option.patch to add a new
variable "fontdir" to the fontutil.pc file which all of the font packages
can autodetect and use instead of having to put manual fontdir overrides
in every single rpm package.
* Tue Dec 13 2005 Mike A. Harris <mharris@redhat.com> 1:0.99.2-1
- Updated bdftopcf, fonttosfnt to version 0.99.3, and mkfontdir, mkfontscale,
and font-util to version 0.99.2 from X11R7 RC3.
- Changed manpage dir from man1x back to man1 due to another upstream change.
- Added fontutil.m4 to file manifest.
* Tue Nov 22 2005 Mike A. Harris <mharris@redhat.com> 1:0.99.1-1
- Changed package version to 0.99.1 to match the upstream font-util tarball
version, and added "Epoch: 1" to the package for upgrades.