From 0d38ee62114e49f10625b8e3b72fde98f6c0235a Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Jun 19 2020 01:34:42 +0000
Subject: Fix a syntax error in the indian symbols file


---

diff --git a/0001-Fix-symbols-in-syntax-error-spurious-git-conflict-ma.patch b/0001-Fix-symbols-in-syntax-error-spurious-git-conflict-ma.patch
new file mode 100644
index 0000000..bd75b28
--- /dev/null
+++ b/0001-Fix-symbols-in-syntax-error-spurious-git-conflict-ma.patch
@@ -0,0 +1,27 @@
+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
+
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index 0296c7c..fbb05be 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -7,7 +7,7 @@
 Summary:    X Keyboard Extension configuration data
 Name:       xkeyboard-config
 Version:    2.30
-Release:    1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Release:    2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 License:    MIT
 URL:        http://www.freedesktop.org/wiki/Software/XKeyboardConfig
 
@@ -19,6 +19,8 @@ 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
@@ -65,7 +67,7 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 # Remove unnecessary symlink
 rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
-%find_lang %{name} 
+%find_lang %{name}
 
 # Create filelist
 {
@@ -87,6 +89,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 %{_datadir}/pkgconfig/xkeyboard-config.pc
 
 %changelog
+* Fri Jun 19 2020 Peter Hutterer <peter.hutterer@redhat.com> 2.30-2
+- Fix a syntax error in the indian symbols file
+
 * Wed Jun 03 2020 Peter Hutterer <peter.hutterer@redhat.com> 2.30-1
 - xkeyboard-config 2.30