From 69038c2fdfc228d6d22825b5a5cccac41ab727e2 Mon Sep 17 00:00:00 2001 From: jinzhimin369 Date: Thu, 30 Jul 2020 10:32:23 +0800 Subject: [PATCH] fix build failed --- libwacom.spec | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/libwacom.spec b/libwacom.spec index d0b4093..4525c60 100644 --- a/libwacom.spec +++ b/libwacom.spec @@ -1,14 +1,14 @@ Name: libwacom Version: 1.4.1 -Release: 1 +Release: 2 Summary: Wacom Tablets Library Requires: %{name}-data License: MIT URL: https://github.com/linuxwacom/libwacom Source0: https://github.com/linuxwacom/libwacom/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 -BuildRequires: autoconf automake libtool doxygen glib2-devel libgudev1-devel -BuildRequires: systemd systemd-devel git +BuildRequires: meson gcc glib2-devel libgudev1-devel +BuildRequires: systemd systemd-devel libxml2-devel %description libwacom is a library to identify wacom tablets and their model-specific @@ -24,7 +24,7 @@ Development package for libwacom. %package data Summary: Tablet Information Client Library Library Data Files - +BuildArch: noarch %description data Tablet information client library library data files. @@ -32,30 +32,27 @@ Tablet information client library library data files. %autosetup -n %{name}-%{version} -p1 -Sgit %build -autoreconf --force -v --install || exit 1 -%configure --disable-static --disable-silent-rules -%make_build +%meson -Dtests=disabled -Ddocumentation=disabled +%meson_build + %install -%make_install INSTALL="install -p" +%meson_install install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir} -./tools/generate-hwdb > ${RPM_BUILD_ROOT}/%{_udevrulesdir}/65-libwacom.rules - %check -make %{?_smp_mflags} check +%meson_test %ldconfig_scriptlets %files %{_libdir}/libwacom.so.* -%{_libdir}/udev/hwdb.d/* -%{_libdir}/udev/rules.d/* +%{_udevrulesdir}/65-libwacom.rules +%{_udevhwdbdir}/65-libwacom.hwdb %{_bindir}/libwacom-list-local-devices %{_mandir}/man1/libwacom-list-local-devices.1* %license COPYING %doc README.md -%exclude %{_libdir}/*.la %files devel %{_libdir}/libwacom.so @@ -69,7 +66,10 @@ make %{?_smp_mflags} check %{_datadir}/libwacom/layouts/*.svg %changelog -* Thu Jul 23 2020 jinzhimin - 1.4.1-1 +* Thu Jul 30 2020 jinzhimin - 1.4.1-2 +- fix build failed + +* Thu Jul 23 2020 jinzhimin - 1.4.1-1 - Package update * Tue Aug 20 2019 openEuler Buildteam - 0.31-2 -- Gitee