rpms/xorg-x11-server/F-12 xorg-x11-server.spec,1.514,1.515

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8510

Modified Files:
	xorg-x11-server.spec 
Log Message:
* Tue Jan 05 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.7.3-7
- Require xkeyboard-config, not xkbdata. xkbdata has been replaced by
  xkeyboard-config.



Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-12/xorg-x11-server.spec,v
retrieving revision 1.514
retrieving revision 1.515
diff -u -p -r1.514 -r1.515
--- xorg-x11-server.spec	4 Jan 2010 22:33:00 -0000	1.514
+++ xorg-x11-server.spec	5 Jan 2010 01:25:08 -0000	1.515
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.7.3
-Release:   6%{dist}
+Release:   7%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -143,7 +143,7 @@ Summary: Xorg server common files
 Group: User Interface/X
 Requires: pixman >= 0.14.0
 Requires: libselinux >= 2.0.79-1
-Requires: xkbdata xkbcomp
+Requires: xkeyboard-config xkbcomp
 
 %description common
 Common files shared among all X servers.
@@ -511,6 +511,10 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Tue Jan 05 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.7.3-7
+- Require xkeyboard-config, not xkbdata. xkbdata has been replaced by
+  xkeyboard-config.
+
 * Mon Jan 04 2010 Adam Jackson <ajax at redhat.com> 1.7.3-6
 - Build with V=1 for debugging.