From 0220eceeec85bdf97720c4de3aa77e3bff2dbf6d Mon Sep 17 00:00:00 2001
From: zhangshaoning <zhangshaoning@uniontech.com>
Date: Fri, 3 Dec 2021 17:07:24 +0800
Subject: [PATCH] remove duplicate cm and tel-kagapa

---
 0001-remove-duplicate-cm-tel-kagapa.patch | 61 +++++++++++++++++++++++
 xkeyboard-config.spec                     |  6 ++-
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 0001-remove-duplicate-cm-tel-kagapa.patch

diff --git a/0001-remove-duplicate-cm-tel-kagapa.patch b/0001-remove-duplicate-cm-tel-kagapa.patch
new file mode 100644
index 0000000..cd5119a
--- /dev/null
+++ b/0001-remove-duplicate-cm-tel-kagapa.patch
@@ -0,0 +1,61 @@
+From 653aed55ed79f4702eae53a95ffa48921ec6118a Mon Sep 17 00:00:00 2001
+From: zhangshaoning <zhangshaoning@uniontech.com>
+Date: Wed, 17 Nov 2021 14:17:50 +0800
+Subject: [PATCH] remove duplicate cm && tel-kagapa
+
+---
+ rules/base.extras.xml | 15 ---------------
+ rules/evdev.xml       | 11 -----------
+ 2 files changed, 26 deletions(-)
+
+diff --git a/rules/base.extras.xml b/rules/base.extras.xml
+index 850f110..08699f8 100644
+--- a/rules/base.extras.xml
++++ b/rules/base.extras.xml
+@@ -1272,21 +1272,6 @@
+         </languageList>
+       </configItem>
+     </layout>
+-    <layout>
+-      <configItem popularity="exotic">
+-        <name>cm</name>
+-        <shortDescription>cm</shortDescription>
+-        <description>English (Cameroon)</description>
+-      </configItem>
+-      <variantList>
+-        <variant>
+-          <configItem popularity="exotic">
+-            <name>mmuock</name>
+-            <description>Mmuock</description>
+-          </configItem>
+-        </variant>
+-      </variantList>
+-    </layout>
+     <layout>
+       <configItem popularity="exotic">
+         <name>trans</name>
+diff --git a/rules/evdev.xml b/rules/evdev.xml
+index a13af8f..71579f5 100644
+--- a/rules/evdev.xml
++++ b/rules/evdev.xml
+@@ -2187,17 +2187,6 @@
+             </languageList>
+           </configItem>
+         </variant>
+-        <variant>
+-          <configItem>
+-            <name>tel-kagapa</name>
+-            <!-- Keyboard indicator for Telugu layouts -->
+-            <shortDescription>te</shortDescription>
+-            <description>Telugu (KaGaPa, phonetic)</description>
+-            <languageList>
+-              <iso639Id>tel</iso639Id>
+-            </languageList>
+-          </configItem>
+-        </variant>
+         <variant>
+           <configItem>
+             <name>urd-phonetic</name>
+-- 
+2.20.1
+
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index bd1164e..18119f4 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -1,12 +1,13 @@
 Name:		xkeyboard-config
 Version:	2.30
-Release:	1
+Release:	2
 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
+Patch02:        0001-remove-duplicate-cm-tel-kagapa.patch
 
 BuildArch:      noarch
 BuildRequires:	gettext gettext-devel libtool libxslt perl(XML::Parser) pkgconfig(glib-2.0) xkbcomp
@@ -63,6 +64,9 @@ autoreconf -v --force --install || exit 1
 %{_mandir}/man7/xkeyboard-config.*
 
 %changelog
+* Fri Dec 3 2021 zhangshaoning <zhangshaoning@uniontech.com> - 2.30-2
+- remove duplicate cm and tel-kagapa
+
 * Tue Aug 18 2020 zhanzhimin <zhanzhimin@huawei.com> - 2.30-1
 - Upgrade to 2.30-1