[arch-commits] Commit in kbd/trunk (PKGBUILD)

[Roman Kyrylych]

    Date: Saturday, July 18, 2009 @ 12:58:41
  Author: roman
Revision: 46501

upgpkg: kbd 1.15-2
    Fixed FS#13837

Modified:
  kbd/trunk/PKGBUILD

----------+
 PKGBUILD |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-18 16:27:56 UTC (rev 46500)
+++ PKGBUILD	2009-07-18 16:58:41 UTC (rev 46501)
@@ -3,7 +3,7 @@
 
 pkgname=kbd
 pkgver=1.15
-pkgrel=1
+pkgrel=2
 pkgdesc="Keytable files and keyboard utilities"
 arch=('i686' 'x86_64')
 url="ftp://ftp.altlinux.org/pub/people/legion/kbd/"
@@ -15,6 +15,17 @@
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
+
+  # rename keymap files with the same names
+  # this is needed because when only name of keymap is specified
+  # loadkeys loads the first keymap it can find, which is bad (see FS#13837)
+  # this should be removed when upstream adopts the change
+  mv data/keymaps/i386/qwertz/cz{,-qwertz}.map
+  mv data/keymaps/i386/olpc/es{,-olpc}.map
+  mv data/keymaps/i386/olpc/pt{,-olpc}.map
+  mv data/keymaps/i386/dvorak/no{,-dvorak}.map
+  mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map
+
   ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man
   make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes || return 1
   make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${startdir}/pkg install
@@ -25,4 +36,3 @@
   mkdir ${startdir}/pkg/bin
   ln -s /usr/bin/loadkeys ${startdir}/pkg/bin/loadkeys
 }
-