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