From 24520a2f857590dd08aa6dbeb85b9a4932448fdc193b9a0845a0b0f4ef495fb0 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Thu, 2 Jun 2022 07:47:08 +0000
Subject: [PATCH] - Update to version 2.36   * bugfixes   * removed autotools
 support :-( - switched to meson

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xkeyboard-config?expand=0&rev=163
---
 xkeyboard-config-2.34.tar.bz2 |  3 ---
 xkeyboard-config-2.36.tar.xz  |  3 +++
 xkeyboard-config.changes      |  8 ++++++++
 xkeyboard-config.spec         | 19 +++++++++----------
 4 files changed, 20 insertions(+), 13 deletions(-)
 delete mode 100644 xkeyboard-config-2.34.tar.bz2
 create mode 100644 xkeyboard-config-2.36.tar.xz

diff --git a/xkeyboard-config-2.34.tar.bz2 b/xkeyboard-config-2.34.tar.bz2
deleted file mode 100644
index d2c5005..0000000
--- a/xkeyboard-config-2.34.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b321d27686ee7e6610ffe7b56e28d5bbf60625a1f595124cd320c0caa717b8ce
-size 1763558
diff --git a/xkeyboard-config-2.36.tar.xz b/xkeyboard-config-2.36.tar.xz
new file mode 100644
index 0000000..6842a04
--- /dev/null
+++ b/xkeyboard-config-2.36.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1f1bb1292a161d520a3485d378609277d108cd07cde0327c16811ff54c3e1595
+size 880776
diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes
index e9582bc..bc55b7a 100644
--- a/xkeyboard-config.changes
+++ b/xkeyboard-config.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Jun  2 02:21:07 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
+
+- Update to version 2.36 
+  * bugfixes
+  * removed autotools support :-(
+- switched to meson 
+
 -------------------------------------------------------------------
 Fri Feb 18 17:36:39 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index e357c53..457e14a 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -17,17 +17,18 @@
 
 
 Name:           xkeyboard-config
-Version:        2.34
+Version:        2.36
 Release:        0
 Summary:        The X Keyboard Extension
 License:        CDDL-1.0 AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT
 Group:          System/X11/Utilities
 URL:            https://www.freedesktop.org/Software/XKeyboardConfig
-Source:         https://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.bz2
+Source:         https://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.xz
 # 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
 BuildRequires:  fdupes
 BuildRequires:  intltool
+BuildRequires:  meson
 BuildRequires:  pkgconfig
 BuildRequires:  python3
 BuildRequires:  xsltproc
@@ -51,16 +52,14 @@ make keyboards more accessible to people with physical impairments.
 %patch109 -p1
 
 %build
-%configure \
-            --disable-silent-rules \
-            --with-xkb-rules-symlink=xorg \
-            --with-xkb-base=%{_datadir}/X11/xkb \
-            --enable-compat_rules \
-            --disable-runtime-deps
-%make_build
+%{meson} \
+    -Dxkb-base=%{_datadir}/X11/xkb \
+    -Dcompat-rules=true \
+    -Dxorg-rules-symlinks=true
+%{meson_build}
 
 %install
-%make_install
+%{meson_install}
 mkdir -p %{buildroot}%{_localstatedir}/lib/xkb
 # Bug 335553
 mkdir -p %{buildroot}%{_localstatedir}/lib/xkb/compiled/