xkeyboard-config 2.31

0001-Fix-symbols-in-syntax-error-spurious-git-conflict-ma.patch

@@ -1,27 +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 xkeyboard-config] 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.26.2
-

sources

@@ -1 +1 @@
-SHA512 (xkeyboard-config-2.30.tar.bz2) = 2d775dcaab49d80f62b8eaadc9be406b42c9a3643d3a360f864a462c61865abce67d0a8a80772d54f8136603114c61b5168fd06771f9c132411911914abb1ea4
+SHA512 (xkeyboard-config-2.31.tar.bz2) = f6f260253e1757640cc0591f9efb55ad5d08023a53ec2f0b468465b36bae0aae4f78dc4d6e603c95aa21c9993d9a42bd641edf2017be3183921a0b1c125f4669

xkeyboard-config.spec

@@ -6,8 +6,8 @@
 
 Summary:    X Keyboard Extension configuration data
 Name:       xkeyboard-config
-Version:    2.30
+Version:    2.31
-Release:    3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Release:    1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 License:    MIT
 URL:        http://www.freedesktop.org/wiki/Software/XKeyboardConfig
 
@@ -19,8 +19,6 @@ Source2:    commitid
 Source0:    http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.bz2
 %endif
 
-Patch01:    0001-Fix-symbols-in-syntax-error-spurious-git-conflict-ma.patch
-
 BuildArch:  noarch
 
 BuildRequires:  gettext gettext-devel
@@ -79,7 +77,7 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 }
 
 %files -f files.list -f %{name}.lang
-%doc AUTHORS README NEWS TODO COPYING docs/README.* docs/HOWTO.*
+%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
@@ -89,6 +87,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 %{_datadir}/pkgconfig/xkeyboard-config.pc
 
 %changelog
+* Wed Oct 07 2020 Peter Hutterer <peter.hutterer@redhat.com> 2.31-1
+- xkeyboard-config 2.31
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.30-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild