diff --git a/.gitignore b/.gitignore index c474732..c42e91d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ SOURCES/fr-dvorak.tar.bz2 SOURCES/kbd-1.15.5.tar.gz +SOURCES/kbd-eurlatgr.tar.bz2 SOURCES/kbd-latarcyrheb-16-fixed.tar.bz2 SOURCES/kbd-latarcyrheb-32.tar.bz2 SOURCES/kbd-latsun-fonts.tar.bz2 diff --git a/.kbd.metadata b/.kbd.metadata index c5274af..d6a4ce6 100644 --- a/.kbd.metadata +++ b/.kbd.metadata @@ -1,5 +1,6 @@ c91af1324e8f619d328cceb372a52ab1a07fd2fa SOURCES/fr-dvorak.tar.bz2 f5e29dcf55e1fb37864fb1a125e90b357e438fba SOURCES/kbd-1.15.5.tar.gz +5ece5c7b805a2e4de9974f9d156a090400aea00b SOURCES/kbd-eurlatgr.tar.bz2 17625849ecf4dedf755aefa06d78406b92c31743 SOURCES/kbd-latarcyrheb-16-fixed.tar.bz2 17db7aaba451796278758e7c6e443b4659af17b9 SOURCES/kbd-latarcyrheb-32.tar.bz2 a5f6d9dff7a8a484cd5014ec7ffdf1eaed27084a SOURCES/kbd-latsun-fonts.tar.bz2 diff --git a/SPECS/kbd.spec b/SPECS/kbd.spec index f717b6e..c9cd2c8 100644 --- a/SPECS/kbd.spec +++ b/SPECS/kbd.spec @@ -1,6 +1,6 @@ Name: kbd Version: 1.15.5 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Tools for configuring the console (keyboard, virtual terminals, etc.) Group: System Environment/Base @@ -13,6 +13,8 @@ Source4: fr-dvorak.tar.bz2 Source5: kbd-latarcyrheb-32.tar.bz2 Source6: xml2lst.pl Source7: vlock.pamd +# Source8: eurlatgr font taken from recent upstream tarball +Source8: kbd-eurlatgr.tar.bz2 # Patch0: puts additional information into man pages Patch0: kbd-1.15-keycodes-man.patch # Patch1: sparc modifications @@ -61,7 +63,7 @@ The %{name}-legacy package contains original keymaps for kbd package. Please note that %{name}-legacy is not helpful without kbd. %prep -%setup -q -a 2 -a 3 -a 4 -a 5 +%setup -q -a 2 -a 3 -a 4 -a 5 -a 8 cp -fp %{SOURCE6} . %patch0 -p1 -b .keycodes-man %patch1 -p1 -b .sparc @@ -179,6 +181,10 @@ zgrep -L "U+0041" $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb/* | xargs rm -f /lib/kbd/keymaps/legacy %changelog +* Mon Apr 11 2016 Vitezslav Crhonek - 1.15.5-12 +- Add eurlatgr console font + Resolves: #1310286 + * Thu Sep 25 2014 Vitezslav Crhonek - 1.15.5-11 - Include xkb layouts from xkeyboard-config converted to console keymaps Resolves: #1122058