rpms/xkeyboard-config
7
0
Fork 0
Code Issues Pull Requests Releases Activity

xkeyboard-config 2.32

Browse Source 
build with meson now
drop the xorg ruleset, no longer in use. Everything is hardcoded to evdev
  these days.
This commit is contained in:
Peter Hutterer 2021-02-16 13:28:00 +10:00
parent 930f964d60
commit 51aeddd7cb
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources
View File

@ -1 +1 @@
SHA512 (xkeyboard-config-2.31.tar.bz2) = f6f260253e1757640cc0591f9efb55ad5d08023a53ec2f0b468465b36bae0aae4f78dc4d6e603c95aa21c9993d9a42bd641edf2017be3183921a0b1c125f4669 SHA512 (xkeyboard-config-2.32.tar.bz2) = c082a86efcf69ab50454875686b9b4c388cf48002de3728331de3c09c1349a38c9b9ad8ecace2215061c0c775e59c3dd230fffe3f24db63790aa71dc8eff8dea

26
xkeyboard-config.spec
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.31 Version: 2.32
Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Release: 1%{?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
@ -22,7 +22,7 @@ Source0: http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-
BuildArch: noarch BuildArch: noarch
BuildRequires: gettext gettext-devel BuildRequires: gettext gettext-devel
BuildRequires: libtool make BuildRequires: meson
BuildRequires: libxslt BuildRequires: libxslt
BuildRequires: perl(XML::Parser) BuildRequires: perl(XML::Parser)
BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glib-2.0)
@ -48,16 +48,11 @@ Development files for %{name}.
%autosetup -S git %autosetup -S git
%build %build
autoreconf -v --force --install || exit 1 %meson -Dcompat-rules=true
%configure \ %meson_build
--enable-compat-rules \
--with-xkb-base=%{_datadir}/X11/xkb \
--with-xkb-rules-symlink=xorg
make %{?_smp_mflags}
%install %install
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %meson_install
# Remove unnecessary symlink # Remove unnecessary symlink
rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
@ -74,15 +69,18 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
%files -f files.list -f %{name}.lang %files -f files.list -f %{name}.lang
%doc AUTHORS README NEWS COPYING docs/README.* docs/HOWTO.* %doc AUTHORS README NEWS COPYING docs/README.* docs/HOWTO.*
%{_datadir}/X11/xkb/rules/xorg
%{_datadir}/X11/xkb/rules/xorg.lst
%{_datadir}/X11/xkb/rules/xorg.xml
%{_mandir}/man7/xkeyboard-config.* %{_mandir}/man7/xkeyboard-config.*
%files devel %files devel
%{_datadir}/pkgconfig/xkeyboard-config.pc %{_datadir}/pkgconfig/xkeyboard-config.pc
%changelog %changelog
* 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 * Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.31-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild