libwacom 1.4

0001-meson.build-ignore-Makefile.in-when-installing-data.patch

@@ -0,0 +1,39 @@
+From b0acb98c410b46372b835726130498585e03ff81 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed, 24 Jun 2020 10:51:05 +1000
+Subject: [PATCH libwacom] meson.build: ignore Makefile.in when installing data
+
+A tarball generated with autotools has a generated Makefile.in in every
+directory we have a Makefile.am. Using install_subdir() we end up installing
+that file unless we explicitly exclude it. This doesn't happen when building
+from git (unless the git tree is dirty from a previous autotools setup).
+
+And sneak a "space before tab" whitespace change in while we're in that
+vincinity.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ meson.build | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 7453256..9254bcf 100644
+--- a/meson.build
++++ b/meson.build
+@@ -94,10 +94,12 @@ install_subdir('data',
+ 	       install_dir: dir_data,
+ 	       strip_directory: true,
+ 	       exclude_files: ['wacom.example',
+-		       	       'check-files-in-git.sh',
++			       'check-files-in-git.sh',
+ 			       'check-svg-exists.sh',
+ 			       'Makefile.am',
++			       'Makefile.in',
+ 			       'layouts/Makefile.am',
++			       'layouts/Makefile.in',
+ 			       'layouts/README'])
+ 
+ test('files-in-git',
+-- 
+2.26.2
+

libwacom.spec

@@ -1,5 +1,5 @@
 Name:           libwacom
-Version:        1.3
+Version:        1.4
 Release:        1%{?dist}
 Summary:        Tablet Information Client Library
 Requires:       %{name}-data
@@ -8,6 +8,7 @@ License:        MIT
 URL:            https://github.com/linuxwacom/libwacom
 
 Source0:        https://github.com/linuxwacom/libwacom/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
+Patch01:        0001-meson.build-ignore-Makefile.in-when-installing-data.patch
 
 BuildRequires:  meson gcc
 BuildRequires:  glib2-devel libgudev1-devel
@@ -47,8 +48,6 @@ Tablet information client library data files.
 %install
 %meson_install
 install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir}
-# auto-generate the udev rule from the database entries
-%_vpath_builddir/generate-udev-rules > ${RPM_BUILD_ROOT}/%{_udevrulesdir}/65-libwacom.rules
 
 %check
 %meson_test
@@ -72,6 +71,7 @@ install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir}
 %files data
 %doc COPYING
 %{_udevrulesdir}/65-libwacom.rules
+%{_udevhwdbdir}/65-libwacom.hwdb
 %dir %{_datadir}/libwacom
 %{_datadir}/libwacom/*.tablet
 %{_datadir}/libwacom/*.stylus
@@ -79,6 +79,9 @@ install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir}
 %{_datadir}/libwacom/layouts/*.svg
 
 %changelog
+* Wed Jun 24 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.4-1
+- libwacom 1.4
+
 * Wed Mar 25 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.3-1
 - libwacom 1.3
 

sources

@@ -1 +1 @@
-SHA512 (libwacom-1.3.tar.bz2) = beb92051d1a2be5079518b9f254e5621bf7c13ab92f811d5a1b7d19eb0ecddb28d94db0e1724b379be8970b0de0e7d3eb4d3c15b4aeedacc623357e10740355c
+SHA512 (libwacom-1.4.tar.bz2) = db8daade5843a236360ea1f1ba7611f7e66e663173e1a07422b5b309060ef0ccd3367d5913a171d266006ff68bf154dbd06e9a80cfa013c859b10b8394454691