From a9034baecb88f23a7963f968b2119972ab5f1d8d5d3854e46aa8e5bb83393482 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 4 Oct 2022 18:48:10 +0000 Subject: [PATCH] - Update to version 2.37 * bugfixes - supersedes U_Fixes-regression-from-c3c5d02-were-mistakenly-replac.patch OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xkeyboard-config?expand=0&rev=166 --- ...-from-c3c5d02-were-mistakenly-replac.patch | 55 ------------------- xkeyboard-config-2.36.tar.xz | 3 - xkeyboard-config-2.37.tar.xz | 3 + xkeyboard-config.changes | 7 +++ xkeyboard-config.spec | 4 +- 5 files changed, 11 insertions(+), 61 deletions(-) delete mode 100644 U_Fixes-regression-from-c3c5d02-were-mistakenly-replac.patch delete mode 100644 xkeyboard-config-2.36.tar.xz create mode 100644 xkeyboard-config-2.37.tar.xz diff --git a/U_Fixes-regression-from-c3c5d02-were-mistakenly-replac.patch b/U_Fixes-regression-from-c3c5d02-were-mistakenly-replac.patch deleted file mode 100644 index b907eb7..0000000 --- a/U_Fixes-regression-from-c3c5d02-were-mistakenly-replac.patch +++ /dev/null @@ -1,55 +0,0 @@ -From e7d699f868d028861e182f1543eaf5b3b16bf58e Mon Sep 17 00:00:00 2001 -From: Stefan Dirsch -Date: Thu, 2 Jun 2022 15:28:55 +0200 -Subject: [PATCH] Fixes regression from c3c5d02: "\" were mistakenly replacd by - "/" - -Regression fixed from - - c3c5d02rules: sort the names of multimedia keyboards alphabetically - -"\" at the end of line were mistakenly replacd by "/" ---- - rules/0002-base.lists.part | 28 ++++++++++++++-------------- - 1 file changed, 14 insertions(+), 14 deletions(-) - -diff --git a/rules/0002-base.lists.part b/rules/0002-base.lists.part -index 0af6db56..cb661240 100644 ---- a/rules/0002-base.lists.part -+++ b/rules/0002-base.lists.part -@@ -37,18 +37,18 @@ - unitekkb1925 yahoo - - ! $inetmediakbds = \ -- a4_rfkb23 a4techKB21 a4techKBS8 acer_ferrari4k acer_laptop / -- armada asus_laptop benqx btc5090 btc6301urf btc9019u / -- cherrybluea cherryblueb cherrycyboard chicony042 / -- compalfl90 compaqik13 compaqik18 creativedw7000 / -- cymotionlinux dellm65 dellusbmm dexxa diamond dtk2000 / -- emachines ennyah_dkb1008 fscaa1667g genius geniuscomfy / -- geniuscomfy2 geniuskb19e hp5xx hpdv5 hpi6 hpxe3gc hpxe3gf / -- hpxe4xxx hpxt1000 hpzt11xx inspiron latitude / -- logidinovo logidinovoedge logitech_base logitech_g15 / -- microsoft4000 microsoft7000 microsoftmult microsoftpro / -- microsoftprooem mx1998 mx2500 mx2750 pc105 precision_m / -- presario propeller samsung4500 samsung4510 scorpius / -- silvercrest sk1300 sk2500 sk7100 sp_inet targa_v811 / -- thinkpad thinkpad60 tm2030USB-102 tm2030USB-106 / -+ a4_rfkb23 a4techKB21 a4techKBS8 acer_ferrari4k acer_laptop \ -+ armada asus_laptop benqx btc5090 btc6301urf btc9019u \ -+ cherrybluea cherryblueb cherrycyboard chicony042 \ -+ compalfl90 compaqik13 compaqik18 creativedw7000 \ -+ cymotionlinux dellm65 dellusbmm dexxa diamond dtk2000 \ -+ emachines ennyah_dkb1008 fscaa1667g genius geniuscomfy \ -+ geniuscomfy2 geniuskb19e hp5xx hpdv5 hpi6 hpxe3gc hpxe3gf \ -+ hpxe4xxx hpxt1000 hpzt11xx inspiron latitude \ -+ logidinovo logidinovoedge logitech_base logitech_g15 \ -+ microsoft4000 microsoft7000 microsoftmult microsoftpro \ -+ microsoftprooem mx1998 mx2500 mx2750 pc105 precision_m \ -+ presario propeller samsung4500 samsung4510 scorpius \ -+ silvercrest sk1300 sk2500 sk7100 sp_inet targa_v811 \ -+ thinkpad thinkpad60 tm2030USB-102 tm2030USB-106 \ - toshiba_s3000 trust trustda trust_slimline unitekkb1925 --- -2.34.1 - diff --git a/xkeyboard-config-2.36.tar.xz b/xkeyboard-config-2.36.tar.xz deleted file mode 100644 index 6842a04..0000000 --- a/xkeyboard-config-2.36.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f1bb1292a161d520a3485d378609277d108cd07cde0327c16811ff54c3e1595 -size 880776 diff --git a/xkeyboard-config-2.37.tar.xz b/xkeyboard-config-2.37.tar.xz new file mode 100644 index 0000000..a691b29 --- /dev/null +++ b/xkeyboard-config-2.37.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb1383a5ac4b6210d7c7302b9d6fab052abdf51c5d2c9b55f1f779997ba68c6c +size 879744 diff --git a/xkeyboard-config.changes b/xkeyboard-config.changes index f9d13d4..bd224be 100644 --- a/xkeyboard-config.changes +++ b/xkeyboard-config.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Oct 4 18:24:40 UTC 2022 - Stefan Dirsch + +- Update to version 2.37 + * bugfixes +- supersedes U_Fixes-regression-from-c3c5d02-were-mistakenly-replac.patch + ------------------------------------------------------------------- Thu Jun 2 13:35:01 UTC 2022 - Stefan Dirsch diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index 5487cba..29c6641 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -17,14 +17,13 @@ Name: xkeyboard-config -Version: 2.36 +Version: 2.37 Release: 0 Summary: The X Keyboard Extension License: CDDL-1.0 AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT Group: System/X11/Utilities URL: https://www.freedesktop.org/Software/XKeyboardConfig Source: https://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.xz -Patch0: U_Fixes-regression-from-c3c5d02-were-mistakenly-replac.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 BuildRequires: fdupes @@ -50,7 +49,6 @@ make keyboards more accessible to people with physical impairments. %prep %setup -q -%patch0 -p1 %patch109 -p1 %build