.gitignore

@@ -1 +1 @@
-SOURCES/xkeyboard-config-2.28.tar.bz2
+SOURCES/xkeyboard-config-2.33.tar.bz2

.xkeyboard-config.metadata

@@ -1 +1 @@
-f521cd49ab04f54778779dddc68e1771de2e8fbb SOURCES/xkeyboard-config-2.28.tar.bz2
+eeccf05e0df69f42fbac700c5d3eca3129a49b5b SOURCES/xkeyboard-config-2.33.tar.bz2

SPECS/xkeyboard-config.spec

@@ -6,8 +6,8 @@
 
 Summary:    X Keyboard Extension configuration data
 Name:       xkeyboard-config
-Version:    2.28
+Version:    2.33
-Release:    1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Release:    2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 License:    MIT
 URL:        http://www.freedesktop.org/wiki/Software/XKeyboardConfig
 
@@ -22,7 +22,7 @@ Source0:    http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-
 BuildArch:  noarch
 
 BuildRequires:  gettext gettext-devel
-BuildRequires:  libtool
+BuildRequires:  meson
 BuildRequires:  libxslt
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  pkgconfig(glib-2.0)
@@ -30,11 +30,7 @@ BuildRequires:  pkgconfig(x11) >= 1.4.3
 BuildRequires:  pkgconfig(xorg-macros) >= 1.12
 BuildRequires:  pkgconfig(xproto) >= 7.0.20
 BuildRequires:  xkbcomp
-BuildRequires:  git
-
-%if 0%{?gitdate}
 BuildRequires:  git-core
-%endif
 
 %description
 This package contains configuration data used by the X Keyboard Extension (XKB),
@@ -52,20 +48,15 @@ Development files for %{name}.
 %autosetup -S git
 
 %build
-autoreconf -v --force --install || exit 1
+%meson -Dcompat-rules=true -Dxorg-rules-symlinks=true
-%configure \
+%meson_build
-    --enable-compat-rules \
-    --with-xkb-base=%{_datadir}/X11/xkb \
-    --with-xkb-rules-symlink=xorg
-
-make %{?_smp_mflags}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+%meson_install
 
 # Remove unnecessary symlink
 rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
-%find_lang %{name} 
+%find_lang %{name}
 
 # Create filelist
 {
@@ -77,18 +68,85 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 }
 
 %files -f files.list -f %{name}.lang
-%doc AUTHORS README NEWS TODO COPYING docs/README.* docs/HOWTO.*
+%doc AUTHORS README NEWS COPYING docs/README.* docs/HOWTO.*
+%{_mandir}/man7/xkeyboard-config.*
 %{_datadir}/X11/xkb/rules/xorg
 %{_datadir}/X11/xkb/rules/xorg.lst
 %{_datadir}/X11/xkb/rules/xorg.xml
-%{_mandir}/man7/xkeyboard-config.*
 
 %files devel
 %{_datadir}/pkgconfig/xkeyboard-config.pc
 
 %changelog
-* Tue Oct 29 2019 Peter Hutterer <peter.hutterer@redhat.com> 2.28-1
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.33-2
-- xkeyboard-config 2.28 (#1728817)
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Wed Jun 16 2021 Peter Hutterer <peter.hutterer@redhat.com> 2.33-1
+- xkeyboard-config 2.33 (#1972014)
+
+* Wed Apr 21 2021 Peter Hutterer <peter.hutterer@redhat.com> 2.32-3
+- Restore the xorg ruleset, console-setup and possibly others are still
+  using those (#1951875)
+- Allow for a "custom" layout
+- Don't mark the DTD document as XML document (#1952283)
+- Remove a duplicate keyboard layout to prevent a crash in gnome-desktop's
+  xkbinfo
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.32-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Tue Feb 16 2021 Peter Hutterer <peter.hutterer@redhat.com> 2.32-1
+- xkeyboard-config 2.32
+- build with meson now
+- drop the xorg ruleset, no longer in use. Everything is hardcoded to evdev
+  these days.
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.31-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Dec 01 2020 Peter Hutterer <peter.hutterer@redhat.com> 2.31-3
+- Add make to BuildRequires
+
+* Wed Nov 04 2020 Peter Hutterer <peter.hutterer@redhat.com> 2.31-2
+- Fix BuildRequires for git, we only need git-core
+
+* Wed Oct 07 2020 Peter Hutterer <peter.hutterer@redhat.com> 2.31-1
+- xkeyboard-config 2.31
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.30-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jun 19 2020 Peter Hutterer <peter.hutterer@redhat.com> 2.30-2
+- Fix a syntax error in the indian symbols file
+
+* Wed Jun 03 2020 Peter Hutterer <peter.hutterer@redhat.com> 2.30-1
+- xkeyboard-config 2.30
+
+* Fri Jan 31 2020 Peter Hutterer <peter.hutterer@redhat.com> 2.29-1
+- xkeyboard-config 2.29
+
+* Fri Oct 25 2019 Peter Hutterer <peter.hutterer@redhat.com> 2.28-1
+- xkeyboard-config 2.28
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.27-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jun 13 2019 Peter Hutterer <peter.hutterer@redhat.com> 2.27-1
+- xkeyboard-config 2.27
+- drop intltool, no longer needed, see upstream commit e8026f673e
+
+* Mon May 27 2019 Peter Hutterer <peter.hutterer@redhat.com> 2.26-2
+- xkeyboard-config 2.26, with sources this time
+
+* Mon May 27 2019 Peter Hutterer <peter.hutterer@redhat.com> 2.26-1
+- xkeyboard-config 2.26
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.24-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.24-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Fri Jul 06 2018 Peter Hutterer <peter.hutterer@redhat.com> 2.24-3
 - Remove high-keycode removal patches, xkbcomp 1.4.2 has been in stable for