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

- Update to font-util-1.0.1 from X11R7.1

Browse Source 
- Set package version to X11 release the tarballs are based from.
This commit is contained in:
mharris 2006-06-22 03:16:41 +00:00
parent 84696911d9
commit 259ff2095b
4 changed files with 53 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
font-util-1.0.1-autoconf-add-with-fontdir-option.patch Normal file
View File

@ -0,0 +1,26 @@
--- font-util-1.0.1/configure.ac.autoconf-add-with-fontdir-option 2005-12-16 00:16:32.000000000 -0500
+++ font-util-1.0.1/configure.ac 2005-12-16 00:13:07.000000000 -0500
@@ -40,6 +40,13 @@
[MAPDIR="$DEFAULT_MAPDIR"])
AC_SUBST(MAPDIR)
+DEFAULT_FONTDIR=${datadir}/X11/fonts
+AC_ARG_WITH(fontdir,
+ AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install Xorg fonts by default]),
+ [FONTDIR="$withval"],
+ [FONTDIR="$DEFAULT_FONTDIR"])
+AC_SUBST(FONTDIR)
+
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
--- font-util-1.0.1/fontutil.pc.in.autoconf-add-with-fontdir-option 2005-12-16 00:17:06.000000000 -0500
+++ font-util-1.0.1/fontutil.pc.in 2005-12-16 00:10:40.000000000 -0500
@@ -2,6 +2,7 @@
exec_prefix=@exec_prefix@
libdir=@libdir@
mapdir=@MAPDIR@
+fontdir=@FONTDIR@
Name: FontUtil
Description: Font utilities dirs

11
font-util-1.0.1-mapdir-use-datadir-fix.patch Normal file
View File

@ -0,0 +1,11 @@
--- font-util-1.0.0/configure.ac.font-util-mapdir-use-datadir-fix 2005-12-14 19:24:26.000000000 -0500
+++ font-util-1.0.1/configure.ac 2005-12-16 00:07:23.000000000 -0500
@@ -33,7 +33,7 @@
m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
-DEFAULT_MAPDIR=${libdir}/X11/fonts/util
+DEFAULT_MAPDIR=${datadir}/X11/fonts/util
AC_ARG_WITH(mapdir,
AS_HELP_STRING([--with-mapdir=MAPDIR], [Path to install font maps]),
[MAPDIR="$withval"],

2
sources
View File

@ -1,5 +1,5 @@
f489db67914ca4d9d2fa0331132f342b bdftopcf-1.0.0.tar.bz2
0a537f95ee9d46f9e5b58c1a2c733dd4 font-util-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

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

@ -13,20 +13,23 @@ 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.2
Release: 2
# NOTE: Keep version set to the X11Rx.y release the package is based upon.
Version: 7.1
# Bump release for updates.
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/src/everything/bdftopcf-1.0.0.tar.bz2
Source1: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/fonttosfnt-1.0.1.tar.bz2
Source0: http://xorg.freedesktop.org/releases/individual/app/bdftopcf-1.0.0.tar.bz2
Source1: http://xorg.freedesktop.org/releases/individual/app/fonttosfnt-1.0.1.tar.bz2
Source2: http://xorg.freedesktop.org/releases/individual/app/mkfontdir-1.0.2.tar.bz2
Source3: http://xorg.freedesktop.org/releases/X11R7.0/src/everything/mkfontscale-1.0.1.tar.bz2
Source4: http://xorg.freedesktop.org/releases/X11R7.0/src/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
Source3: http://xorg.freedesktop.org/releases/individual/app/mkfontscale-1.0.1.tar.bz2
Source4: http://xorg.freedesktop.org/releases/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
BuildRequires: pkgconfig
# xorg-x11-libXfont-devel needed for bdftopcf
@ -151,6 +154,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/ucs2any.1x*
%changelog
* Wed Jun 21 2006 Mike A. Harris <mharris@redhat.com> 1:7.1-1
- Update to font-util-1.0.1 from X11R7.1
- Set package version to X11 release the tarballs are based from.
* Thu Apr 26 2006 Adam Jackson <ajackson@redhat.com> 1:1.0.2-2
- Update mkfontdir