From 3d0c94ad4c4cf13df8227fdec6a9c723ae0b5997 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Fri, 29 Jan 2021 04:52:24 +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#c370c060ab5061786a7650c139af1cdede8e8dfb --- ...4-51e9-Lenovo-ThinkPad-P15-Gen-1-325.patch | 45 ------------------- ...typo-causing-the-data-file-test-to-b.patch | 27 ----------- libwacom.spec | 13 +++--- sources | 2 +- 4 files changed, 9 insertions(+), 78 deletions(-) delete mode 100644 0001-data-Add-ISDv4-51e9-Lenovo-ThinkPad-P15-Gen-1-325.patch delete mode 100644 0001-meson.build-fix-typo-causing-the-data-file-test-to-b.patch diff --git a/0001-data-Add-ISDv4-51e9-Lenovo-ThinkPad-P15-Gen-1-325.patch b/0001-data-Add-ISDv4-51e9-Lenovo-ThinkPad-P15-Gen-1-325.patch deleted file mode 100644 index 0616147..0000000 --- a/0001-data-Add-ISDv4-51e9-Lenovo-ThinkPad-P15-Gen-1-325.patch +++ /dev/null @@ -1,45 +0,0 @@ -From ba02abf58f8d0405140e658d8238b69e89120576 Mon Sep 17 00:00:00 2001 -From: Jason Gerecke -Date: Wed, 6 Jan 2021 13:01:29 -0800 -Subject: [PATCH libwacom] data: Add ISDv4 51e9 (Lenovo ThinkPad P15 Gen 1) - (#325) - -Tablet definition was tested and verified to work by the bug reporter. - -Signed-off-by: Jason Gerecke ---- - data/isdv4-51e9.tablet | 22 ++++++++++++++++++++++ - 1 file changed, 22 insertions(+) - create mode 100644 data/isdv4-51e9.tablet - -diff --git a/data/isdv4-51e9.tablet b/data/isdv4-51e9.tablet -new file mode 100644 -index 0000000..8684b26 ---- /dev/null -+++ b/data/isdv4-51e9.tablet -@@ -0,0 +1,22 @@ -+# Lenovo ThinkPad P15 Gen 1 -+# Sensor Type: AES -+# Features: Touch (Integrated), Tilt -+# HW Resolution: 34422 x 19362 (2540 x 2540 lpi) -+# -+# Autogenerated from sysinfo.VSiBXWPx2J -+# From private bug report -+ -+[Device] -+Name=ISDv4 51e9 -+ModelName= -+DeviceMatch=usb:056a:51e9 -+Class=ISDV4 -+Width=14 -+Height=8 -+IntegratedIn=Display;System -+Styli=@isdv4-aes; -+ -+[Features] -+Stylus=true -+Touch=true -+Buttons=0 --- -2.29.2 - 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 deleted file mode 100644 index 3729889..0000000 --- a/0001-meson.build-fix-typo-causing-the-data-file-test-to-b.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 6c7d7ef..daf15dd 100644 --- a/libwacom.spec +++ b/libwacom.spec @@ -1,6 +1,6 @@ Name: libwacom -Version: 1.7 -Release: 2%{?dist} +Version: 1.8 +Release: 1%{?dist} Summary: Tablet Information Client Library Requires: %{name}-data @@ -9,9 +9,6 @@ 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 -Patch02: 0001-data-Add-ISDv4-51e9-Lenovo-ThinkPad-P15-Gen-1-325.patch - BuildRequires: meson gcc BuildRequires: glib2-devel libgudev1-devel BuildRequires: systemd systemd-devel @@ -81,6 +78,12 @@ install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir} %{_datadir}/libwacom/layouts/*.svg %changelog +* Fri Jan 29 2021 Peter Hutterer 1.8-1 +- libwacom 1.8 + +* Tue Jan 26 2021 Fedora Release Engineering - 1.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Jan 14 2021 Peter Hutterer 1.7-2 - Add tablet file for Lenovo ThinkPad P15 (#1914409) diff --git a/sources b/sources index bb89df7..caedc30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libwacom-1.7.tar.bz2) = 0cdd34c54a4477ffb763c4a291f0a6b33d2df6b1d237332b116e792685201a63a50c3ec98b84e9dc7c0b97c9e407c3531cd67c0af5a8398b5bbf8be6ca103066 +SHA512 (libwacom-1.8.tar.bz2) = fc13075a3902847051717beef48ae7716a092b851bb1aaac8992d5367289ab03b6da3426ae79ecff0d3d20b1c965e5d2d8fc40c4f7ea648bf9acc6eca718338d