[packages/xkeyboard-config] - updated to 2.47

[qboosh]

commit 0ff05ef3c9f939399c1f15f3b3d594fd3c7941cc
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Apr 26 21:59:32 2026 +0200

    - updated to 2.47

 xkeyboard-config.spec | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)
---
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index 9deda06..32a7567 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -1,13 +1,12 @@
-# TODO: BR python>=3.11 when available in PLD instead of separate StrEnum package
 Summary:	X Keyboard Configuration Database
 Summary(pl.UTF-8):	Baza danych konfiguracji klawiatury pod X
 Name:		xkeyboard-config
-Version:	2.44
-Release:	2
+Version:	2.47
+Release:	1
 License:	MIT
 Group:		X11/Development/Libraries
 Source0:	https://xorg.freedesktop.org/releases/individual/data/xkeyboard-config/%{name}-%{version}.tar.xz
-# Source0-md5:	623a88fe63c6aefe3621bdfd5ba72764
+# Source0-md5:	01e92dfd1af2ac2cc2c808f0811d8f0c
 URL:		https://www.freedesktop.org/wiki/Software/XKeyboardConfig
 BuildRequires:	gettext-tools >= 0.19.8
 BuildRequires:	libxslt-progs
@@ -15,7 +14,7 @@ BuildRequires:	meson >= 0.56.0
 BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
 BuildRequires:	python3 >= 1:3.9
-%if "%{_ver_lt '%{py3_ver}' '3.11'}" == "1"
+%if "%{_ver_lt %{py3_ver} 3.11}" == "1"
 BuildRequires:	python3-StrEnum
 %endif
 BuildRequires:	rpmbuild(macros) >= 2.042
@@ -59,29 +58,34 @@ rm -rf $RPM_BUILD_ROOT
 
 %meson_install
 
-ln -s /var/lib/xkb $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
+ln -s /var/lib/xkb $RPM_BUILD_ROOT%{_datadir}/xkeyboard-config-2/compiled
 
-%find_lang %{name}
+# xkeyboard-config and xkeyboard-config-2 domains
+%find_lang %{name} --all-name
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %pretrans
-# it used to be directory in xkbdata
+# it used to be directory in xkbdata, not it's a file
 if [ -d %{_datadir}/X11/xkb/symbols/pc ]; then
-	mv -b %{_datadir}/X11/xkb/symbols/pc{,.dir}
-%banner -e %{name} <<EOF
-Check out %{_datadir}/X11/xkb/symbols/pc.dir
-for your own files and remove it when done.
-EOF
+	rm -rf %{_datadir}/X11/xkb/symbols/pc
 fi
+# it's a symlink now
 if [ -d %{_datadir}/X11/xkb/compiled ]; then
 	rm -rf %{_datadir}/X11/xkb/compiled
 fi
+# it's a symlink now
+if [ -d %{_datadir}/X11/xkb ]; then
+	rm -rf %{_datadir}/X11/xkb
+fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING ChangeLog.md README.md docs/H* docs/R*
+%doc AUTHORS COPYING ChangeLog.md README.md docs/HOWTO.testing docs/README.*
 %{_datadir}/X11/xkb
+%{_datadir}/xkeyboard-config-2
 %{_npkgconfigdir}/xkeyboard-config.pc
+%{_npkgconfigdir}/xkeyboard-config-2.pc
 %{_mandir}/man7/xkeyboard-config.7*
+%{_mandir}/man7/xkeyboard-config-2.7*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xkeyboard-config.git/commitdiff/0ff05ef3c9f939399c1f15f3b3d594fd3c7941cc