libwacom 1.4.1

This commit is contained in:
Peter Hutterer 2020-06-30 10:07:29 +10:00
parent 518e18d6c6
commit 33571e4338
3 changed files with 5 additions and 42 deletions

View File

@ -1,39 +0,0 @@
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

View File

@ -1,5 +1,5 @@
Name: libwacom
Version: 1.4
Version: 1.4.1
Release: 1%{?dist}
Summary: Tablet Information Client Library
Requires: %{name}-data
@ -8,7 +8,6 @@ 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
@ -79,6 +78,9 @@ install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir}
%{_datadir}/libwacom/layouts/*.svg
%changelog
* Tue Jun 30 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.4.1-1
- libwacom 1.4.1
* Wed Jun 24 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.4-1
- libwacom 1.4

View File

@ -1 +1 @@
SHA512 (libwacom-1.4.tar.bz2) = db8daade5843a236360ea1f1ba7611f7e66e663173e1a07422b5b309060ef0ccd3367d5913a171d266006ff68bf154dbd06e9a80cfa013c859b10b8394454691
SHA512 (libwacom-1.4.1.tar.bz2) = bad8bbb8d3b98c1f9c3661ca60f72319e2f06acab5cb128a5b7a2e02da20f249d094a0b4b0ed4e5c67eb696973f23d8c9cd5f432a8e9d37df55c9f23de949fb9