From 806bb4308a6a25258a52e160c1c24807a0a70d710b2c3ea80acc5815afa955c3 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 3 Nov 2020 12:05:10 +0000 Subject: [PATCH] - Update to release 2.1 OBS-URL: https://build.opensuse.org/package/show/M17N:fonts/int10h-oldschoolpc-fonts?expand=0&rev=9 --- int10h-oldschoolpc-fonts.changes | 26 ++++++++++--- int10h-oldschoolpc-fonts.spec | 56 +++++++++++++++++++++++----- oldschool_pc_font_pack_v2.0_ttf.zip | 3 -- oldschool_pc_font_pack_v2.1_FULL.zip | 3 ++ 4 files changed, 70 insertions(+), 18 deletions(-) delete mode 100644 oldschool_pc_font_pack_v2.0_ttf.zip create mode 100644 oldschool_pc_font_pack_v2.1_FULL.zip diff --git a/int10h-oldschoolpc-fonts.changes b/int10h-oldschoolpc-fonts.changes index 9beb90e..488f66d 100644 --- a/int10h-oldschoolpc-fonts.changes +++ b/int10h-oldschoolpc-fonts.changes @@ -1,13 +1,29 @@ +------------------------------------------------------------------- +Tue Nov 3 11:11:23 UTC 2020 - Jan Engelhardt + +- Update to release 2.1 + * New fonts: Acer 710 Mono, HP 100LX, Olivetti MS-DOS, Sanyo + MBC-55x, Sanyo MBC-775, Sharp PC-3000, TeleVideo Tele-PC, CL + Eagle II, CL Eagle III, CL Stingray, InteGraphics VGA, + PhoenixVGA, Sigma Designs RealMagic, STB AutoEGA, early + Trident/TVGA8800CS, Tseng EVA-480 ET2000, Various/ACM VGA, + Acorn BBC Master 512, Atari Portfolio, Philips :YES G-2x, + Texas Instruments PC/PPC, Wang Professional Computer. + * Removed Olivetti MxVGA: superseded by CL Stingray. +- Switched to the Mx437/MxPlus variant font files and made + Px437/PxPlus a fontconfig-level alias for compatibility. + ------------------------------------------------------------------- Thu Oct 29 11:37:28 UTC 2020 - Jan Engelhardt -- Update to version 2.0 +- Update to release 2.0 * Added new variants: Ac (aspect corrected) and Mx (Mixed outline + bitmap). - * New fonts (overview): AMI EGA, AST PremiumExec (quite like - VGA SquarePx), Acer-*, Apricot-*, Compaq Port3, DOS V, EpsonMGA, - EverexME (like EGA), IBM Model30, IBM PS/55, LE Model D, NEC APC3, Nix8810, - Olivetti M15/MX, Trident + * New fonts (overview): AMI EGA, Acer-*, Apricot-*, Compaq + Port3, DOS V, EpsonMGA, EverexME (like EGA), IBM Model30, IBM + PS/55, LE Model D, NEC APC3, Nix8810, Olivetti M15/MX, + Trident. + * VGA SquarePx was renamed to AST PremiumExec. * ToshibaLCD was renamed to ToshibaSat; a few other minor renames. - All pre-stretched fonts (both Ac or Px-2X/Px-2Y variants) were diff --git a/int10h-oldschoolpc-fonts.spec b/int10h-oldschoolpc-fonts.spec index 2504232..3bc92ad 100644 --- a/int10h-oldschoolpc-fonts.spec +++ b/int10h-oldschoolpc-fonts.spec @@ -17,16 +17,17 @@ Name: int10h-oldschoolpc-fonts -Version: 2.0 +Version: 2.1 Release: 0 Summary: Remakes of old computer hardware fonts License: CC-BY-SA-4.0 Group: System/X11/Fonts URL: http://int10h.org/oldschool-pc-fonts/ -Source: https://int10h.org/oldschool-pc-fonts/download/oldschool_pc_font_pack_v2.0_ttf.zip +Source: https://int10h.org/oldschool-pc-fonts/download/oldschool_pc_font_pack_v2.1_FULL.zip Source8: ratio.txt BuildRequires: fontpackages-devel +BuildRequires: lcdf-typetools BuildRequires: unzip %reconfigure_fonts_prereq BuildArch: noarch @@ -45,6 +46,9 @@ applied. For details, see ratio.txt inside the package. ] %package stretched Summary: Pre-stretched versions of int10h-oldschoolpc-fonts Group: System/X11/Fonts +Conflicts: %name < %version +Conflicts: %name > %version +%reconfigure_fonts_prereq %description stretched This package contains aspect-corrected and non-corrected-but-stretched @@ -59,23 +63,55 @@ iconv -f cp437 -t utf-8 readme.txt mv LICENSE.TXT license.txt %install -c="%buildroot/%_ttfontsdir" -mkdir -p "$c" -rm -fv */Mx*.ttf -install -pm 0644 */*.ttf "$c/" +mkdir mxs +mv */Mx*-2[xy]*.ttf mxs/ + +c="%buildroot/%_sharedir/fontconfig/conf.avail" +tt="%buildroot/%_ttfontsdir" +mkdir -p "$c" "$tt" + +genalias() +{ + echo "" + echo '" + echo "" + for i in "$@"; do + mx="$(otfinfo -i "$i" | perl -lne 'if(/^Family:\s*(.*)/){$_=$1;s{&}{&}g;print}')" + px="Px${mx:2}" + echo "$px$mx" + done + echo "" +} + +genalias mxs/Mx*.ttf >31-int10h-stretch-alias.conf +mv mxs/*.ttf "$tt/" +genalias */Mx*.ttf >31-int10h-alias.conf +mv */Ac*.ttf */Mx*.ttf "$tt/" +%install_fontsconf 31-int10h-alias.conf +%install_fontsconf 31-int10h-stretch-alias.conf %reconfigure_fonts_scriptlets +%reconfigure_fonts_scriptlets -n %name-stretched %files -%doc readme.txt license.txt ratio.txt -%_ttfontsdir/Px* +%license license.txt +%doc readme.txt ratio.txt +%_ttfontsdir/Mx* %exclude %_ttfontsdir/*-2x.ttf %exclude %_ttfontsdir/*-2y.ttf +%dir %_sysconfdir/fonts +%dir %_sysconfdir/fonts/conf.d +%files_fontsconf_availdir +%files_fontsconf_file -l 31-int10h-alias.conf %files stretched %dir %_ttfontsdir/ %_ttfontsdir/Ac* -%_ttfontsdir/*-2x.ttf -%_ttfontsdir/*-2y.ttf +%_ttfontsdir/Mx*-2x.ttf +%_ttfontsdir/Mx*-2y.ttf +%dir %_sysconfdir/fonts +%dir %_sysconfdir/fonts/conf.d +%files_fontsconf_availdir +%files_fontsconf_file -l 31-int10h-stretch-alias.conf %changelog diff --git a/oldschool_pc_font_pack_v2.0_ttf.zip b/oldschool_pc_font_pack_v2.0_ttf.zip deleted file mode 100644 index aca26ce..0000000 --- a/oldschool_pc_font_pack_v2.0_ttf.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6c39482e07490aa0207d7bc21d070b0668157564f50b8bd9c445fc26290cb901 -size 9827846 diff --git a/oldschool_pc_font_pack_v2.1_FULL.zip b/oldschool_pc_font_pack_v2.1_FULL.zip new file mode 100644 index 0000000..4e5d25d --- /dev/null +++ b/oldschool_pc_font_pack_v2.1_FULL.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31caab1948c0bff0a7a57a1b188343e8cc159cd24458ea8c6e7553dca1c7968e +size 18929230