rpms/fedora-setup-keyboard/devel 0001-rhpl-is-replaced-by-system-config-keyboard.patch, NONE, 1.1 fedora-setup-keyboard.spec, 1.6, 1.7

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/fedora-setup-keyboard/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9103

Modified Files:
	fedora-setup-keyboard.spec 
Added Files:
	0001-rhpl-is-replaced-by-system-config-keyboard.patch 
Log Message:
* Fri Nov 20 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.4-4
- rhpl was replaced by system-config-keyboard.


0001-rhpl-is-replaced-by-system-config-keyboard.patch:
 get_layouts.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

--- NEW FILE 0001-rhpl-is-replaced-by-system-config-keyboard.patch ---
>From c728ac5ab4316e59f96bd39c94f237bf23d04811 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Fri, 20 Nov 2009 10:28:49 +1000
Subject: [PATCH] rhpl is replaced by system-config-keyboard

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 get_layouts.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/get_layouts.py b/get_layouts.py
index 38e9bc8..7037a3c 100644
--- a/get_layouts.py
+++ b/get_layouts.py
@@ -25,9 +25,9 @@
 """
 
 
-import rhpl.keyboard_models
+import system_config_keyboard.keyboard_models
 
-kbd_models = rhpl.keyboard_models.KeyboardModels().get_models()
+kbd_models = system_config_keyboard.keyboard_models.KeyboardModels().get_models()
 
 for key in kbd_models:
 	(layout, model, variant, options) = tuple(kbd_models.get(key, ['', '', '', '', ''])[1:])
-- 
1.6.5.2



Index: fedora-setup-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-setup-keyboard/devel/fedora-setup-keyboard.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- fedora-setup-keyboard.spec	24 Jul 2009 22:38:36 -0000	1.6
+++ fedora-setup-keyboard.spec	20 Nov 2009 00:37:37 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		fedora-setup-keyboard
 Version:	0.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Hal keyboard layout callout
 
 Group:		Applications/System
@@ -9,10 +9,11 @@ URL:		http://git.fedorahosted.org/git/fe
 Source0:	https://fedorahosted.org/releases/f/e/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1:         0001-rhpl-is-replaced-by-system-config-keyboard.patch
 
 BuildRequires:	hal-devel
 BuildRequires:	glib2-devel
-BuildRequires:	rhpl
+BuildRequires:	system-config-keyboard
 
 Requires:	hal    
 Conflicts:	xorg-x11-server-Xorg < 1.6.0-7
@@ -23,7 +24,7 @@ defined in /etc/sysconfig/keyboard.
 
 %prep
 %setup -q
-
+%patch1 -p1 
 
 %build
 make CFLAGS="%{optflags}" %{?_smp_mflags}
@@ -45,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING
 
 %changelog
+* Fri Nov 20 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.4-4
+- rhpl was replaced by system-config-keyboard.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild