rpms/fedora-setup-keyboard/F-11 fsk-rhpl.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 fedora-setup-keyboard.spec, 1.5, 1.6 sources, 1.3, 1.4

[drago01]

Author: drago01

Update of /cvs/pkgs/rpms/fedora-setup-keyboard/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8333

Modified Files:
	.cvsignore fedora-setup-keyboard.spec sources 
Added Files:
	fsk-rhpl.patch 
Log Message:
0.6 release

fsk-rhpl.patch:
 get_layouts.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-setup-keyboard/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	12 Apr 2009 22:59:29 -0000	1.3
+++ .cvsignore	26 Dec 2009 18:34:35 -0000	1.4
@@ -1 +1 @@
-fedora-setup-keyboard-0.4.tar.bz2
+fedora-setup-keyboard-0.6.tar.bz2


Index: fedora-setup-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-setup-keyboard/F-11/fedora-setup-keyboard.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- fedora-setup-keyboard.spec	27 May 2009 15:39:10 -0000	1.5
+++ fedora-setup-keyboard.spec	26 Dec 2009 18:34:35 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		fedora-setup-keyboard
-Version:	0.4
-Release:	2%{?dist}
+Version:	0.6
+Release:	1%{?dist}
 Summary:	Hal keyboard layout callout
 
 Group:		Applications/System
@@ -9,6 +9,7 @@ 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: fsk-rhpl.patch
 
 BuildRequires:	hal-devel
 BuildRequires:	glib2-devel
@@ -23,7 +24,7 @@ defined in /etc/sysconfig/keyboard.
 
 %prep
 %setup -q
-
+%patch1 -p1
 
 %build
 make CFLAGS="%{optflags}" %{?_smp_mflags}
@@ -45,6 +46,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING
 
 %changelog
+* Sat Dec 26 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.6-1
+- 0.6 release
+- Fixes RH #545970
+
 * Wed May 27 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.4-2
 - Rebuild to pick up rhpl changes
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-setup-keyboard/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	12 Apr 2009 22:59:30 -0000	1.3
+++ sources	26 Dec 2009 18:34:35 -0000	1.4
@@ -1 +1 @@
-1a42b001f19e615aa81211fd35b6fc41  fedora-setup-keyboard-0.4.tar.bz2
+da3bfaf0258f5a72142d6048a80b8b77  fedora-setup-keyboard-0.6.tar.bz2