Compare commits

...

No commits in common. "c8" and "imports/c8-beta/xkeyboard-config-2.24-3.el8" have entirely different histories.

3 changed files with 7 additions and 9 deletions

2
.gitignore vendored
View File

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

View File

@ -1 +1 @@
f521cd49ab04f54778779dddc68e1771de2e8fbb SOURCES/xkeyboard-config-2.28.tar.bz2 2df5b347a4cd9891d2a15fdc4c1734629756a070 SOURCES/xkeyboard-config-2.24.tar.bz2

View File

@ -6,8 +6,8 @@
Summary: X Keyboard Extension configuration data Summary: X Keyboard Extension configuration data
Name: xkeyboard-config Name: xkeyboard-config
Version: 2.28 Version: 2.24
Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
License: MIT License: MIT
URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@ -21,7 +21,8 @@ Source0: http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-
BuildArch: noarch BuildArch: noarch
BuildRequires: gettext gettext-devel BuildRequires: gettext
BuildRequires: intltool
BuildRequires: libtool BuildRequires: libtool
BuildRequires: libxslt BuildRequires: libxslt
BuildRequires: perl(XML::Parser) BuildRequires: perl(XML::Parser)
@ -52,7 +53,7 @@ Development files for %{name}.
%autosetup -S git %autosetup -S git
%build %build
autoreconf -v --force --install || exit 1 AUTOPOINT="intltoolize --automake --copy" autoreconf -v --force --install || exit 1
%configure \ %configure \
--enable-compat-rules \ --enable-compat-rules \
--with-xkb-base=%{_datadir}/X11/xkb \ --with-xkb-base=%{_datadir}/X11/xkb \
@ -87,9 +88,6 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
%{_datadir}/pkgconfig/xkeyboard-config.pc %{_datadir}/pkgconfig/xkeyboard-config.pc
%changelog %changelog
* Tue Oct 29 2019 Peter Hutterer <peter.hutterer@redhat.com> 2.28-1
- xkeyboard-config 2.28 (#1728817)
* Fri Jul 06 2018 Peter Hutterer <peter.hutterer@redhat.com> 2.24-3 * 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 - Remove high-keycode removal patches, xkbcomp 1.4.2 has been in stable for
long enough (related #1587998) long enough (related #1587998)