From 31ac6ae55058c7b745827548f54f2f675119813be5030a6ece31bb5eeb11a391 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 1 Jun 2018 16:57:16 +0000 Subject: [PATCH] Accepting request 613485 from home:mwilck:branches:X11:Wayland A fix for my previous submission, and a generic fix. - spec file: added "udevadm hwdb --update" to %post Without this, changes to the hwdb file won't be visible - spec file: fixed build error on Leap 42.3 OBS-URL: https://build.opensuse.org/request/show/613485 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/libinput?expand=0&rev=164 --- libinput.changes | 7 +++++++ libinput.spec | 10 ++++++++++ 2 files changed, 17 insertions(+) diff --git a/libinput.changes b/libinput.changes index be036c2..947e74f 100644 --- a/libinput.changes +++ b/libinput.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jun 1 10:24:50 UTC 2018 - mwilck@suse.com + +- spec file: added "udevadm hwdb --update" to %post + Without this, changes to the hwdb file won't be visible +- spec file: fixed build error on Leap 42.3 + ------------------------------------------------------------------- Wed May 30 07:57:31 UTC 2018 - mwilck@suse.com diff --git a/libinput.spec b/libinput.spec index 814649a..7714f3c 100644 --- a/libinput.spec +++ b/libinput.spec @@ -16,6 +16,10 @@ # +%if 0%{?suse_version} >= 1500 +%define use_wacom 1 +%endif + Name: libinput %define lname libinput10 Version: 1.10.7 @@ -48,7 +52,9 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 BuildRequires: pkgconfig(libevdev) >= 0.4 BuildRequires: pkgconfig(libudev) +%if 0%{?use_wacom} == 1 BuildRequires: pkgconfig(libwacom) >= 0.20 +%endif BuildRequires: pkgconfig(mtdev) >= 1.1.0 %description @@ -107,6 +113,7 @@ to develop applications that require libinput. --includedir="%_includedir/%name" \ -Dudev-dir="%_prefix/lib/udev" \ -Dtests=false \ + %{!?use_wacom:-Dlibwacom=false} \ %nil %meson_build @@ -117,6 +124,9 @@ to develop applications that require libinput. %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig +%post udev +[ -x /usr/bin/udevadm ] && /usr/bin/udevadm hwdb --update || : + %files udev %_prefix/lib/udev/hwdb.d %_prefix/lib/udev/libinput-device-group