rpms/fedora-setup-keyboard/devel fedora-setup-keyboard.spec, 1.1, 1.2

[Peter Hutterer]

Author: whot

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

Modified Files:
	fedora-setup-keyboard.spec 
Log Message:
* Thu Mar 05 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.3-3
- Conflict xorg-x11-server-Xorg < 1.6.0-7 (10-x11-keymap.fdi and
  fedora-setup-keyboard up to 1.6.0-5)




Index: fedora-setup-keyboard.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-setup-keyboard/devel/fedora-setup-keyboard.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-setup-keyboard.spec	3 Mar 2009 08:01:47 -0000	1.1
+++ fedora-setup-keyboard.spec	4 Mar 2009 22:53:44 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		fedora-setup-keyboard
 Version:	0.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Hal keyboard layout callout
 
 Group:		Applications/System
@@ -14,6 +14,7 @@
 BuildRequires:	rhpl
 
 Requires:	hal    
+Conflicts:	xorg-x11-server-Xorg < 1.6.0-7
 
 %description
 %{name} gets invoked by hal to apply the keyboard layout
@@ -43,6 +44,10 @@
 %doc COPYING
 
 %changelog
+* Thu Mar 05 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.3-3
+- Conflict xorg-x11-server-Xorg < 1.6.0-7 (10-x11-keymap.fdi and
+  fedora-setup-keyboard up to 1.6.0-5)
+
 * Mon Mar 02 2009 Adel Gadllah <adel.gadllah at gmail.com> 0.3-2
 - Fix license tag