From 086587dbfe6bf174989d025631c06c1fba9a1b4f55df715fac949e7f661f3dbb Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Tue, 20 Aug 2019 20:00:24 +0000 Subject: [PATCH] Accepting request 722329 from home:iznogood - Drop conditionals for wacom support, all current releases of openSUSE have wacom support available. - Update git-urls to current gitlab home. OBS-URL: https://build.opensuse.org/request/show/722329 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/libinput?expand=0&rev=201 --- libinput.changes | 7 +++++++ libinput.spec | 15 +++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/libinput.changes b/libinput.changes index b101dca..42303a8 100644 --- a/libinput.changes +++ b/libinput.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Aug 11 15:39:44 UTC 2019 - Bjørn Lie + +- Drop conditionals for wacom support, all current releases of + openSUSE have wacom support available. +- Update git-urls to current gitlab home. + ------------------------------------------------------------------- Sun Aug 11 06:30:09 UTC 2019 - Jan Engelhardt diff --git a/libinput.spec b/libinput.spec index 80d4eb4..131b29c 100644 --- a/libinput.spec +++ b/libinput.spec @@ -16,10 +16,6 @@ # -%if 0%{?suse_version} >= 1500 -%define use_wacom 1 -%endif - Name: libinput %define lname libinput10 Version: 1.14.0 @@ -29,8 +25,8 @@ License: MIT Group: Development/Libraries/C and C++ Url: http://www.freedesktop.org/wiki/Software/libinput/ -#Git-Clone: git://anongit.freedesktop.org/wayland/libinput -#Git-Web: http://cgit.freedesktop.org/wayland/libinput/ +#Git-Clone: https://gitlab.freedesktop.org/libinput/libinput.git +#Git-Web: https://gitlab.freedesktop.org/libinput/libinput/ #DL-URL: http://freedesktop.org/software/libinput/ Source: http://freedesktop.org/software/libinput/%name-%version.tar.xz Source2: http://freedesktop.org/software/libinput/%name-%version.tar.xz.sig @@ -38,6 +34,7 @@ Source3: baselibs.conf Source4: %name.keyring Source5: libinput-rpmlintrc Patch1: kill-env.diff + BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ @@ -50,9 +47,7 @@ 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 @@ -111,8 +106,8 @@ to develop applications that require libinput. --includedir="%_includedir/%name" \ --datadir="%_datadir/%name-%version" \ -Dudev-dir="%_prefix/lib/udev" \ - -Dtests=false -Ddocumentation=false - %{!?use_wacom:-Dlibwacom=false} \ + -Dtests=false \ + -Ddocumentation=false \ %nil %meson_build