- Update to version 2.31

* latest bugfix release
- supersedes U_Fix-symbols-in-syntax-error-spurious-git-conflict-ma.patch
- adjusted n_suse-ctrl-alt-bksp-terminate.patch

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

U_Fix-symbols-in-syntax-error-spurious-git-conflict-ma.patch

@@ -1,26 +0,0 @@
-From c8d68304c826567f27f5a913dd38f6e045b81483 Mon Sep 17 00:00:00 2001
-From: Pritam Baral <pritam@pritambaral.com>
-Date: Thu, 11 Jun 2020 04:02:27 +0000
-Subject: [PATCH] Fix symbols/in syntax error: spurious git conflict marker
-
-Introduced in https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/93ea944c2599584a4dd1add1725fafd19fef2535#904fcb1a2ae93630fa2905a7fd0ced3f8e50a6e8_2329_2329
----
- symbols/in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/symbols/in b/symbols/in
-index 3ca78a2..b3a5ca9 100644
---- a/symbols/in
-+++ b/symbols/in
-@@ -2326,7 +2326,7 @@ xkb_symbols "marathi" {
- 	key <AB09> { [ period, U0964, U0965, U093d ] };
- 	key <AB10> { [ U092f, question, slash, question ] };
- };
--=======
-+
- // EXTRAS:
- 
- //           Modi is an ancient Indian script that is used to write texts in Marathi, Hindi and Sanskrit.
--- 
-2.16.4
-

n_suse-ctrl-alt-bksp-terminate.patch

@@ -1,7 +1,9 @@
-diff -u -r xkeyboard-config-2.16.orig/rules/evdev.m_s.part xkeyboard-config-2.16/rules/evdev.m_s.part
+Index: xkeyboard-config-2.31/rules/0026-evdev.m_s.part
---- xkeyboard-config-2.16.orig/rules/evdev.m_s.part	2015-10-20 16:46:14.666938000 +0200
+===================================================================
-+++ xkeyboard-config-2.16/rules/evdev.m_s.part	2015-10-20 16:47:50.094095000 +0200
+--- xkeyboard-config-2.31.orig/rules/0026-evdev.m_s.part
-@@ -1,4 +1,4 @@
++++ xkeyboard-config-2.31/rules/0026-evdev.m_s.part
+@@ -1,5 +1,5 @@
+ ! model		=	symbols
 -  $evdevkbds    =   +inet(evdev)+inet(%m)
 -  chromebook    =   +inet(evdev)+inet(chromebook)
 -  applealu_jis  =   +inet(evdev)+macintosh_vndr/jp(alujiskeys)

xkeyboard-config-2.30.tar.bz2

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

xkeyboard-config-2.31.tar.bz2

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

xkeyboard-config.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Oct  7 10:28:39 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to version 2.31
+  * latest bugfix release
+- supersedes U_Fix-symbols-in-syntax-error-spurious-git-conflict-ma.patch
+- adjusted n_suse-ctrl-alt-bksp-terminate.patch
+
 -------------------------------------------------------------------
 Fri Jul 24 19:08:33 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
 

xkeyboard-config.spec

@@ -17,7 +17,7 @@
 
 
 Name:           xkeyboard-config
-Version:        2.30
+Version:        2.31
 Release:        0
 Summary:        The X Keyboard Extension
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT AND CDDL-1.0
@@ -27,7 +27,6 @@ Source:         http://xorg.freedesktop.org/archive/individual/data/%{name}/%{na
 Patch100:       n_suse-ctrl-alt-bksp-terminate.patch
 # PATCH-FIX-OPENSUSE disable-2xalt_2xctrl-toggle.diff fdo#4927 -- This is just a workaround until fdo#4927 is fixed
 Patch109:       n_disable-2xalt_2xctrl-toggle.diff
-Patch110:       U_Fix-symbols-in-syntax-error-spurious-git-conflict-ma.patch
 BuildRequires:  fdupes
 BuildRequires:  intltool
 BuildRequires:  pkgconfig
@@ -55,7 +54,6 @@ make keyboards more accessible to people with physical impairments.
 #translation-update-upstream
 %patch100 -p1
 %patch109 -p1
-%patch110 -p1
 
 %build
 %configure \