Rename conflicting keymaps to have unique names

kbd.spec

@@ -1,6 +1,6 @@
 Name:           kbd
 Version:        1.15
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Tools for configuring the console (keyboard, virtual terminals, etc.)
 
 Group:          System Environment/Base
@@ -47,6 +47,13 @@ mv azerty/fr.map azerty/fr-old.map
 cp azerty/fr-latin9.map azerty/fr.map
 
 cp azerty/fr-latin9.map azerty/fr-latin0.map # legacy alias
+
+# Rename conflicting keymaps
+mv dvorak/no.map dvorak/no-dvorak.map
+mv fgGIod/trf.map fgGIod/trf-fgGIod.map
+mv olpc/es.map olpc/es-olpc.map
+mv olpc/pt.map olpc/pt-olpc.map
+mv qwerty/cz.map qwerty/cz-qwerty.map
 popd
 
 %build
@@ -102,6 +109,10 @@ rm -rf $RPM_BUILD_ROOT
 /lib/kbd
 
 %changelog
+* Thu Jan 29 2009 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.15-3
+- Rename conflicting keymaps to have unique names
+  Resolves: #481674
+
 * Mon Jan 12 2009 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.15-2
 - Move loadkeys to /bin