diff --git a/xkeyboard-config-2.33.tar.bz2 b/xkeyboard-config-2.33.tar.bz2 deleted file mode 100644 index ad0a18e..0000000 Binary files a/xkeyboard-config-2.33.tar.bz2 and /dev/null differ diff --git a/xkeyboard-config-2.38.tar.xz b/xkeyboard-config-2.38.tar.xz new file mode 100644 index 0000000..13d5ee5 Binary files /dev/null and b/xkeyboard-config-2.38.tar.xz differ diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index 96b2b58..c0a11bc 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -1,14 +1,14 @@ Name: xkeyboard-config -Version: 2.33 -Release: 2 +Version: 2.38 +Release: 1 Summary: The X Keyboard Extension License: MIT URL: https://www.freedesktop.org/wiki/Software/XKeyboardConfig -Source0: https://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.bz2 +Source0: https://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.xz BuildArch: noarch -BuildRequires: gettext gettext-devel libtool libxslt perl(XML::Parser) pkgconfig(glib-2.0) xkbcomp +BuildRequires: gettext gettext-devel libtool libxslt perl(XML::Parser) pkgconfig(glib-2.0) xkbcomp meson BuildRequires: pkgconfig(x11) >= 1.4.3 pkgconfig(xorg-macros) >= 1.12 pkgconfig(xproto) >= 7.0.20 %description @@ -30,12 +30,11 @@ Header files for xkeyboard-config %autosetup -n %{name}-%{version} -p1 %build -autoreconf -v --force --install || exit 1 -%configure --enable-compat-rules --with-xkb-base=%{_datadir}/X11/xkb --with-xkb-rules-symlink=xorg -%make_build +%meson -Dcompat-rules=true -Dxorg-rules-symlinks=true +%meson_build %install -%make_install +%meson_install { FILESLIST=${PWD}/files.list @@ -62,6 +61,9 @@ autoreconf -v --force --install || exit 1 %{_mandir}/man7/xkeyboard-config.* %changelog +* Mon Feb 06 2023 zhangpan - 2.38-1 +- update to 2.38 + * Wed Oct 26 2022 zhouwenpei - 2.33-2 - Rebuild for next release