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 deleted file mode 100644 index bd75b28..0000000 --- a/0001-Fix-symbols-in-syntax-error-spurious-git-conflict-ma.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c8d68304c826567f27f5a913dd38f6e045b81483 Mon Sep 17 00:00:00 2001 -From: Pritam Baral -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 { [ period, U0964, U0965, U093d ] }; - key { [ 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.30.tar.bz2 b/xkeyboard-config-2.30.tar.bz2 deleted file mode 100644 index cc82bd2..0000000 Binary files a/xkeyboard-config-2.30.tar.bz2 and /dev/null differ diff --git a/xkeyboard-config-2.33.tar.bz2 b/xkeyboard-config-2.33.tar.bz2 new file mode 100644 index 0000000..ad0a18e Binary files /dev/null and b/xkeyboard-config-2.33.tar.bz2 differ diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index 5624698..91cb76f 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -1,12 +1,11 @@ Name: xkeyboard-config -Version: 2.30 +Version: 2.33 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 gettext-devel libtool libxslt perl(XML::Parser) pkgconfig(glib-2.0) xkbcomp @@ -59,10 +58,13 @@ autoreconf -v --force --install || exit 1 %files help %defattr(-,root,root) -%doc README docs/README.* docs/HOWTO.* TODO NEWS +%doc README docs/README.* docs/HOWTO.* NEWS %{_mandir}/man7/xkeyboard-config.* %changelog +* Sat Nov 27 2021 wangkerong - 2.33-1 +- update to 2.33-1 + * Mon Jul 20 2020 chengguipeng - 2.30-1 - Upgrade to 2.30-1