- fixed: http://freedesktop.org/bugzilla/show_bug.cgi?id=531

Changed files:
    X11-setxkbmap.patch -> 1.1
    X11.spec -> 1.24

diff --git a/X11-setxkbmap.patch b/X11-setxkbmap.patch
new file mode 100644 (file)
index 0000000..b229e1c
--- /dev/null
+++ b/X11-setxkbmap.patch
@@ -0,0 +1,9 @@
+diff -urN X11-6.7.0.orig/xc/programs/xkbcomp/rules/Imakefile X11-6.7.0/xc/programs/xkbcomp/rules/Imakefile
+--- X11-6.7.0.orig/xc/programs/xkbcomp/rules/Imakefile 2004-05-26 15:12:16.000000000 +0200
++++ X11-6.7.0/xc/programs/xkbcomp/rules/Imakefile      2004-05-26 15:14:15.000000000 +0200
+@@ -9,4 +9,5 @@
+ InstallMultiple($(DATAFILES),$(LIBDIR)/xkb/rules)
+ InstallMultiple($(LISTFILES),$(LIBDIR)/xkb/rules)
+ InstallCreateLink($(LIBDIR)/xkb/rules,xorg,xfree86)
++InstallCreateLink($(LIBDIR)/xkb/rules,xorg.lst,xfree86.lst)
+ DependTarget()

diff --git a/X11.spec b/X11.spec
index e57c027fc847749995d202f98fc2acf8f23b40f7..0a57745fae204fc61f53449f1a4a103c453b7255 100644 (file)
--- a/X11.spec
+++ b/X11.spec
@@ -120,6 +120,7 @@ Patch47:    XFree86-sparc-kbd.patch
 Patch50:       %{name}-xterm-256colors.patch
 Patch52:       XFree86-kernel_headers.patch
 Patch53:       XFree86-stdint.patch
+Patch54:       %{name}-setxkbmap.patch
 URL:           http://www.x.org/
 BuildRequires: /usr/bin/perl
 %ifarch %{ix86} alpha amd64
@@ -1787,6 +1788,7 @@ X11-libs.
 %patch50 -p0
 %patch52 -p1
 %patch53 -p0
+%patch54 -p1
 
 rm -f xc/config/cf/host.def