From 62e60d02649a51b9faacb503d78404dadde9565b Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 28 Apr 2020 04:50:16 -0400 Subject: [PATCH] import libxkbcommon-0.9.1-1.el8 --- .gitignore | 2 +- .libxkbcommon.metadata | 2 +- SPECS/libxkbcommon.spec | 26 +++++++++++--------------- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 92f0c68..c47205e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libxkbcommon-0.8.2.tar.xz +SOURCES/libxkbcommon-0.9.1.tar.xz diff --git a/.libxkbcommon.metadata b/.libxkbcommon.metadata index 16c6e15..55b34f4 100644 --- a/.libxkbcommon.metadata +++ b/.libxkbcommon.metadata @@ -1 +1 @@ -5589b09b8490392573bba5527cc0cc82824028b1 SOURCES/libxkbcommon-0.8.2.tar.xz +6685b3b98d1903e5e0ece1c234b9055fcb24701d SOURCES/libxkbcommon-0.9.1.tar.xz diff --git a/SPECS/libxkbcommon.spec b/SPECS/libxkbcommon.spec index 226475e..28c0888 100644 --- a/SPECS/libxkbcommon.spec +++ b/SPECS/libxkbcommon.spec @@ -1,7 +1,7 @@ #global gitdate 20120917 Name: libxkbcommon -Version: 0.8.2 +Version: 0.9.1 Release: 1%{?gitdate:.%{gitdate}}%{?dist} Summary: X.Org X11 XKB parsing library License: MIT @@ -14,7 +14,7 @@ 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 @@ -49,23 +49,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 +89,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -fv {} ';' %{_libdir}/pkgconfig/xkbcommon-x11.pc %changelog +* Fri Nov 01 2019 Peter Hutterer 0.9.1-1 +- libxkbcommon 0.9.1 (#1728801) + * Thu Aug 23 2018 Peter Hutterer 0.8.2-1 - libxkbcommon 0.8.2 (#1619541)