Accepting request 65948 from GNOME:Next

reviewed ok.

OBS-URL: https://build.opensuse.org/request/show/65948
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xkeyboard-config?expand=0&rev=66

microsoftnek4k.diff

@@ -2,7 +2,7 @@ Index: geometry/microsoft
 ===================================================================
 --- geometry/microsoft.orig
 +++ geometry/microsoft
-@@ -533,3 +533,43 @@ xkb_geometry "elite" {
+@@ -530,3 +530,43 @@ xkb_geometry "elite" {
      alias <AC00> = <CAPS>;
      alias <AA00> = <LCTL>;
  };
@@ -112,7 +112,7 @@ Index: rules/base.xml.in
 ===================================================================
 --- rules/base.xml.in.orig
 +++ rules/base.xml.in
-@@ -869,6 +869,13 @@
+@@ -876,6 +876,13 @@
      </model>
      <model>
        <configItem>
@@ -130,7 +130,7 @@ Index: symbols/inet
 ===================================================================
 --- symbols/inet.orig
 +++ symbols/inet
-@@ -1407,6 +1407,42 @@ xkb_symbols "microsoftmult" {
+@@ -1423,6 +1423,42 @@ xkb_symbols "microsoftmult" {
  }; 
  
  
@@ -177,7 +177,7 @@ Index: keycodes/Makefile.in
 ===================================================================
 --- keycodes/Makefile.in.orig
 +++ keycodes/Makefile.in
-@@ -238,6 +238,7 @@ fujitsu \
+@@ -243,6 +243,7 @@ fujitsu \
  hp \
  ibm \
  macintosh \
@@ -190,8 +190,8 @@ Index: rules/base.lists.part
 --- rules/base.lists.part.orig
 +++ rules/base.lists.part
 @@ -60,6 +60,7 @@
- 	      logidinovo logidinovoedge \
-               microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \
+               logidinovo logidinovoedge \
+               microsoft4000 microsoft7000 microsoftinet microsoftprousb microsoftprooem microsoftprose \
                microsoftoffice microsoftmult \
 +              microsoftnek4k \
                mx1998 mx2500 mx2750 \

xkeyboard-config-2.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f9ee8340f2afadd2397aa4402eaf854da3738977accdbf147bc47c1cc99a3075
-size 699368

xkeyboard-config-2.2.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:61e6a512e91d10d31906825cef1444586e62b0d0ad02f3cf6820aaa7e02a8dc3
+size 737046

xkeyboard-config.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Mon Apr  4 11:50:14 UTC 2011 - fcrozat@novell.com
+
+- Update to version 2.2:
+  + fdo#35642: major change in Burmese layout
+
+-------------------------------------------------------------------
+Mon Mar 28 16:44:40 UTC 2011 - fcrozat@novell.com
+
+- Update to version 2.1.99:
+  + Major changes in descriptions: for GNOME3 release
+  + Some new layouts and models. Translations are not updated.
+  + Checking runtime dependencies at build time
+- Rebase microsoftnek4k.diff
+- Disable runtime dependencies check at build time, not relevant
+  for us.
+
 -------------------------------------------------------------------
 Mon Feb 14 19:49:24 CET 2011 - sbrabec@suse.cz
 

xkeyboard-config.spec

@@ -27,8 +27,8 @@ Requires:       xorg-x11
 Provides:       xorg-x11:/etc/X11/xkb/symbols/us XFree86:/etc/X11/xkb/symbols/us
 PreReq:         /bin/ln /bin/rm
 AutoReqProv:    on
-Version:        2.1
-Release:        6
+Version:        2.2
+Release:        1
 Summary:        The X Keyboard Extension
 Source:         %name-%version.tar.bz2
 Patch40:        xkeyboard-config.macintosh.patch
@@ -79,6 +79,7 @@ translation-update-upstream
 %configure --with-xkb-rules-symlink=xfree86,xorg \
             --with-xkb-base=/usr/share/X11/xkb \
             --enable-compat_rules \
+            --disable-runtime-deps \
             --disable-xkbcomp-symlink
 rm -f */*.dir
 make