.gitignore

@@ -1 +1 @@
-SOURCES/libxkbcommon-1.0.3.tar.xz
+SOURCES/libxkbcommon-1.7.0.tar.xz

.libxkbcommon.metadata

@@ -1 +1 @@
-d1c0a1a516684996a1e3c47f87e076f4e57cf4c1 SOURCES/libxkbcommon-1.0.3.tar.xz
+6c9b00437feb6389470bb6dbce66f6f7d16f09bc SOURCES/libxkbcommon-1.7.0.tar.xz

SOURCES/make-git-snapshot.sh

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-DIRNAME=libxkbcommon-$( date +%Y%m%d )
-
-rm -rf $DIRNAME
-git clone https://github.com/xkbcommon/libxkbcommon $DIRNAME
-cd $DIRNAME
-if [ -z "$1" ]; then
-    git log | head -1
-else
-    git checkout $1
-fi
-git log | head -1 | awk '{ print $2 }' > ../commitid
-git repack -a -d
-cd ..
-tar Jcf $DIRNAME.tar.xz $DIRNAME
-rm -rf $DIRNAME

SPECS/libxkbcommon.spec

@@ -1,22 +1,16 @@
-#global gitdate  20120917
-
 Name:           libxkbcommon
-Version:        1.0.3
+Version:        1.7.0
 Release:        4%{?gitdate:.%{gitdate}}%{?dist}
 Summary:        X.Org X11 XKB parsing library
-License:        MIT
+License:        MIT AND X11 AND MIT-CMU
 URL:            http://www.x.org
 
-%if 0%{?gitdate}
-Source0:       %{name}-%{gitdate}.tar.xz
-%else
-Source0:        http://xkbcommon.org/download/%{name}-%{version}.tar.xz
-%endif
-Source1:        make-git-snapshot.sh
-
+Source0:        https://xkbcommon.org/download/%{name}-%{version}.tar.xz
+BuildRequires:  gcc
 BuildRequires:  git meson
-BuildRequires:  xorg-x11-util-macros byacc flex bison
+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
@@ -56,13 +50,22 @@ 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}%{?_isa} = %{version}-%{release}
+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
@@ -103,25 +106,89 @@ 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
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.3-4
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.7.0-4
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Mon Jul 15 2024 Peter Hutterer <peter.hutterer@redhat.com> - 1.7.0-3
+- Explicitly Require libxkbcommon in x11-utils for rpminspect
+
+* Thu Jul 11 2024 Peter Hutterer <peter.hutterer@redhat.com> - 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 <tdawson@redhat.com> - 1.6.0-3
+- Bump release for June 2024 mass rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Oct 09 2023 Peter Hutterer <peter.hutterer@redhat.com> - 1.6.0-1
+- libxkbcommon 1.6.0
+
+* Tue Sep 05 2023 Peter Hutterer <peter.hutterer@redhat.com>
+- SPDX migration: update to SPDX license identifiers
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Jan 04 2023 Peter Hutterer <peter.hutterer@redhat.com> - 1.5.0-1
+- libxbkcommon 1.5.0
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon May 23 2022 Peter Hutterer <peter.hutterer@redhat.com> - 1.4.1-1
+- libxkbcommon 1.4.1
+
+* Mon Feb 07 2022 Peter Hutterer <peter.hutterer@redhat.com> 1.4.0-1
+- libxkbcommon 1.4.0
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Sep 13 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.3.1-1
+- libxkbcommon 1.3.1
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue May 04 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.3.0-1
+- libxkbcommon 1.3.0
+
+* Thu Apr 08 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.2.1-1
+- libxkbcommon 1.2.1
+
+* Tue Apr 06 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.2.0-1
+- libxkbcommon 1.2.0
+- Fix Source link
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.3-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Wed Mar 10 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.1.0-1
+- libxkbcommon 1.1.0
+- remove the git snapshot handling, we haven't used it in 9 years
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild