system-config-keyboard has the keyboard bits now, so let's use
those rather than the ones from rhpl
---
anaconda | 2 +-
anaconda.spec.in | 2 +-
instdata.py | 2 +-
scripts/getkeymaps | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/anaconda b/anaconda
index aef0c95..03dbe5c 100755
--- a/anaconda
+++ b/anaconda
@@ -774,7 +774,7 @@ if __name__ == "__main__":
import instdata
- import rhpl.keyboard as keyboard
+ import system_config_keyboard.keyboard as keyboard
log.info("anaconda called with cmdline = %s" %(sys.argv,))
log.info("Display mode = %s" %(opts.display_mode,))
diff --git a/anaconda.spec.in b/anaconda.spec.in
index 81adcd6..964e495 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -115,7 +115,7 @@ Requires: mdadm
Requires: lvm2
Requires: util-linux-ng >= 2.15.1
%ifnarch s390 s390x ppc64
-Requires: system-config-keyboard
+Requires: system-config-keyboard >= 1.3.0
%endif
Requires: hal, dbus-python
Requires: cracklib-python
diff --git a/instdata.py b/instdata.py
index 488616b..6700528 100644
--- a/instdata.py
+++ b/instdata.py
@@ -40,7 +40,7 @@ import shlex
from flags import *
from constants import *
from simpleconfig import SimpleConfigFile
-import rhpl.keyboard as keyboard
+import system_config_keyboard.keyboard as keyboard
from pykickstart.version import versionToString, DEVEL
diff --git a/scripts/getkeymaps b/scripts/getkeymaps
index 2e003a7..8436900 100755
--- a/scripts/getkeymaps
+++ b/scripts/getkeymaps
@@ -51,7 +51,7 @@ else
PATTERN=i386
fi
-MAPS=$(python -c "import rhpl.keyboard_models ; rhpl.keyboard_models.get_supported_models()")
+MAPS=$(python -c "import system_config_keyboard.keyboard_models ; system_config_keyboard.keyboard_models.get_supported_models()")
for map in $MAPS ; do
eval find /lib/kbd/keymaps/$PATTERN -name "$map.map*.gz" | while read n; do
--
1.6.1
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
