diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..d87f5613ec4234f82f8eaeebc563711f587fdf88 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.xz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..53b1e81fefe16228de7d6ed9f4c6b1a91b60e78c --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/console-setup diff --git a/console-setup.spec b/console-setup.spec index c09ae484cf6399c635e49f6569f4b363f857451d..fe315a8b2986ffce0de8c4115156a71016d7b4ee 100644 --- a/console-setup.spec +++ b/console-setup.spec @@ -1,5 +1,5 @@ Name: console-setup -Version: 1.230 +Version: 1.239 Release: 1 Summary: Console font and keymap setup program License: GPL-2.0-or-later AND MIT AND Public Domain @@ -23,13 +23,22 @@ The package also installs console fonts supporting many of the world's languages set of font faces - the classic VGA, the simplistic Fixed, and the cleaned Terminus, TerminusBold and TerminusBoldVGA. +%package -n bdf2psf +Summary: Generate console fonts from BDF source fonts + +%description -n bdf2psf +This package provides a command-line converter that can be used in scripts +to build console fonts from BDF sources automatically. The converter comes +with a collection of font encodings that cover many of the world's +languages. The output font can use a different character encoding from the +input. When the source font does not define a glyph for a particular +symbol in the encoding table, that glyph position in the console font is +not wasted but used for another symbol. + %package_help %prep -%setup -q -n %{name}-%{version} -%patch0 -p1 -b .paths -%patch1 -p1 -b .fsf-address -%patch2 -p1 -b .ctrll-lock1 +%autosetup -p1 -n %{name} %build make build-linux @@ -37,18 +46,41 @@ make build-linux %install make prefix=%{buildroot} install-linux +# we don't want another set of keyboard descriptions, we want to use descriptions from +# xkeyboard-config (require it?), so removing it +rm -fr %{buildroot}%{_sysconfdir}/%{name} + +mkdir -p %{buildroot}%{_mandir}/man1 +install -pm644 man/bdf2psf.1 %{buildroot}%{_mandir}/man1/ + +mkdir -p %{buildroot}%{_bindir} +install -p Fonts/bdf2psf %{buildroot}%{_bindir} + +mkdir -p %{buildroot}%{_datadir}/bdf2psf +cp -a Fonts/fontsets Fonts/*.equivalents Fonts/*.set \ + %{buildroot}%{_datadir}/bdf2psf/ + %files %doc README CHANGES %license COPYRIGHT copyright.fonts copyright.xkb Fonts/copyright -%exclude %{_sysconfdir}/%{name} -%{_bindir}/* +%{_bindir}/ckbcomp +%{_bindir}/setupcon %config(noreplace) %{_sysconfdir}/default/* %{_datadir}/console* +%files -n bdf2psf +%license GPL-2 +%{_bindir}/bdf2psf +%{_datadir}/bdf2psf + %files help %{_mandir}/man*/* %changelog +* Sat Jul 19 2025 Funda Wang - 1.239-1 +- update to 1.239 +- package bdf2psf also + * Wed Jul 31 2024 wangkai <13474090681@163.com> - 1.230-1 - Update to 1.230 diff --git a/console-setup_1.230.tar.xz b/console-setup_1.230.tar.xz deleted file mode 100644 index 4b01e5f07a6aad26b32ada2010b27ed9df83582a..0000000000000000000000000000000000000000 Binary files a/console-setup_1.230.tar.xz and /dev/null differ diff --git a/console-setup_1.239.tar.xz b/console-setup_1.239.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..29d7dcb2bb0b23237a98bc723bf91a6d323237c8 --- /dev/null +++ b/console-setup_1.239.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff47c98989ee294eb8f2a95626a7e7dba390fe04d0a974dc716877ee89c3ad40 +size 3888508