diff --git a/U_Fix-typo-in-Polish-symbols-file.patch b/U_Fix-typo-in-Polish-symbols-file.patch deleted file mode 100644 index ba3bf3e..0000000 --- a/U_Fix-typo-in-Polish-symbols-file.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9a5cecf64ffc427a6a5a7c9a061992c32e5b8a4f Mon Sep 17 00:00:00 2001 -From: Gunnar Hjalmarsson -Date: Thu, 1 Feb 2018 15:37:46 +0100 -Subject: [PATCH] Fix typo in Polish symbols file - -https://bugs.freedesktop.org/show_bug.cgi?id=104904 ---- - symbols/pl | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/symbols/pl b/symbols/pl -index 52e7959..800cb85 100644 ---- a/symbols/pl -+++ b/symbols/pl -@@ -497,7 +497,6 @@ partial alphanumeric_keys - include "sun_vndr/pl(sun_type6)" - }; - -------------------------------- - //Glagolica - partial alphanumeric_keys - xkb_symbols "glagolica" --- -2.13.6 - diff --git a/n_disable-2xalt_2xctrl-toggle.diff b/n_disable-2xalt_2xctrl-toggle.diff index a91765e..4174053 100644 --- a/n_disable-2xalt_2xctrl-toggle.diff +++ b/n_disable-2xalt_2xctrl-toggle.diff @@ -1,17 +1,15 @@ -Index: xkeyboard-config-2.9/rules/base.xml.in -=================================================================== ---- xkeyboard-config-2.9.orig/rules/base.xml.in -+++ xkeyboard-config-2.9/rules/base.xml.in -@@ -5612,6 +5612,7 @@ - <_description>Right Alt (while pressed) +--- xkeyboard-config-2.27.orig/rules/base.xml 2019-10-11 19:01:38.759363000 +0200 ++++ xkeyboard-config-2.27/rules/base.xml 2019-10-11 19:04:18.071327000 +0200 +@@ -6229,6 +6229,7 @@ + Right Alt (while pressed) + diff --git a/xkeyboard-config-2.23.1.tar.bz2 b/xkeyboard-config-2.23.1.tar.bz2 deleted file mode 100644 index 7e7533e..0000000 --- a/xkeyboard-config-2.23.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2a4bbc05fea22151b7a7c8ac2655d549aa9b0486bedc7f5a68c72716343b02f3 -size 1053991 diff --git a/xkeyboard-config-2.27.tar.bz2 b/xkeyboard-config-2.27.tar.bz2 new file mode 100644 index 0000000..0e00757 --- /dev/null +++ b/xkeyboard-config-2.27.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:690daec8fea63526c07620c90e6f3f10aae34e94b6db6e30906173480721901f +size 1664454 diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes index 88ca956..06ff363 100644 --- a/xkeyboard-config.changes +++ b/xkeyboard-config.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Oct 11 17:20:30 UTC 2019 - Stefan Dirsch + +- Update to version 2.27 + * bugfix release +- supersedes U_Fix-typo-in-Polish-symbols-file.patch +- adjusted n_disable-2xalt_2xctrl-toggle.diff + ------------------------------------------------------------------- Fri Feb 2 11:20:56 UTC 2018 - sndirsch@suse.com diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index 88a8716..e546b95 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -1,7 +1,7 @@ # # spec file for package xkeyboard-config # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,22 +12,21 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: xkeyboard-config -Version: 2.23.1 +Version: 2.27 Release: 0 Summary: The X Keyboard Extension -License: GPL-2.0+ and LGPL-2.1+ and MIT and CDDL-1.0 +License: GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT AND CDDL-1.0 Group: System/X11/Utilities Url: http://www.freedesktop.org/Software/XKeyboardConfig Source: http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.bz2 Patch100: n_suse-ctrl-alt-bksp-terminate.patch # PATCH-FIX-OPENSUSE disable-2xalt_2xctrl-toggle.diff fdo#4927 -- This is just a workaround until fdo#4927 is fixed Patch109: n_disable-2xalt_2xctrl-toggle.diff -Patch110: U_Fix-typo-in-Polish-symbols-file.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: pkgconfig @@ -52,10 +51,9 @@ make keyboards more accessible to people with physical impairments. %prep %setup -q -translation-update-upstream +#translation-update-upstream %patch100 -p1 %patch109 -p1 -%patch110 -p1 %build %configure \