From 3a49001ae20b38bfe6cf60c0d5cc8a7a5f4d5f3a Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Tue, 16 Feb 2021 04:15:22 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/xkeyboard-config.git#51aeddd7cbfc90f3e97ebdbab3c9a8283f4d1642
---
 sources               |  2 +-
 xkeyboard-config.spec | 26 ++++++++++++--------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/sources b/sources
index b282178..f91e23c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xkeyboard-config-2.31.tar.bz2) = f6f260253e1757640cc0591f9efb55ad5d08023a53ec2f0b468465b36bae0aae4f78dc4d6e603c95aa21c9993d9a42bd641edf2017be3183921a0b1c125f4669
+SHA512 (xkeyboard-config-2.32.tar.bz2) = c082a86efcf69ab50454875686b9b4c388cf48002de3728331de3c09c1349a38c9b9ad8ecace2215061c0c775e59c3dd230fffe3f24db63790aa71dc8eff8dea
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index 901f3e8..9e4c804 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -6,8 +6,8 @@
 
 Summary:    X Keyboard Extension configuration data
 Name:       xkeyboard-config
-Version:    2.31
-Release:    4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Version:    2.32
+Release:    1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 License:    MIT
 URL:        http://www.freedesktop.org/wiki/Software/XKeyboardConfig
 
@@ -22,7 +22,7 @@ Source0:    http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-
 BuildArch:  noarch
 
 BuildRequires:  gettext gettext-devel
-BuildRequires:  libtool make
+BuildRequires:  meson
 BuildRequires:  libxslt
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  pkgconfig(glib-2.0)
@@ -48,16 +48,11 @@ Development files for %{name}.
 %autosetup -S git
 
 %build
-autoreconf -v --force --install || exit 1
-%configure \
-    --enable-compat-rules \
-    --with-xkb-base=%{_datadir}/X11/xkb \
-    --with-xkb-rules-symlink=xorg
-
-make %{?_smp_mflags}
+%meson -Dcompat-rules=true
+%meson_build
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+%meson_install
 
 # Remove unnecessary symlink
 rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
@@ -74,15 +69,18 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 
 %files -f files.list -f %{name}.lang
 %doc AUTHORS README NEWS COPYING docs/README.* docs/HOWTO.*
-%{_datadir}/X11/xkb/rules/xorg
-%{_datadir}/X11/xkb/rules/xorg.lst
-%{_datadir}/X11/xkb/rules/xorg.xml
 %{_mandir}/man7/xkeyboard-config.*
 
 %files devel
 %{_datadir}/pkgconfig/xkeyboard-config.pc
 
 %changelog
+* Tue Feb 16 2021 Peter Hutterer <peter.hutterer@redhat.com> 2.32-1
+- xkeyboard-config 2.32
+- build with meson now
+- drop the xorg ruleset, no longer in use. Everything is hardcoded to evdev
+  these days.
+
 * Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.31-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild