[kbd/f19] Convert also plain layouts (no variant)

vcrhonek vcrhonek at fedoraproject.org
Wed Aug 28 13:19:43 UTC 2013


commit 17816ff5fcb0d829296f261a929698a8e121b0f7
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date:   Wed Aug 28 15:19:27 2013 +0200

    Convert also plain layouts (no variant)

 kbd.spec |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)
---
diff --git a/kbd.spec b/kbd.spec
index 81743df..af4382b 100644
--- a/kbd.spec
+++ b/kbd.spec
@@ -1,6 +1,6 @@
 Name:           kbd
 Version:        1.15.5
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Tools for configuring the console (keyboard, virtual terminals, etc.)
 
 Group:          System Environment/Base
@@ -124,10 +124,17 @@ mkdir -p $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb
 perl xml2lst.pl < /usr/share/X11/xkb/rules/base.xml > layouts-variants.lst
 while read line; do
   XKBLAYOUT=`echo "$line" | cut -d " " -f 1`
+  echo "$XKBLAYOUT" >> layouts-list.lst
   XKBVARIANT=`echo "$line" | cut -d " " -f 2`
   ckbcomp "$XKBLAYOUT" "$XKBVARIANT" | gzip > $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb/"$XKBLAYOUT"-"$XKBVARIANT".map.gz
 done < layouts-variants.lst
 
+# Convert X keyboard layouts (plain, no variant)
+cat layouts-list.lst | sort -u >> layouts-list-uniq.lst
+while read line; do
+  ckbcomp "$line" | gzip > $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb/"$line".map.gz
+done < layouts-list-uniq.lst
+
 %find_lang %{name}
 
 %files -f %{name}.lang
@@ -140,6 +147,9 @@ done < layouts-variants.lst
 /lib/kbd
 
 %changelog
+* Wed Aug 28 2013 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.15.5-7
+- Convert also plain layouts (no variant)
+
 * Thu May 23 2013 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.15.5-6
 - Add vlock to obsoletes
 


More information about the scm-commits mailing list