Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xkeyboard-config for
openSUSE:Factory checked in at 2022-06-03 14:16:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xkeyboard-config (Old)
and /work/SRC/openSUSE:Factory/.xkeyboard-config.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xkeyboard-config"
Fri Jun 3 14:16:43 2022 rev:96 rq:980513 version:2.36
Changes:
--------
--- /work/SRC/openSUSE:Factory/xkeyboard-config/xkeyboard-config.changes
2022-02-21 17:46:14.231587546 +0100
+++
/work/SRC/openSUSE:Factory/.xkeyboard-config.new.1548/xkeyboard-config.changes
2022-06-03 14:16:47.901326777 +0200
@@ -1,0 +2,16 @@
+Thu Jun 2 13:35:01 UTC 2022 - Stefan Dirsch <sndir...@suse.com>
+
+- U_Fixes-regression-from-c3c5d02-were-mistakenly-replac.patch
+ * Regression fixed from
+ c3c5d02rules: sort the names of multimedia keyboards alphabetically
+ "\" at the end of line were mistakenly replacd by "/"
+
+-------------------------------------------------------------------
+Thu Jun 2 02:21:07 UTC 2022 - Stefan Dirsch <sndir...@suse.com>
+
+- Update to version 2.36
+ * bugfixes
+ * removed autotools support :-(
+- switched to meson
+
+-------------------------------------------------------------------
Old:
----
xkeyboard-config-2.34.tar.bz2
New:
----
U_Fixes-regression-from-c3c5d02-were-mistakenly-replac.patch
xkeyboard-config-2.36.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xkeyboard-config.spec ++++++
--- /var/tmp/diff_new_pack.pplq3B/_old 2022-06-03 14:16:48.357327370 +0200
+++ /var/tmp/diff_new_pack.pplq3B/_new 2022-06-03 14:16:48.365327380 +0200
@@ -17,17 +17,19 @@
Name: xkeyboard-config
-Version: 2.34
+Version: 2.36
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.bz2
+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
BuildRequires: intltool
+BuildRequires: meson
BuildRequires: pkgconfig
BuildRequires: python3
BuildRequires: xsltproc
@@ -48,19 +50,18 @@
%prep
%setup -q
+%patch0 -p1
%patch109 -p1
%build
-%configure \
- --disable-silent-rules \
- --with-xkb-rules-symlink=xorg \
- --with-xkb-base=%{_datadir}/X11/xkb \
- --enable-compat_rules \
- --disable-runtime-deps
-%make_build
+%{meson} \
+ -Dxkb-base=%{_datadir}/X11/xkb \
+ -Dcompat-rules=true \
+ -Dxorg-rules-symlinks=true
+%{meson_build}
%install
-%make_install
+%{meson_install}
mkdir -p %{buildroot}%{_localstatedir}/lib/xkb
# Bug 335553
mkdir -p %{buildroot}%{_localstatedir}/lib/xkb/compiled/
++++++ U_Fixes-regression-from-c3c5d02-were-mistakenly-replac.patch ++++++
>From e7d699f868d028861e182f1543eaf5b3b16bf58e Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndir...@suse.de>
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
