diff --git a/xkeyboard-config-2.24.tar.bz2 b/xkeyboard-config-2.24.tar.bz2 deleted file mode 100644 index 3747444..0000000 Binary files a/xkeyboard-config-2.24.tar.bz2 and /dev/null differ diff --git a/xkeyboard-config-2.30.tar.bz2 b/xkeyboard-config-2.30.tar.bz2 new file mode 100644 index 0000000..cc82bd2 Binary files /dev/null and b/xkeyboard-config-2.30.tar.bz2 differ diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec index e753b8d..3397685 100644 --- a/xkeyboard-config.spec +++ b/xkeyboard-config.spec @@ -1,14 +1,17 @@ Name: xkeyboard-config -Version: 2.24 -Release: 6 +Version: 2.30 +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 BuildArch: noarch -BuildRequires: gettext intltool libtool libxslt perl-XML-Parser glib2-devel -BuildRequires: xorg-x11-util-macros xorg-x11-proto-devel xorg-x11-xkb-utils libX11-devel +BuildRequires: gettext gettext-devel libtool libxslt intltool perl(XML::Parser) pkgconfig(glib-2.0) +BuildRequires: pkgconfig(x11) >= 1.4.3 +BuildRequires: pkgconfig(xorg-macros) >= 1.12 +BuildRequires: pkgconfig(xproto) >= 7.0.20 +BuildRequires: xkbcomp %description The non-arch keyboard configuration database for X Window. The goal is to @@ -36,6 +39,10 @@ AUTOPOINT="intltoolize --automake --copy" autoreconf -v --force --install || exi %install %make_install +# Remove unnecessary symlink +rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled +%find_lang %{name} + { FILESLIST=${PWD}/files.list pushd $RPM_BUILD_ROOT @@ -61,6 +68,9 @@ AUTOPOINT="intltoolize --automake --copy" autoreconf -v --force --install || exi %{_mandir}/man7/*.gz %changelog +* Mon Jul 20 2020 chengguipeng - 2.30-1 +- Upgrade to 2.30-1 + * Sat Oct 19 2019 openEuler Buildteam - 2.24-6 - Type:bugfix - Id:NA