diff --git a/libxkbcommon.spec b/libxkbcommon.spec index 866832f..58594cb 100644 --- a/libxkbcommon.spec +++ b/libxkbcommon.spec @@ -1,6 +1,6 @@ Name: libxkbcommon -Version: 1.6.0 -Release: 3%{?gitdate:.%{gitdate}}%{?dist} +Version: 1.7.0 +Release: 2%{?gitdate:.%{gitdate}}%{?dist} Summary: X.Org X11 XKB parsing library License: MIT AND X11 AND MIT-CMU URL: http://www.x.org @@ -10,6 +10,7 @@ BuildRequires: gcc BuildRequires: git meson BuildRequires: byacc flex bison BuildRequires: xorg-x11-proto-devel libX11-devel +BuildRequires: pkgconfig(wayland-client) pkgconfig(wayland-protocols) BuildRequires: xkeyboard-config-devel BuildRequires: pkgconfig(xcb-xkb) >= 1.10 BuildRequires: libxml2-devel @@ -49,13 +50,21 @@ Requires: %{name}%{?_isa} = %{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}-x11%{?_isa} = %{version}-%{release} +Requires: %{name}-utils%{?_isa} = %{version}-%{release} + +%description x11-utils +%{name}-x11-utils is a set of X11 utilities to analyze and test XKB parsing. + %prep %autosetup -S git %build %meson -Denable-docs=false \ -Denable-x11=true \ - -Denable-wayland=false + -Denable-wayland=true %meson_build %install @@ -96,20 +105,30 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %files utils %{_bindir}/xkbcli +%{_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-x11 +%{_libexecdir}/xkbcommon/xkbcli-interactive-wayland %{_libexecdir}/xkbcommon/xkbcli-list +%{_mandir}/man1/xkbcli-compile-compose.1.gz %{_mandir}/man1/xkbcli-compile-keymap.1.gz %{_mandir}/man1/xkbcli-how-to-type.1.gz %{_mandir}/man1/xkbcli-interactive-evdev.1.gz -%{_mandir}/man1/xkbcli-interactive-x11.1.gz +%{_mandir}/man1/xkbcli-interactive-wayland.1.gz %{_mandir}/man1/xkbcli-list.1.gz %{_mandir}/man1/xkbcli.1.gz %{_datadir}/bash-completion/completions/xkbcli +%files x11-utils +%{_libexecdir}/xkbcommon/xkbcli-interactive-x11 +%{_mandir}/man1/xkbcli-interactive-x11.1.gz + %changelog +* Thu Jul 11 2024 Peter Hutterer - 1.7.0-2 +- libxkbcommon 1.7.0 +- Split the x11-utils into their own subpackage with the right requires + * Mon Jun 24 2024 Troy Dawson - 1.6.0-3 - Bump release for June 2024 mass rebuild diff --git a/sources b/sources index ce3497b..245fb51 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libxkbcommon-1.6.0.tar.xz) = 4f93225eada1c5d0806bbc01f72d82d72729f4580ade963ff6a386711c9b2232aae5213c8488abf01c3b81f0e1fdb7f4d8a4d3786113ccc134251ff164c4be5c +SHA512 (libxkbcommon-1.7.0.tar.xz) = 4b74a9f3f63e2ebc1cbdcaa963c70362e55fa527e1d89b6a1fd30d7a84a8b60c1b3dc99bcfbde85aa31890e0b2f62f0bad3c8ff8340fe6a930ee662b33448ba5