Switch to meson as build system

This commit is contained in:
Peter Hutterer 2019-10-21 16:25:11 +10:00
parent 7e6d2940af
commit 015d6be729

View File

@ -2,7 +2,7 @@
Name: libxkbcommon Name: libxkbcommon
Version: 0.8.4 Version: 0.8.4
Release: 2%{?gitdate:.%{gitdate}}%{?dist} Release: 3%{?gitdate:.%{gitdate}}%{?dist}
Summary: X.Org X11 XKB parsing library Summary: X.Org X11 XKB parsing library
License: MIT License: MIT
URL: http://www.x.org URL: http://www.x.org
@ -14,10 +14,11 @@ Source0: http://xkbcommon.org/download/%{name}-%{version}.tar.xz
%endif %endif
Source1: make-git-snapshot.sh Source1: make-git-snapshot.sh
BuildRequires: autoconf automake libtool BuildRequires: git meson
BuildRequires: xorg-x11-util-macros byacc flex bison BuildRequires: xorg-x11-util-macros byacc flex bison
BuildRequires: xorg-x11-proto-devel libX11-devel BuildRequires: xorg-x11-proto-devel libX11-devel
BuildRequires: xkeyboard-config-devel BuildRequires: xkeyboard-config-devel
BuildRequires: wayland-devel
BuildRequires: pkgconfig(xcb-xkb) >= 1.10 BuildRequires: pkgconfig(xcb-xkb) >= 1.10
Requires: xkeyboard-config Requires: xkeyboard-config
@ -49,23 +50,16 @@ Requires: %{name}-x11%{?_isa} = %{version}-%{release}
X.Org X11 XKB keymap creation library development package X.Org X11 XKB keymap creation library development package
%prep %prep
%autosetup -p1 -n %{name}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} %autosetup -S git
autoreconf -v --install || exit 1
%build %build
%configure \ %meson -Denable-docs=false \
--disable-silent-rules \ -Denable-x11=true \
--disable-static \ -Denable-wayland=false
--enable-x11 \ %meson_build
--disable-docs
make %{?_smp_mflags}
%install %install
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" %meson_install
find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
%ldconfig_scriptlets %ldconfig_scriptlets
@ -96,6 +90,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';'
%{_libdir}/pkgconfig/xkbcommon-x11.pc %{_libdir}/pkgconfig/xkbcommon-x11.pc
%changelog %changelog
* Fri Oct 25 2019 Peter Hutterer <peter.hutterer@redhat.com> 0.8.4-3
- switch to meson as build system
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.4-2 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild