rpms/fedora-setup-keyboard/devel .cvsignore, 1.3, 1.4 fedora-setup-keyboard.spec, 1.7, 1.8 sources, 1.3, 1.4 0001-rhpl-is-replaced-by-system-config-keyboard.patch, 1.1, NONE

[drago01]

Author: drago01

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

Modified Files:
	.cvsignore fedora-setup-keyboard.spec sources 
Removed Files:
	0001-rhpl-is-replaced-by-system-config-keyboard.patch 
Log Message:
0.5 release


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-setup-keyboard/devel/.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	20 Nov 2009 22:57:59 -0000	1.4
@@ -1 +1 @@
-fedora-setup-keyboard-0.4.tar.bz2
+fedora-setup-keyboard-0.5.tar.bz2


Index: fedora-setup-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-setup-keyboard/devel/fedora-setup-keyboard.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- fedora-setup-keyboard.spec	20 Nov 2009 00:37:37 -0000	1.7
+++ fedora-setup-keyboard.spec	20 Nov 2009 22:57:59 -0000	1.8
@@ -1,6 +1,6 @@
 Name:		fedora-setup-keyboard
-Version:	0.4
-Release:	4%{?dist}
+Version:	0.5
+Release:	1%{?dist}
 Summary:	Hal keyboard layout callout
 
 Group:		Applications/System
@@ -9,8 +9,6 @@ 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:	system-config-keyboard
@@ -24,7 +22,6 @@ defined in /etc/sysconfig/keyboard.
 
 %prep
 %setup -q
-%patch1 -p1 
 
 %build
 make CFLAGS="%{optflags}" %{?_smp_mflags}
@@ -46,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING
 
 %changelog
+* Fri Nov 20 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.5-1
+- Patch merged upstream
+
 * Fri Nov 20 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.4-4
 - rhpl was replaced by system-config-keyboard.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-setup-keyboard/devel/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	20 Nov 2009 22:57:59 -0000	1.4
@@ -1 +1 @@
-1a42b001f19e615aa81211fd35b6fc41  fedora-setup-keyboard-0.4.tar.bz2
+61aaeb2520ba757b280aa5eb3395d5fd  fedora-setup-keyboard-0.5.tar.bz2


--- 0001-rhpl-is-replaced-by-system-config-keyboard.patch DELETED ---