From c936b26de4c35235d6e824a4b4086894190ffb5c Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 28 Apr 2020 04:48:44 -0400
Subject: [PATCH] import xkeyboard-config-2.28-1.el8

---
 .gitignore                  |  2 +-
 .xkeyboard-config.metadata  |  2 +-
 SPECS/xkeyboard-config.spec | 12 +++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3407308..7d23548 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/xkeyboard-config-2.24.tar.bz2
+SOURCES/xkeyboard-config-2.28.tar.bz2
diff --git a/.xkeyboard-config.metadata b/.xkeyboard-config.metadata
index 3d6978a..3062a6a 100644
--- a/.xkeyboard-config.metadata
+++ b/.xkeyboard-config.metadata
@@ -1 +1 @@
-2df5b347a4cd9891d2a15fdc4c1734629756a070 SOURCES/xkeyboard-config-2.24.tar.bz2
+f521cd49ab04f54778779dddc68e1771de2e8fbb SOURCES/xkeyboard-config-2.28.tar.bz2
diff --git a/SPECS/xkeyboard-config.spec b/SPECS/xkeyboard-config.spec
index fd1ded1..f66f360 100644
--- a/SPECS/xkeyboard-config.spec
+++ b/SPECS/xkeyboard-config.spec
@@ -6,8 +6,8 @@
 
 Summary:    X Keyboard Extension configuration data
 Name:       xkeyboard-config
-Version:    2.24
-Release:    3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Version:    2.28
+Release:    1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 License:    MIT
 URL:        http://www.freedesktop.org/wiki/Software/XKeyboardConfig
 
@@ -21,8 +21,7 @@ Source0:    http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-
 
 BuildArch:  noarch
 
-BuildRequires:  gettext
-BuildRequires:  intltool
+BuildRequires:  gettext gettext-devel
 BuildRequires:  libtool
 BuildRequires:  libxslt
 BuildRequires:  perl(XML::Parser)
@@ -53,7 +52,7 @@ Development files for %{name}.
 %autosetup -S git
 
 %build
-AUTOPOINT="intltoolize --automake --copy" autoreconf -v --force --install || exit 1
+autoreconf -v --force --install || exit 1
 %configure \
     --enable-compat-rules \
     --with-xkb-base=%{_datadir}/X11/xkb \
@@ -88,6 +87,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 %{_datadir}/pkgconfig/xkeyboard-config.pc
 
 %changelog
+* Tue Oct 29 2019 Peter Hutterer <peter.hutterer@redhat.com> 2.28-1
+- xkeyboard-config 2.28 (#1728817)
+
 * Fri Jul 06 2018 Peter Hutterer <peter.hutterer@redhat.com> 2.24-3
 - Remove high-keycode removal patches, xkbcomp 1.4.2 has been in stable for
   long enough (related #1587998)