diff --git a/libxkbcommon-1.4.0.tar.xz b/libxkbcommon-1.4.0.tar.xz deleted file mode 100644 index ed10cac93df49e0de9262f317dd24aa4c5c74c95..0000000000000000000000000000000000000000 Binary files a/libxkbcommon-1.4.0.tar.xz and /dev/null differ diff --git a/libxkbcommon-1.7.0.tar.xz b/libxkbcommon-1.7.0.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..fabd5b573bc86a232abacaa294ca004163c94812 Binary files /dev/null and b/libxkbcommon-1.7.0.tar.xz differ diff --git a/libxkbcommon.spec b/libxkbcommon.spec index 1bd1047c9a065b5c157a2e6cca40b616c5fbb470..5d392c1c0d38d4cb52e69ef84d8274a63a0227e2 100644 --- a/libxkbcommon.spec +++ b/libxkbcommon.spec @@ -1,17 +1,16 @@ -%define anolis_release 3 +%define anolis_release 1 Name: libxkbcommon -Version: 1.4.0 +Version: 1.7.0 Release: %{anolis_release}%{?dist} Summary: X.Org X11 XKB parsing library -License: MIT +License: MIT AND X11 AND MIT-CMU URL: http://xkbcommon.org/ Source0: http://xkbcommon.org/download/%{name}-%{version}.tar.xz -BuildRequires: git +BuildRequires: git gcc BuildRequires: meson -BuildRequires: xorg-x11-util-macros BuildRequires: xorg-x11-proto-devel BuildRequires: libX11-devel BuildRequires: xkeyboard-config-devel @@ -20,6 +19,7 @@ BuildRequires: flex BuildRequires: bison BuildRequires: pkgconfig(xcb-xkb) BuildRequires: libxml2-devel +BuildRequires: pkgconfig(wayland-client) pkgconfig(wayland-protocols) Requires: xkeyboard-config @@ -56,13 +56,22 @@ Requires: %{name} = %{version}-%{release} %description utils %{name}-utils is a set of utilities to analyze and test XKB parsing. +%package x11-utils +Summary: X.Org X11 XKB parsing utilities +Requires: %{name} = %{version}-%{release} +Requires: %{name}-x11 = %{version}-%{release} +Requires: %{name}-utils = %{version}-%{release} + +%description x11-utils +%{name}-x11-utils is a set of X11 utilities to analyze and test XKB parsing. + %prep %setup -q %build %meson -Denable-docs=false \ -Denable-x11=true \ - -Denable-wayland=false + -Denable-wayland=true %meson_build %install @@ -97,10 +106,32 @@ Requires: %{name} = %{version}-%{release} %files utils %{_bindir}/xkbcli %{abidir}/xkbcli-option.list -%{_libexecdir}/xkbcommon/xkbcli* -%{_mandir}/man1/xkbcli*.1.zst +%{_libexecdir}/xkbcommon/xkbcli-compile-compose +%{_libexecdir}/xkbcommon/xkbcli-compile-keymap +%{_libexecdir}/xkbcommon/xkbcli-how-to-type +%{_libexecdir}/xkbcommon/xkbcli-interactive-evdev +%{_libexecdir}/xkbcommon/xkbcli-interactive-wayland +%{_libexecdir}/xkbcommon/xkbcli-list +%{_mandir}/man1/xkbcli-compile-compose.1.zst +%{_mandir}/man1/xkbcli-compile-keymap.1.zst +%{_mandir}/man1/xkbcli-how-to-type.1.zst +%{_mandir}/man1/xkbcli-interactive-evdev.1.zst +%{_mandir}/man1/xkbcli-interactive-wayland.1.zst +%{_mandir}/man1/xkbcli-list.1.zst +%{_mandir}/man1/xkbcli.1.zst + +%{_datadir}/bash-completion/completions/xkbcli + +%files x11-utils +%{_libexecdir}/xkbcommon/xkbcli-interactive-x11 +%{_mandir}/man1/xkbcli-interactive-x11.1.zst %changelog +* Wed Mar 19 2025 Xiaoping Liu - 1.7.0-1 +- update to 1.7.1 from 1.4.0 +- Migrated to SPDX license +- Split the x11-utils into their own subpackage with the right requires + * Thu Nov 16 2023 Wenlong Zhang - 1.4.0-3 - fix build error for libxkbcommon