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-2.24.tar.bz2 b/xkeyboard-config-2.24.tar.bz2
deleted file mode 100644
index 3747444..0000000
Binary files a/xkeyboard-config-2.24.tar.bz2 and /dev/null differ
diff --git a/xkeyboard-config-2.30.tar.bz2 b/xkeyboard-config-2.30.tar.bz2
new file mode 100644
index 0000000..cc82bd2
Binary files /dev/null and b/xkeyboard-config-2.30.tar.bz2 differ
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index e753b8d..5624698 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -1,14 +1,16 @@
 Name:		xkeyboard-config
-Version:	2.24
-Release:	6
+Version:	2.30
+Release:	1
 Summary:	The X Keyboard Extension
 License:	MIT
 URL:	        https://www.freedesktop.org/wiki/Software/XKeyboardConfig
 Source0:	https://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.bz2
 
+Patch01:        0001-Fix-symbols-in-syntax-error-spurious-git-conflict-ma.patch
+
 BuildArch:      noarch
-BuildRequires:	gettext intltool libtool libxslt perl-XML-Parser glib2-devel 
-BuildRequires:  xorg-x11-util-macros xorg-x11-proto-devel xorg-x11-xkb-utils libX11-devel
+BuildRequires:	gettext gettext-devel libtool libxslt perl(XML::Parser) pkgconfig(glib-2.0) xkbcomp
+BuildRequires:	pkgconfig(x11) >= 1.4.3 pkgconfig(xorg-macros) >= 1.12	pkgconfig(xproto) >= 7.0.20
 
 %description
 The non-arch keyboard configuration database for X Window. The goal is to
@@ -29,7 +31,7 @@ Header files for xkeyboard-config
 %autosetup -n %{name}-%{version} -p1 
 
 %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 --with-xkb-rules-symlink=xorg
 %make_build
 
@@ -57,10 +59,13 @@ AUTOPOINT="intltoolize --automake --copy" autoreconf -v --force --install || exi
 
 %files          help
 %defattr(-,root,root)
-%doc README docs/README docs/HOWTO.* TODO NEWS
-%{_mandir}/man7/*.gz
+%doc README docs/README.* docs/HOWTO.* TODO NEWS
+%{_mandir}/man7/xkeyboard-config.*
 
 %changelog
+* Mon Jul 20 2020 chengguipeng<chengguipeng1@huawei.com> - 2.30-1
+- Upgrade to 2.30-1
+
 * Sat Oct 19 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.24-6
 - Type:bugfix
 - Id:NA