From d7f9304c8dab7096f2e90af236bf0c4d6061c0a6 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Fri, 8 Jun 2018 17:52:39 +0200
Subject: [PATCH] - updated to 2.24 - removed obsolete pl patch

---
 xkeyboard-config-pl.patch | 11 -----------
 xkeyboard-config.spec     | 11 +++++------
 2 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 xkeyboard-config-pl.patch

diff --git a/xkeyboard-config-pl.patch b/xkeyboard-config-pl.patch
deleted file mode 100644
index 2198eab..0000000
--- a/xkeyboard-config-pl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urN xkeyboard-config-2.23.1.org/symbols/pl xkeyboard-config-2.23.1/symbols/pl
---- xkeyboard-config-2.23.1.org/symbols/pl	2018-01-31 20:06:08.000000000 +0100
-+++ xkeyboard-config-2.23.1/symbols/pl	2018-02-01 18:18:24.763390795 +0100
-@@ -497,7 +497,6 @@
-        include "sun_vndr/pl(sun_type6)"
- };
- 
--------------------------------
- //Glagolica
- partial alphanumeric_keys
- xkb_symbols "glagolica"
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index cd77312..8d939eb 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -1,25 +1,25 @@
 Summary:	X Keyboard Configuration Database
 Summary(pl.UTF-8):	Baza danych konfiguracji klawiatury pod X
 Name:		xkeyboard-config
-Version:	2.23.1
-Release:	2
+Version:	2.24
+Release:	1
 License:	MIT
 Group:		X11/Development/Libraries
 Source0:	https://xorg.freedesktop.org/releases/individual/data/xkeyboard-config/%{name}-%{version}.tar.bz2
-# Source0-md5:	875cbd09ab8394277fd16070326abbae
-Patch0:		xkeyboard-config-pl.patch
+# Source0-md5:	74c4bdf52382127cb5802c3f2ab441e0
 URL:		https://www.freedesktop.org/wiki/Software/XKeyboardConfig
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
 BuildRequires:	gettext-tools >= 0.17
 BuildRequires:	intltool >= 0.30
 BuildRequires:	rpmbuild(macros) >= 1.446
-BuildRequires:	xorg-app-xkbcomp
 BuildRequires:	xorg-util-util-macros >= 1.12
 # for sinhala layouts
 Requires:	xorg-lib-libX11 >= 1.4.3
 Provides:	xorg-data-xkbdata
 Obsoletes:	xorg-data-xkbdata < 0.9
+# due to large maximum keycode handling
+Conflicts:	xorg-app-xkbcomp < 1.4.2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -40,7 +40,6 @@ systemów opartych na XKB.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__intltoolize}
-- 
2.44.0