From bed76ded9c506ec7363860df4c7fda33f2a2a5dc Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Thu, 17 Dec 2020 00:19:27 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/libwacom.git#aa2357f0bb40b51d72257545fff64879aa5dc154 --- ...typo-causing-the-data-file-test-to-b.patch | 27 +++++++++++++++++++ libwacom.spec | 9 +++++-- sources | 2 +- 3 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 0001-meson.build-fix-typo-causing-the-data-file-test-to-b.patch diff --git a/0001-meson.build-fix-typo-causing-the-data-file-test-to-b.patch b/0001-meson.build-fix-typo-causing-the-data-file-test-to-b.patch new file mode 100644 index 0000000..3729889 --- /dev/null +++ b/0001-meson.build-fix-typo-causing-the-data-file-test-to-b.patch @@ -0,0 +1,27 @@ +From 677fa78620e762528db0aa0609c22d15b75352bf Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Thu, 17 Dec 2020 09:16:46 +1000 +Subject: [PATCH libwacom] meson.build: fix typo causing the data file test to + be installed + +Signed-off-by: Peter Hutterer +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 6a38b36..0d4e346 100644 +--- a/meson.build ++++ b/meson.build +@@ -107,7 +107,7 @@ install_subdir('data', + exclude_files: ['wacom.example', + 'check-files-in-git.sh', + 'check-svg-exists.sh', +- 'test-data_files.py', ++ 'test_data_files.py', + 'Makefile.am', + 'Makefile.in', + 'layouts/Makefile.am', +-- +2.28.0 + diff --git a/libwacom.spec b/libwacom.spec index 221600a..d52d8a2 100644 --- a/libwacom.spec +++ b/libwacom.spec @@ -1,6 +1,6 @@ Name: libwacom -Version: 1.6 -Release: 2%{?dist} +Version: 1.7 +Release: 1%{?dist} Summary: Tablet Information Client Library Requires: %{name}-data @@ -9,6 +9,8 @@ URL: https://github.com/linuxwacom/libwacom Source0: https://github.com/linuxwacom/libwacom/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 +Patch01: 0001-meson.build-fix-typo-causing-the-data-file-test-to-b.patch + BuildRequires: meson gcc BuildRequires: glib2-devel libgudev1-devel BuildRequires: systemd systemd-devel @@ -78,6 +80,9 @@ install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir} %{_datadir}/libwacom/layouts/*.svg %changelog +* Thu Dec 17 2020 Peter Hutterer 1.7-1 +- libwacom 1.7 + * Wed Nov 04 2020 Peter Hutterer 1.6-2 - Change BuildRequires to git-core, we don't need full git diff --git a/sources b/sources index d246c59..bb89df7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libwacom-1.6.tar.bz2) = 2aeba01535092b26301ec9b675932bf88f8150c513274449341143a641ee942977ed3b0d35cf1d2513da056701ca0d75eff9fd44830c5a00764e37fcbfb2c051 +SHA512 (libwacom-1.7.tar.bz2) = 0cdd34c54a4477ffb763c4a291f0a6b33d2df6b1d237332b116e792685201a63a50c3ec98b84e9dc7c0b97c9e407c3531cd67c0af5a8398b5bbf8be6ca103066