diff options
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | .gitmodules | 3 | ||||
-rw-r--r-- | GNUmakefile | 3 | ||||
m--------- | git-rpm | 0 | ||||
-rw-r--r-- | terminus-fonts-console.README.fedora | 27 | ||||
-rw-r--r-- | terminus-fonts-fontconfig.conf | 4 | ||||
-rw-r--r-- | terminus-fonts.README.fedora | 11 | ||||
-rw-r--r-- | terminus-fonts.Xresources.example | 41 | ||||
-rw-r--r-- | terminus-fonts.spec | 346 |
9 files changed, 436 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b25c15b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*~ diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..0ccfef1 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "git-rpm"] + path = git-rpm + url = git://fedorapeople.org/~ndim/git-rpm.git diff --git a/GNUmakefile b/GNUmakefile new file mode 100644 index 0000000..94122f7 --- /dev/null +++ b/GNUmakefile @@ -0,0 +1,3 @@ +NAME = terminus-fonts +dummy := $(shell test -f git-rpm/git-rpm.mk || git submodule update --init) +include git-rpm/git-rpm.mk diff --git a/git-rpm b/git-rpm new file mode 160000 +Subproject 25cf33225df2457efc471b1f628c496a707b505 diff --git a/terminus-fonts-console.README.fedora b/terminus-fonts-console.README.fedora new file mode 100644 index 0000000..29a43d8 --- /dev/null +++ b/terminus-fonts-console.README.fedora @@ -0,0 +1,27 @@ +======================================================================== +User Information for the Fedora terminus-font-console package +======================================================================== + +The console package just dumps the font files in the directory where +the other console fonts are and does not do any setting up (for now). + + * The difference between all those ter-????.psf.gz files is + explained in the file + + /lib/kbd/consolefonts/README.terminus + + * You can manually change the font for the Linux VGA textmode or + framebuffer console by running something like + + /bin/setfont /lib/kbd/consolefonts/ter-u16b.psf.gz + + Note that using a font of a different font size will change the + $COLUMNS and $LINES of the terminal together with the changed + font size. + + * To make the above setting permanent, adapt the file + + /etc/sysconfig/i18n + + to set SYSFONT="ter-u16b". + diff --git a/terminus-fonts-fontconfig.conf b/terminus-fonts-fontconfig.conf new file mode 100644 index 0000000..2eb5183 --- /dev/null +++ b/terminus-fonts-fontconfig.conf @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE fontconfig SYSTEM "../fonts.dtd"> +<fontconfig> +</fontconfig> diff --git a/terminus-fonts.README.fedora b/terminus-fonts.README.fedora new file mode 100644 index 0000000..e903b2b --- /dev/null +++ b/terminus-fonts.README.fedora @@ -0,0 +1,11 @@ +======================================================================== +User Information for the Fedora terminus-font-x11 package +======================================================================== + +The terminus-font-x11 package registers the Terminus font with both +fonts-conf(5) and the newer /etc/X11/fontpath.d mechanism used by newer +libXfont and xfs(1) versions. + +This makes the font available for both traditional programs using +libXfont or xfs (like xterm, xfontsel, emacs) and for modern programs +using fontconfig (like Gnome and KDE programs). diff --git a/terminus-fonts.Xresources.example b/terminus-fonts.Xresources.example new file mode 100644 index 0000000..2982391 --- /dev/null +++ b/terminus-fonts.Xresources.example @@ -0,0 +1,41 @@ +! ===================================================================== +! This is the ~/.Xresources file I use for xterm and GNU emacs on my +! 118dpi and 125dpi Laptop displays. +! +! On lower resolution displays, you will probably want to use slightly +! smaller sizes. Run xfontsel(1) to find out which sizes are available. +! ===================================================================== + + +! ===================================================================== +! Emacs stuff +! ===================================================================== +Emacs.font: -*-terminus-bold-r-*-*-20-*-*-*-*-*-*-* + + +! ===================================================================== +! XTerm stuff +! ===================================================================== +! Default and menu font +XTerm*font: -*-terminus-bold-*-*-*-20-*-*-*-*-*-*-* +! "Unreadable": Leave it actually unreadable. +!XTerm*font1: -*-terminus-bold-r-*-*-20-*-*-*-*-*-*-* +! "Tiny" +XTerm*font2: -*-terminus-medium-*-*-*-12-*-*-*-*-*-*-* +! "Small" +XTerm*font3: -*-terminus-bold-*-*-*-14-*-*-*-*-*-*-* +! "Medium" +XTerm*font4: -*-terminus-bold-*-*-*-17-*-*-*-*-*-*-* +! "Large" +XTerm*font5: -*-terminus-bold-*-*-*-28-*-*-*-*-*-*-* +! "Huge" +XTerm*font6: -*-terminus-bold-*-*-*-32-*-*-*-*-*-*-* + +! Colors are a matter of personal preferences. +XTerm*background: black +XTerm*foreground: white + + +! ===================================================================== +! End of file. +! ===================================================================== diff --git a/terminus-fonts.spec b/terminus-fonts.spec new file mode 100644 index 0000000..2c5508f --- /dev/null +++ b/terminus-fonts.spec @@ -0,0 +1,346 @@ +%define fontname terminus +%define fontconf 63-%{fontname}.conf + +%define tarname terminus-font +%define archivename %{tarname}-%{version} + +# This is the dir where we install our console fonts. +# Owned by the kbd package. +%define consolefontdir /%{_lib}/kbd/consolefonts + +# Font catalogue +%define catalogue /etc/X11/fontpath.d + + +Name: %{fontname}-fonts +# Do not trust font metadata versionning unless you've checked upstream does +# update versions on file changes. When in doubt use the timestamp of the most +# recent file as version. +Version: 4.28 +Release: 2%{?dist} +Summary: Clean fixed width font +Provides: terminus-font-x11 = 4.28-2 +Obsoletes: terminus-font-x11 < 4.28-2 + +Group: User Interface/X +License: GPLv2+ +URL: http://www.is-vn.bg/hamster/ +Source0: http://www.is-vn.bg/hamster/%{archivename}.tar.gz +Source1: %{name}-fontconfig.conf +Source10: %{name}-console.README.fedora +Source20: %{name}.README.fedora +Source21: %{name}.Xresources.example +Patch11: http://www.is-vn.bg/hamster/%{archivename}-dv1.diff.gz +Patch12: http://www.is-vn.bg/hamster/%{archivename}-ge1.diff.gz +Patch13: http://www.is-vn.bg/hamster/%{archivename}-ij1.diff.gz +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) + +BuildArch: noarch +BuildRequires: fontpackages-devel +Requires: fontpackages-filesystem + +# First filesystem package verison to contain the %{catalogue} dir. +Requires: filesystem >= 2.4.11-1 + +BuildRequires: /usr/bin/bdftopcf + +%description +The Terminus Font is designed for long (8 and more hours per day) +work with computers. + +Version 4.28 contains 825 characters, covers about 120 language +sets and supports ISO8859-1/2/5/7/9/13/15/16, Paratype-PT154/PT254, +KOI8-R/U/E/F, Esperanto, many IBM, Windows and Macintosh code pages, +as well as the IBM VGA, vt100 and xterm pseudographic characters. + +The sizes present are 6x12, 8x14, 8x16, 10x20, 12x24, 14x28 +and 16x32. The styles are normal and bold (except for 6x12), +plus EGA/VGA-bold for 8x14 and 8x16. + +The font is available for the Linux console and for X11. + + +%package console +Requires: kbd +Group: User Interface/X +Summary: Clean fixed width font (console version) +Provides: terminus-font-console = 4.28-2 +Obsoletes: terminus-font-console < 4.28-2 + +%description console +The Terminus Font is designed for long (8 and more hours per day) +work with computers. + +Version 4.28 contains 825 characters, covers about 120 language +sets and supports ISO8859-1/2/5/7/9/13/15/16, Paratype-PT154/PT254, +KOI8-R/U/E/F, Esperanto, many IBM, Windows and Macintosh code pages, +as well as the IBM VGA, vt100 and xterm pseudographic characters. + +The sizes present are 6x12, 8x14, 8x16, 10x20, 12x24, 14x28 +and 16x32. The styles are normal and bold (except for 6x12), +plus EGA/VGA-bold for 8x14 and 8x16. + +This package contains the fonts to use with the Linux console. + + +%prep +%setup -q -n %{archivename} +%patch11 -p0 -b .dv1 +%patch12 -p0 -b .ge1 +%patch13 -p0 -b .ij1 + + +%build +# The libdir is just to shut up rpmlint. Configure is nice enough to +# just ignore it. +./configure --prefix=%{_prefix} --libdir=%{_libdir} \ + --x11dir=%{_fontdir} --psfdir=%{consolefontdir} +env GZIP=--best make %{?_smp_mflags} + +# Fedora specific docs and examples +mkdir -p docs/console docs/x11 +cp -p "%{SOURCE10}" docs/console/README.fedora +cp -p "%{SOURCE20}" docs/x11/README.fedora +cp -p "%{SOURCE21}" docs/x11/Xresources.example + + +%install +rm -fr %{buildroot} + +make DESTDIR="%{buildroot}" TESTDIR= install install-ref + +#install -m 0755 -d %{buildroot}%{_fontdir} +#install -m 0644 -p *.ttf %{buildroot}%{_fontdir} + +install -m 0755 -d \ + %{buildroot}%{_fontconfig_templatedir} \ + %{buildroot}%{_fontconfig_confdir} + +install -m 0644 -p %{SOURCE1} \ + %{buildroot}%{_fontconfig_templatedir}/%{fontconf} +ln -s \ + %{_fontconfig_templatedir}/%{fontconf} \ + %{buildroot}%{_fontconfig_confdir}/%{fontconf} + +install -m 0755 -d %{buildroot}%{catalogue} +ln -s %{_fontdir} %{buildroot}%{catalogue}/%{fontname}:unscaled:pri=10 + + +%clean +rm -fr %{buildroot} + + +%_font_pkg -f %{fontconf} *.pcf.gz + +%doc README README-BG +%doc docs/x11/README.fedora docs/x11/Xresources.example +%dir %{_fontdir} +%{catalogue}/terminus:unscaled:pri=10 + + +%files console +%defattr(0644,root,root,0755) +%doc README README-BG +%doc docs/console/README.fedora +%doc %{consolefontdir}/README.terminus +%{consolefontdir}/ter-112n.psf.gz +%{consolefontdir}/ter-114b.psf.gz +%{consolefontdir}/ter-114f.psf.gz +%{consolefontdir}/ter-114n.psf.gz +%{consolefontdir}/ter-116b.psf.gz +%{consolefontdir}/ter-116f.psf.gz +%{consolefontdir}/ter-116n.psf.gz +%{consolefontdir}/ter-120b.psf.gz +%{consolefontdir}/ter-120n.psf.gz +%{consolefontdir}/ter-124b.psf.gz +%{consolefontdir}/ter-124n.psf.gz +%{consolefontdir}/ter-128b.psf.gz +%{consolefontdir}/ter-128n.psf.gz +%{consolefontdir}/ter-132b.psf.gz +%{consolefontdir}/ter-132n.psf.gz +%{consolefontdir}/ter-212n.psf.gz +%{consolefontdir}/ter-214b.psf.gz +%{consolefontdir}/ter-214f.psf.gz +%{consolefontdir}/ter-214n.psf.gz +%{consolefontdir}/ter-216b.psf.gz +%{consolefontdir}/ter-216f.psf.gz +%{consolefontdir}/ter-216n.psf.gz +%{consolefontdir}/ter-220b.psf.gz +%{consolefontdir}/ter-220n.psf.gz +%{consolefontdir}/ter-224b.psf.gz +%{consolefontdir}/ter-224n.psf.gz +%{consolefontdir}/ter-228b.psf.gz +%{consolefontdir}/ter-228n.psf.gz +%{consolefontdir}/ter-232b.psf.gz +%{consolefontdir}/ter-232n.psf.gz +%{consolefontdir}/ter-712n.psf.gz +%{consolefontdir}/ter-714b.psf.gz +%{consolefontdir}/ter-714f.psf.gz +%{consolefontdir}/ter-714n.psf.gz +%{consolefontdir}/ter-716b.psf.gz +%{consolefontdir}/ter-716f.psf.gz +%{consolefontdir}/ter-716n.psf.gz +%{consolefontdir}/ter-720b.psf.gz +%{consolefontdir}/ter-720n.psf.gz +%{consolefontdir}/ter-724b.psf.gz +%{consolefontdir}/ter-724n.psf.gz +%{consolefontdir}/ter-728b.psf.gz +%{consolefontdir}/ter-728n.psf.gz +%{consolefontdir}/ter-732b.psf.gz +%{consolefontdir}/ter-732n.psf.gz +%{consolefontdir}/ter-912n.psf.gz +%{consolefontdir}/ter-914b.psf.gz +%{consolefontdir}/ter-914f.psf.gz +%{consolefontdir}/ter-914n.psf.gz +%{consolefontdir}/ter-916b.psf.gz +%{consolefontdir}/ter-916f.psf.gz +%{consolefontdir}/ter-916n.psf.gz +%{consolefontdir}/ter-920b.psf.gz +%{consolefontdir}/ter-920n.psf.gz +%{consolefontdir}/ter-924b.psf.gz +%{consolefontdir}/ter-924n.psf.gz +%{consolefontdir}/ter-928b.psf.gz +%{consolefontdir}/ter-928n.psf.gz +%{consolefontdir}/ter-932b.psf.gz +%{consolefontdir}/ter-932n.psf.gz +%{consolefontdir}/ter-c12n.psf.gz +%{consolefontdir}/ter-c14b.psf.gz +%{consolefontdir}/ter-c14f.psf.gz +%{consolefontdir}/ter-c14n.psf.gz +%{consolefontdir}/ter-c16b.psf.gz +%{consolefontdir}/ter-c16f.psf.gz +%{consolefontdir}/ter-c16n.psf.gz +%{consolefontdir}/ter-c20b.psf.gz +%{consolefontdir}/ter-c20n.psf.gz +%{consolefontdir}/ter-c24b.psf.gz +%{consolefontdir}/ter-c24n.psf.gz +%{consolefontdir}/ter-c28b.psf.gz +%{consolefontdir}/ter-c28n.psf.gz +%{consolefontdir}/ter-c32b.psf.gz +%{consolefontdir}/ter-c32n.psf.gz +%{consolefontdir}/ter-d12n.psf.gz +%{consolefontdir}/ter-d14b.psf.gz +%{consolefontdir}/ter-d14f.psf.gz +%{consolefontdir}/ter-d14n.psf.gz +%{consolefontdir}/ter-d16b.psf.gz +%{consolefontdir}/ter-d16f.psf.gz +%{consolefontdir}/ter-d16n.psf.gz +%{consolefontdir}/ter-d20b.psf.gz +%{consolefontdir}/ter-d20n.psf.gz +%{consolefontdir}/ter-d24b.psf.gz +%{consolefontdir}/ter-d24n.psf.gz +%{consolefontdir}/ter-d28b.psf.gz +%{consolefontdir}/ter-d28n.psf.gz +%{consolefontdir}/ter-d32b.psf.gz +%{consolefontdir}/ter-d32n.psf.gz +%{consolefontdir}/ter-g12n.psf.gz +%{consolefontdir}/ter-g14b.psf.gz +%{consolefontdir}/ter-g14f.psf.gz +%{consolefontdir}/ter-g14n.psf.gz +%{consolefontdir}/ter-g16b.psf.gz +%{consolefontdir}/ter-g16f.psf.gz +%{consolefontdir}/ter-g16n.psf.gz +%{consolefontdir}/ter-g20b.psf.gz +%{consolefontdir}/ter-g20n.psf.gz +%{consolefontdir}/ter-g24b.psf.gz +%{consolefontdir}/ter-g24n.psf.gz +%{consolefontdir}/ter-g28b.psf.gz +%{consolefontdir}/ter-g28n.psf.gz +%{consolefontdir}/ter-g32b.psf.gz +%{consolefontdir}/ter-g32n.psf.gz +%{consolefontdir}/ter-i12n.psf.gz +%{consolefontdir}/ter-i14b.psf.gz +%{consolefontdir}/ter-i14f.psf.gz +%{consolefontdir}/ter-i14n.psf.gz +%{consolefontdir}/ter-i16b.psf.gz +%{consolefontdir}/ter-i16f.psf.gz +%{consolefontdir}/ter-i16n.psf.gz +%{consolefontdir}/ter-i20b.psf.gz +%{consolefontdir}/ter-i20n.psf.gz +%{consolefontdir}/ter-i24b.psf.gz +%{consolefontdir}/ter-i24n.psf.gz +%{consolefontdir}/ter-i28b.psf.gz +%{consolefontdir}/ter-i28n.psf.gz +%{consolefontdir}/ter-i32b.psf.gz +%{consolefontdir}/ter-i32n.psf.gz +%{consolefontdir}/ter-k12n.psf.gz +%{consolefontdir}/ter-k14b.psf.gz +%{consolefontdir}/ter-k14f.psf.gz +%{consolefontdir}/ter-k14n.psf.gz +%{consolefontdir}/ter-k16b.psf.gz +%{consolefontdir}/ter-k16f.psf.gz +%{consolefontdir}/ter-k16n.psf.gz +%{consolefontdir}/ter-k20b.psf.gz +%{consolefontdir}/ter-k20n.psf.gz +%{consolefontdir}/ter-k24b.psf.gz +%{consolefontdir}/ter-k24n.psf.gz +%{consolefontdir}/ter-k28b.psf.gz +%{consolefontdir}/ter-k28n.psf.gz +%{consolefontdir}/ter-k32b.psf.gz +%{consolefontdir}/ter-k32n.psf.gz +%{consolefontdir}/ter-m12n.psf.gz +%{consolefontdir}/ter-m14b.psf.gz +%{consolefontdir}/ter-m14f.psf.gz +%{consolefontdir}/ter-m14n.psf.gz +%{consolefontdir}/ter-m16b.psf.gz +%{consolefontdir}/ter-m16f.psf.gz +%{consolefontdir}/ter-m16n.psf.gz +%{consolefontdir}/ter-m20b.psf.gz +%{consolefontdir}/ter-m20n.psf.gz +%{consolefontdir}/ter-m24b.psf.gz +%{consolefontdir}/ter-m24n.psf.gz +%{consolefontdir}/ter-m28b.psf.gz +%{consolefontdir}/ter-m28n.psf.gz +%{consolefontdir}/ter-m32b.psf.gz +%{consolefontdir}/ter-m32n.psf.gz +%{consolefontdir}/ter-p12n.psf.gz +%{consolefontdir}/ter-p14b.psf.gz +%{consolefontdir}/ter-p14f.psf.gz +%{consolefontdir}/ter-p14n.psf.gz +%{consolefontdir}/ter-p16b.psf.gz +%{consolefontdir}/ter-p16f.psf.gz +%{consolefontdir}/ter-p16n.psf.gz +%{consolefontdir}/ter-p20b.psf.gz +%{consolefontdir}/ter-p20n.psf.gz +%{consolefontdir}/ter-p24b.psf.gz +%{consolefontdir}/ter-p24n.psf.gz +%{consolefontdir}/ter-p28b.psf.gz +%{consolefontdir}/ter-p28n.psf.gz +%{consolefontdir}/ter-p32b.psf.gz +%{consolefontdir}/ter-p32n.psf.gz +%{consolefontdir}/ter-u12n.psf.gz +%{consolefontdir}/ter-u14b.psf.gz +%{consolefontdir}/ter-u14f.psf.gz +%{consolefontdir}/ter-u14n.psf.gz +%{consolefontdir}/ter-u16b.psf.gz +%{consolefontdir}/ter-u16f.psf.gz +%{consolefontdir}/ter-u16n.psf.gz +%{consolefontdir}/ter-u20b.psf.gz +%{consolefontdir}/ter-u20n.psf.gz +%{consolefontdir}/ter-u24b.psf.gz +%{consolefontdir}/ter-u24n.psf.gz +%{consolefontdir}/ter-u28b.psf.gz +%{consolefontdir}/ter-u28n.psf.gz +%{consolefontdir}/ter-u32b.psf.gz +%{consolefontdir}/ter-u32n.psf.gz +%{consolefontdir}/ter-v12n.psf.gz +%{consolefontdir}/ter-v14b.psf.gz +%{consolefontdir}/ter-v14f.psf.gz +%{consolefontdir}/ter-v14n.psf.gz +%{consolefontdir}/ter-v16b.psf.gz +%{consolefontdir}/ter-v16f.psf.gz +%{consolefontdir}/ter-v16n.psf.gz +%{consolefontdir}/ter-v20b.psf.gz +%{consolefontdir}/ter-v20n.psf.gz +%{consolefontdir}/ter-v24b.psf.gz +%{consolefontdir}/ter-v24n.psf.gz +%{consolefontdir}/ter-v28b.psf.gz +%{consolefontdir}/ter-v28n.psf.gz +%{consolefontdir}/ter-v32b.psf.gz +%{consolefontdir}/ter-v32n.psf.gz + + +%changelog +* Wed Feb 18 2009 Hans Ulrich Niedermann <hun@n-dimensional.de> - 4.28-2 +- initial package for new Fedora Font Policy + |