auto-import xorg-x11-fonts-1.0.0-1 on branch devel from
xorg-x11-fonts-1.0.0-1.src.rpm
This commit is contained in:
mharris
parent
2f7a8bcaee
commit
2ca031028d
70
.cvsignore
70
.cvsignore
@ -1,35 +1,35 @@
|
||||
encodings-0.99.1.tar.bz2
|
||||
font-adobe-100dpi-0.99.1.tar.bz2
|
||||
font-adobe-75dpi-0.99.1.tar.bz2
|
||||
font-adobe-utopia-100dpi-0.99.1.tar.bz2
|
||||
font-adobe-utopia-75dpi-0.99.1.tar.bz2
|
||||
font-adobe-utopia-type1-0.99.0.tar.bz2
|
||||
font-alias-0.99.0.tar.bz2
|
||||
font-arabic-misc-0.99.0.tar.bz2
|
||||
font-bh-100dpi-0.99.1.tar.bz2
|
||||
font-bh-75dpi-0.99.1.tar.bz2
|
||||
font-bh-lucidatypewriter-100dpi-0.99.1.tar.bz2
|
||||
font-bh-lucidatypewriter-75dpi-0.99.1.tar.bz2
|
||||
font-bh-ttf-0.99.0.tar.bz2
|
||||
font-bh-type1-0.99.0.tar.bz2
|
||||
font-bitstream-100dpi-0.99.0.tar.bz2
|
||||
font-bitstream-75dpi-0.99.0.tar.bz2
|
||||
font-bitstream-type1-0.99.0.tar.bz2
|
||||
font-cronyx-cyrillic-0.99.0.tar.bz2
|
||||
font-cursor-misc-0.99.0.tar.bz2
|
||||
font-daewoo-misc-0.99.0.tar.bz2
|
||||
font-dec-misc-0.99.0.tar.bz2
|
||||
font-ibm-type1-0.99.0.tar.bz2
|
||||
font-isas-misc-0.99.0.tar.bz2
|
||||
font-jis-misc-0.99.0.tar.bz2
|
||||
font-micro-misc-0.99.0.tar.bz2
|
||||
font-misc-cyrillic-0.99.0.tar.bz2
|
||||
font-misc-meltho-0.99.1.tar.bz2
|
||||
font-misc-misc-0.99.1.tar.bz2
|
||||
font-mutt-misc-0.99.0.tar.bz2
|
||||
font-schumacher-misc-0.99.1.tar.bz2
|
||||
font-screen-cyrillic-0.99.0.tar.bz2
|
||||
font-sony-misc-0.99.0.tar.bz2
|
||||
font-sun-misc-0.99.0.tar.bz2
|
||||
font-winitzki-cyrillic-0.99.0.tar.bz2
|
||||
font-xfree86-type1-0.99.0.tar.bz2
|
||||
encodings-1.0.0.tar.bz2
|
||||
font-adobe-100dpi-1.0.0.tar.bz2
|
||||
font-adobe-75dpi-1.0.0.tar.bz2
|
||||
font-adobe-utopia-100dpi-1.0.0.tar.bz2
|
||||
font-adobe-utopia-75dpi-1.0.0.tar.bz2
|
||||
font-adobe-utopia-type1-1.0.0.tar.bz2
|
||||
font-alias-1.0.0.tar.bz2
|
||||
font-arabic-misc-1.0.0.tar.bz2
|
||||
font-bh-100dpi-1.0.0.tar.bz2
|
||||
font-bh-75dpi-1.0.0.tar.bz2
|
||||
font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2
|
||||
font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2
|
||||
font-bh-ttf-1.0.0.tar.bz2
|
||||
font-bh-type1-1.0.0.tar.bz2
|
||||
font-bitstream-100dpi-1.0.0.tar.bz2
|
||||
font-bitstream-75dpi-1.0.0.tar.bz2
|
||||
font-bitstream-type1-1.0.0.tar.bz2
|
||||
font-cronyx-cyrillic-1.0.0.tar.bz2
|
||||
font-cursor-misc-1.0.0.tar.bz2
|
||||
font-daewoo-misc-1.0.0.tar.bz2
|
||||
font-dec-misc-1.0.0.tar.bz2
|
||||
font-ibm-type1-1.0.0.tar.bz2
|
||||
font-isas-misc-1.0.0.tar.bz2
|
||||
font-jis-misc-1.0.0.tar.bz2
|
||||
font-micro-misc-1.0.0.tar.bz2
|
||||
font-misc-cyrillic-1.0.0.tar.bz2
|
||||
font-misc-meltho-1.0.0.tar.bz2
|
||||
font-misc-misc-1.0.0.tar.bz2
|
||||
font-mutt-misc-1.0.0.tar.bz2
|
||||
font-schumacher-misc-1.0.0.tar.bz2
|
||||
font-screen-cyrillic-1.0.0.tar.bz2
|
||||
font-sony-misc-1.0.0.tar.bz2
|
||||
font-sun-misc-1.0.0.tar.bz2
|
||||
font-winitzki-cyrillic-1.0.0.tar.bz2
|
||||
font-xfree86-type1-1.0.0.tar.bz2
|
||||
|
||||
11
encodings-1.0.0-encodings-fontdir-fix.patch
Normal file
11
encodings-1.0.0-encodings-fontdir-fix.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- encodings-1.0.0/configure.ac.encodings-fontdir-fix 2005-12-16 01:57:27.000000000 -0500
|
||||
+++ encodings-1.0.0/configure.ac 2005-12-16 01:58:04.000000000 -0500
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
|
||||
|
||||
-DEFAULT_ENCODINGSDIR=${libdir}/X11/fonts/encodings
|
||||
+DEFAULT_ENCODINGSDIR=$(pkg-config --variable=fontdir fontutil)/encodings
|
||||
AC_ARG_WITH(encodingsdir,
|
||||
AS_HELP_STRING([--with-encodingsdir=ENCODINGSDIR], [Path to install font encodings]),
|
||||
[ENCODINGSDIR="$withval"],
|
||||
11
font-alias-1.0.0-fonts-alias-fontdir-fix.patch
Normal file
11
font-alias-1.0.0-fonts-alias-fontdir-fix.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- font-alias-1.0.0/configure.ac.fonts-alias-fontdir-fix 2005-12-16 01:53:02.000000000 -0500
|
||||
+++ font-alias-1.0.0/configure.ac 2005-12-16 01:53:41.000000000 -0500
|
||||
@@ -30,7 +30,7 @@
|
||||
|
||||
m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
|
||||
|
||||
-DEFAULT_TOPFONTDIR=${libdir}/X11/fonts
|
||||
+DEFAULT_TOPFONTDIR=$(pkg-config --variable=fontdir fontutil)
|
||||
AC_ARG_WITH(top-fontdir,
|
||||
AS_HELP_STRING([--with-top-fontdir=<path>], [Path to top level font directory]),
|
||||
[TOPFONTDIR="$withval"],
|
||||
70
sources
70
sources
@ -1,35 +1,35 @@
|
||||
94a6c7af7516c05b66827121bafd6b70 encodings-0.99.1.tar.bz2
|
||||
22cab45b21eb2bbc462a5cc999e4d663 font-adobe-100dpi-0.99.1.tar.bz2
|
||||
90388106c401416dfd13b4ee67940cfb font-adobe-75dpi-0.99.1.tar.bz2
|
||||
1905698c4d8596d6ed7abca19892f9d9 font-adobe-utopia-100dpi-0.99.1.tar.bz2
|
||||
7f4db1575b7f3b5b31b8612d5ad0298d font-adobe-utopia-75dpi-0.99.1.tar.bz2
|
||||
c0f3ca64a53438896eb7c5153646c468 font-adobe-utopia-type1-0.99.0.tar.bz2
|
||||
ab102077178a9dbfc90ac091c62ead03 font-alias-0.99.0.tar.bz2
|
||||
41681ca4f03c2a33ab86573bd809591c font-arabic-misc-0.99.0.tar.bz2
|
||||
41618f18e0914879571df49d4cc0f027 font-bh-100dpi-0.99.1.tar.bz2
|
||||
57f8a0a58b009d9ce631af0c20d6ba56 font-bh-75dpi-0.99.1.tar.bz2
|
||||
6946572b5c5c1ffa6b3801ff5dda578f font-bh-lucidatypewriter-100dpi-0.99.1.tar.bz2
|
||||
1d01f50a4a2f64caff4969557f567757 font-bh-lucidatypewriter-75dpi-0.99.1.tar.bz2
|
||||
d9d1382cdcff9484a4fa1169dd8515db font-bh-ttf-0.99.0.tar.bz2
|
||||
de486caad6f1a4a2dd984cde06f1fb9b font-bh-type1-0.99.0.tar.bz2
|
||||
ba44991ae6bcf073773ab600d63dd6d1 font-bitstream-100dpi-0.99.0.tar.bz2
|
||||
cb938f821a4773442f3c7413051f4b76 font-bitstream-75dpi-0.99.0.tar.bz2
|
||||
ef438d426ea0c28965991ae8e5993706 font-bitstream-type1-0.99.0.tar.bz2
|
||||
b04c68704e14baa40852933aa6dca98f font-cronyx-cyrillic-0.99.0.tar.bz2
|
||||
07d9a52d6e768a6899ed408d60978efc font-cursor-misc-0.99.0.tar.bz2
|
||||
e8e26dd610d76baa85b2a64ebd90c80e font-daewoo-misc-0.99.0.tar.bz2
|
||||
b1b6bc66543975eaf6725b16d471b368 font-dec-misc-0.99.0.tar.bz2
|
||||
6a2499cfa37de5410db21db1171449be font-ibm-type1-0.99.0.tar.bz2
|
||||
ecf9a2e08ec56091ba65dfea1eebefc4 font-isas-misc-0.99.0.tar.bz2
|
||||
9c34468b76bf6fc3cc52a686633c9d8b font-jis-misc-0.99.0.tar.bz2
|
||||
b7e9a9d24e7b4d7f60b78ca07479056f font-micro-misc-0.99.0.tar.bz2
|
||||
c465d13b734ba3ffd304133c8b6a8f31 font-misc-cyrillic-0.99.0.tar.bz2
|
||||
83a305a3534c3d9fb750ad2efb654fa9 font-misc-meltho-0.99.1.tar.bz2
|
||||
68e5b6385a7a68b8972b66987a414cbd font-misc-misc-0.99.1.tar.bz2
|
||||
6b9ea8ae76e7e4becdeb6022ba84354d font-mutt-misc-0.99.0.tar.bz2
|
||||
5bdbce90d21f70a447a0977cd584f0c9 font-schumacher-misc-0.99.1.tar.bz2
|
||||
5d62f280f694fc408a4189cc6de73ba0 font-screen-cyrillic-0.99.0.tar.bz2
|
||||
afd0b7c8a1a4e008d7996e10f918effb font-sony-misc-0.99.0.tar.bz2
|
||||
4d2325494f41983689625e96dab535f6 font-sun-misc-0.99.0.tar.bz2
|
||||
90462cb70051ad619933e07fb5f2d25d font-winitzki-cyrillic-0.99.0.tar.bz2
|
||||
ea4d8d24078ee17decd5cd721f90b843 font-xfree86-type1-0.99.0.tar.bz2
|
||||
81b6d7e45f974946a798f17b1f79e5a3 encodings-1.0.0.tar.bz2
|
||||
3a36041b4e63fdcf155d238c611d21f1 font-adobe-100dpi-1.0.0.tar.bz2
|
||||
22517ec84e0c58853a70c53b50874c13 font-adobe-75dpi-1.0.0.tar.bz2
|
||||
f18801c7e70a4a27011b8deabc2692a8 font-adobe-utopia-100dpi-1.0.0.tar.bz2
|
||||
aaf8d2f4e9531a1fab26e45dacb05b7f font-adobe-utopia-75dpi-1.0.0.tar.bz2
|
||||
3d65e701a4bf3b06fd5de20f162f543e font-adobe-utopia-type1-1.0.0.tar.bz2
|
||||
3614b5f504f637f470dbce0476bf8315 font-alias-1.0.0.tar.bz2
|
||||
b71cc63ff8253f3059af75e96a179361 font-arabic-misc-1.0.0.tar.bz2
|
||||
a38fe26959bfca3bb4052516a7c2f906 font-bh-100dpi-1.0.0.tar.bz2
|
||||
589f8c5a69dc991c9c447777058a6c16 font-bh-75dpi-1.0.0.tar.bz2
|
||||
16afbb558c7f24a9c08be52da5a3d5c8 font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2
|
||||
2bf59944f760dac80d078b64b7be0254 font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2
|
||||
1e96c2cb8da66ea4e3df1f19bff8006e font-bh-ttf-1.0.0.tar.bz2
|
||||
f6bf214100752296426ba778714f057b font-bh-type1-1.0.0.tar.bz2
|
||||
a6f2c61ed43a8e5cb09dba2d0363fba8 font-bitstream-100dpi-1.0.0.tar.bz2
|
||||
be02e09d19683f2af83f566248a925d8 font-bitstream-75dpi-1.0.0.tar.bz2
|
||||
3bd6f98e0d137da76dda9efb38315cfd font-bitstream-type1-1.0.0.tar.bz2
|
||||
c66cb5ce26f24977adaf1f65360fcb45 font-cronyx-cyrillic-1.0.0.tar.bz2
|
||||
bf70e409ac182146581a525bb131c633 font-cursor-misc-1.0.0.tar.bz2
|
||||
634c64004d0ec8b8650f96fc80e83542 font-daewoo-misc-1.0.0.tar.bz2
|
||||
b2f79b65f8191e5082752646fc9904ae font-dec-misc-1.0.0.tar.bz2
|
||||
e3f122735299158a75199b5dddcf3205 font-ibm-type1-1.0.0.tar.bz2
|
||||
2c3f0d281abd6855cba55a1471262422 font-isas-misc-1.0.0.tar.bz2
|
||||
fbf76c0509bafca4b86547cd1173df51 font-jis-misc-1.0.0.tar.bz2
|
||||
a520709941e4e325097530ace57304ba font-micro-misc-1.0.0.tar.bz2
|
||||
91947d8241ac64d37bbb03e6d33dbb8a font-misc-cyrillic-1.0.0.tar.bz2
|
||||
dbae6c75b4c8108298cdffb0ba84a9fb font-misc-meltho-1.0.0.tar.bz2
|
||||
4d9ea506dafe32ffd235cf94e2b25c63 font-misc-misc-1.0.0.tar.bz2
|
||||
fe82b8d8df487d51309b449155e32f69 font-mutt-misc-1.0.0.tar.bz2
|
||||
480b90ee3d462bfeed66735897eaf4ae font-schumacher-misc-1.0.0.tar.bz2
|
||||
8a696edbcb55ebc00e8b829002faeaa1 font-screen-cyrillic-1.0.0.tar.bz2
|
||||
264ec16adafeb2470aab94ce5f5ab615 font-sony-misc-1.0.0.tar.bz2
|
||||
ec847f72d34d59b4139181e18321c3eb font-sun-misc-1.0.0.tar.bz2
|
||||
0f6aa8d87c1a3c15ba40efb255e4f125 font-winitzki-cyrillic-1.0.0.tar.bz2
|
||||
7ca54829c4d0f015f959ea0e1bb75195 font-xfree86-type1-1.0.0.tar.bz2
|
||||
|
||||
@ -29,8 +29,8 @@
|
||||
|
||||
Summary: X.Org X11 fonts
|
||||
Name: xorg-x11-fonts
|
||||
Version: 0.99.0
|
||||
Release: 8
|
||||
Version: 1.0.0
|
||||
Release: 1
|
||||
License: Various licenses
|
||||
Group: User Interface/X
|
||||
URL: http://www.x.org
|
||||
@ -38,52 +38,64 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
Source0: encodings-0.99.1.tar.bz2
|
||||
Source1: font-alias-0.99.0.tar.bz2
|
||||
Source10: font-adobe-100dpi-0.99.1.tar.bz2
|
||||
Source11: font-adobe-75dpi-0.99.1.tar.bz2
|
||||
Source12: font-adobe-utopia-100dpi-0.99.1.tar.bz2
|
||||
Source13: font-adobe-utopia-75dpi-0.99.1.tar.bz2
|
||||
Source14: font-adobe-utopia-type1-0.99.0.tar.bz2
|
||||
Source0: encodings-1.0.0.tar.bz2
|
||||
Source1: font-alias-1.0.0.tar.bz2
|
||||
Source10: font-adobe-100dpi-1.0.0.tar.bz2
|
||||
Source11: font-adobe-75dpi-1.0.0.tar.bz2
|
||||
Source12: font-adobe-utopia-100dpi-1.0.0.tar.bz2
|
||||
Source13: font-adobe-utopia-75dpi-1.0.0.tar.bz2
|
||||
Source14: font-adobe-utopia-type1-1.0.0.tar.bz2
|
||||
|
||||
Source15: font-arabic-misc-0.99.0.tar.bz2
|
||||
Source15: font-arabic-misc-1.0.0.tar.bz2
|
||||
|
||||
Source16: font-bh-100dpi-0.99.1.tar.bz2
|
||||
Source17: font-bh-75dpi-0.99.1.tar.bz2
|
||||
Source18: font-bh-lucidatypewriter-100dpi-0.99.1.tar.bz2
|
||||
Source19: font-bh-lucidatypewriter-75dpi-0.99.1.tar.bz2
|
||||
Source16: font-bh-100dpi-1.0.0.tar.bz2
|
||||
Source17: font-bh-75dpi-1.0.0.tar.bz2
|
||||
Source18: font-bh-lucidatypewriter-100dpi-1.0.0.tar.bz2
|
||||
Source19: font-bh-lucidatypewriter-75dpi-1.0.0.tar.bz2
|
||||
|
||||
Source20: font-bh-ttf-0.99.0.tar.bz2
|
||||
Source21: font-bh-type1-0.99.0.tar.bz2
|
||||
Source22: font-bitstream-100dpi-0.99.0.tar.bz2
|
||||
Source23: font-bitstream-75dpi-0.99.0.tar.bz2
|
||||
Source20: font-bh-ttf-1.0.0.tar.bz2
|
||||
Source21: font-bh-type1-1.0.0.tar.bz2
|
||||
Source22: font-bitstream-100dpi-1.0.0.tar.bz2
|
||||
Source23: font-bitstream-75dpi-1.0.0.tar.bz2
|
||||
# NOTE: X.Org 6.8.x and later has deprecated and disabled the speedo font
|
||||
# support by default, so we exclude the speedo fonts.
|
||||
#Source24: font-bitstream-speedo-0.99.1.tar.bz2
|
||||
Source25: font-bitstream-type1-0.99.0.tar.bz2
|
||||
Source26: font-cronyx-cyrillic-0.99.0.tar.bz2
|
||||
Source27: font-cursor-misc-0.99.0.tar.bz2
|
||||
Source28: font-daewoo-misc-0.99.0.tar.bz2
|
||||
Source29: font-dec-misc-0.99.0.tar.bz2
|
||||
Source30: font-ibm-type1-0.99.0.tar.bz2
|
||||
Source31: font-isas-misc-0.99.0.tar.bz2
|
||||
Source32: font-jis-misc-0.99.0.tar.bz2
|
||||
Source33: font-micro-misc-0.99.0.tar.bz2
|
||||
Source34: font-misc-cyrillic-0.99.0.tar.bz2
|
||||
#Source24: font-bitstream-speedo-1.0.0.tar.bz2
|
||||
Source25: font-bitstream-type1-1.0.0.tar.bz2
|
||||
Source26: font-cronyx-cyrillic-1.0.0.tar.bz2
|
||||
Source27: font-cursor-misc-1.0.0.tar.bz2
|
||||
Source28: font-daewoo-misc-1.0.0.tar.bz2
|
||||
Source29: font-dec-misc-1.0.0.tar.bz2
|
||||
Source30: font-ibm-type1-1.0.0.tar.bz2
|
||||
Source31: font-isas-misc-1.0.0.tar.bz2
|
||||
Source32: font-jis-misc-1.0.0.tar.bz2
|
||||
Source33: font-micro-misc-1.0.0.tar.bz2
|
||||
Source34: font-misc-cyrillic-1.0.0.tar.bz2
|
||||
%if %{with_ethiopic_fonts}
|
||||
Source35: font-misc-ethiopic-0.99.1.tar.bz2
|
||||
Source35: font-misc-ethiopic-1.0.0.tar.bz2
|
||||
%endif
|
||||
Source36: font-misc-meltho-0.99.1.tar.bz2
|
||||
Source37: font-misc-misc-0.99.1.tar.bz2
|
||||
Source38: font-mutt-misc-0.99.0.tar.bz2
|
||||
Source39: font-schumacher-misc-0.99.1.tar.bz2
|
||||
Source40: font-screen-cyrillic-0.99.0.tar.bz2
|
||||
Source41: font-sony-misc-0.99.0.tar.bz2
|
||||
Source42: font-sun-misc-0.99.0.tar.bz2
|
||||
Source43: font-winitzki-cyrillic-0.99.0.tar.bz2
|
||||
Source44: font-xfree86-type1-0.99.0.tar.bz2
|
||||
Source36: font-misc-meltho-1.0.0.tar.bz2
|
||||
Source37: font-misc-misc-1.0.0.tar.bz2
|
||||
Source38: font-mutt-misc-1.0.0.tar.bz2
|
||||
Source39: font-schumacher-misc-1.0.0.tar.bz2
|
||||
Source40: font-screen-cyrillic-1.0.0.tar.bz2
|
||||
Source41: font-sony-misc-1.0.0.tar.bz2
|
||||
Source42: font-sun-misc-1.0.0.tar.bz2
|
||||
Source43: font-winitzki-cyrillic-1.0.0.tar.bz2
|
||||
Source44: font-xfree86-type1-1.0.0.tar.bz2
|
||||
|
||||
Patch0: font-alias-1.0.0-fonts-alias-fontdir-fix.patch
|
||||
Patch1: encodings-1.0.0-encodings-fontdir-fix.patch
|
||||
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: xorg-x11-util-macros
|
||||
# The font-utils dep here is to ensure we have a fontutil.pc file which
|
||||
# defines the 'fontdir' variable.
|
||||
BuildRequires: font-utils >= 1.0.0
|
||||
|
||||
BuildRequires: ucs2any, bdftruncate, bdftopcf
|
||||
# FIXME: perl is used for now to avoid having to maintain a big patch.
|
||||
BuildRequires: perl
|
||||
|
||||
%description
|
||||
X.Org X Window System fonts
|
||||
|
||||
@ -386,12 +398,33 @@ Contains a set of Cyrillic fonts.
|
||||
%define setup_fonts_scaleable %{setup_fonts_type1} %{setup_fonts_ttf} %{setup_fonts_otf}
|
||||
|
||||
%setup -q -c %{name}-%{version} %{setup_font_metadata} %{setup_fonts_bitmap} %{setup_fonts_scaleable}
|
||||
%patch0 -p0 -b .fonts-alias-fontdir-fix
|
||||
%patch1 -p0 -b .encodings-fontdir-fix
|
||||
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
%build
|
||||
for dir in $(find . -maxdepth 1 -type d -name '[a-z]*-[0-9]*' | sort | sed -e 's#\./##g') ; do
|
||||
pushd $dir
|
||||
%configure
|
||||
# FIXME: Yes, this perl hack is fairly ugly, but beats the heck out of
|
||||
# making a patch that patches 35 or so configure.ac files and maintaining
|
||||
# it for an indefinite amount of time. Hopefully my solution here will
|
||||
# get considered to be included in upstream 7.1 release in which case I'll
|
||||
# turn it into a series of diffs instead and submit it. For now tho, perl
|
||||
# is my friend. -- mharris
|
||||
perl -p -i -e 's#(^DEFAULT_FONTDIR=)\${libdir}/X11/fonts#\1\$(pkg-config --variable=fontdir fontutil)#' configure.ac
|
||||
autoconf
|
||||
#3,4,6,10,11,12,13,16
|
||||
%configure \
|
||||
--disable-iso8859-3 \
|
||||
--disable-iso8859-4 \
|
||||
--disable-iso8859-6 \
|
||||
--disable-iso8859-10 \
|
||||
--disable-iso8859-11 \
|
||||
--disable-iso8859-12 \
|
||||
--disable-iso8859-13 \
|
||||
--disable-iso8859-16
|
||||
# --prefix=$RPM_BUILD_ROOT/usr --libdir=$RPM_BUILD_ROOT%{_x11fontdirprefix} --datadir=$RPM_BUILD_ROOT%{_datadir}
|
||||
make
|
||||
popd
|
||||
done
|
||||
@ -405,7 +438,8 @@ for dir in $(find . -maxdepth 1 -type d -name '[a-z]*-[0-9]*' | sort | sed -e 's
|
||||
# FIXME: The upstream sources need to be patched to allow direct
|
||||
# specification of the 'fontdir' variable, instead of it being
|
||||
# relative to libdir.
|
||||
make install DESTDIR=$RPM_BUILD_ROOT libdir=%{_x11fontdirprefix}
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
# libdir=%{_x11fontdirprefix}
|
||||
popd
|
||||
done
|
||||
|
||||
@ -438,6 +472,7 @@ done
|
||||
# Remove unwanted fonts
|
||||
{
|
||||
# Remove unwanted 100dpi,75dpi ISO8859-{3,4,10,13} fonts
|
||||
%if 0
|
||||
{
|
||||
for dir in $RPM_BUILD_ROOT%{_x11fontdir}/{100dpi,75dpi} ; do
|
||||
find $dir -iregex ".*-ISO8859-\(3\|4\|10\|13\)\.pcf.*" | xargs rm --
|
||||
@ -452,6 +487,7 @@ done
|
||||
find $dir -iregex ".*-ISO8859-\(3\|4\|6\|10\|11\|12\|13\|16\)\.pcf.*" | xargs rm --
|
||||
done
|
||||
}
|
||||
%endif
|
||||
# || : &> /dev/null
|
||||
# font-misc-meltho (syriac fonts)
|
||||
{
|
||||
@ -1458,6 +1494,18 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%ghost %verify(not md5 size mtime) %{_x11fontdir}/cyrillic/fonts.cache-*
|
||||
|
||||
%changelog
|
||||
* Thu Dec 15 2005 Mike A. Harris <mharris@redhat.com> 1.0.0-1
|
||||
- Updated all font packages to X11R7 RC4 versions.
|
||||
- Added perl hack to build section to massage all of the configure.ac files
|
||||
to use pkgconfig to autodetect the top level X fontdir.
|
||||
- Added font-alias-1.0.0-fonts-alias-fontdir-fix.patch to use pkgconfig to
|
||||
autodetect the top level X fontdir.
|
||||
- Added encodings-1.0.0-encodings-fontdir-fix.patch to use pkgconfig to
|
||||
autodetect the top level X fontdir.
|
||||
|
||||
* Tue Dec 13 2005 Mike A. Harris <mharris@redhat.com> 0.99.3-1
|
||||
- Updated all font packages to X11R7 RC3 versions.
|
||||
|
||||
* Fri Nov 25 2005 Mike A. Harris <mharris@redhat.com> 0.99.0-8
|
||||
- Due to a bug in chkfontpath which will remove both 'misc' and 'misc:unscaled'
|
||||
from the fontpath, use sed magic to do it instead, based of xfs scripts.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user