Accepting request 748511 from home:mgorse:branches:hardware

- Update to 1.1: 
  New devices: Wacom HID 5115
  Other change:
  * Button codes defined for the 3rd gen Intuos S
  Changes from version 1.0:
  - udev rules are now installed by default
  Changes from version 0.99.901:
  New devices
    * Lenovo YOGA 720, YOGA 520, IdeaPad FLEX 5, MIIX 520
  * Dell XPS 15 9570, Latitude 5175
  * HP Spectre x360, Envy x360 Convertible
  * Wacom Intuos Pro 2 S, Cintiq 22, DTK-1660E
  * Huion 610 Pro v2
  * Samsung 930QAA
  Other changes:
  * New API: libwacom_get_model_name()
  * meson build system support
  * fixed symbol versioning
  * EKR button ordering fixed
  * Stylus grouping added
  Changes from version 0.33:
  - New devices:
  * Wacom Bamboo Fun 4x5, Bamboo Fun 6x8, Bamboo1 5x8, Cintiq 16
  * HP EliteBook x360, x2, HP Envy x360
  * Acer Switch SA5
  * Huion H420
  * Lenovo Thinkpad L380 Yoga, L390 Yoga, Ideapad Flex, Yoga 730
  * Dell Latitude 7390
- Switch to meson for 15.2/tumbleweed
- Remove URI from keyring: file is no longer there.

OBS-URL: https://build.opensuse.org/request/show/748511
OBS-URL: https://build.opensuse.org/package/show/hardware/libwacom?expand=0&rev=8

libwacom-0.32.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b9dab8bce0471b839c89d34a1b30839de2c24db03796fa8d572817830f85380
-size 501600

libwacom-1.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8cb483593676332e92d3fe1fe816350f136bb906fcee329579d6cb9802d99e02
+size 502696

libwacom.changes

@@ -1,3 +1,40 @@
+-------------------------------------------------------------------
+Thu Nov 14 00:46:28 UTC 2019 - Michael Gorse <mgorse@suse.com>
+
+- Update to 1.1: 
+  New devices: Wacom HID 5115
+  Other change:
+  * Button codes defined for the 3rd gen Intuos S
+  Changes from version 1.0:
+  - udev rules are now installed by default
+  Changes from version 0.99.901:
+  New devices
+    * Lenovo YOGA 720, YOGA 520, IdeaPad FLEX 5, MIIX 520
+  * Dell XPS 15 9570, Latitude 5175
+  * HP Spectre x360, Envy x360 Convertible
+  * Wacom Intuos Pro 2 S, Cintiq 22, DTK-1660E
+  * Huion 610 Pro v2
+  * Samsung 930QAA
+  Other changes:
+  * New API: libwacom_get_model_name()
+  * meson build system support
+  * fixed symbol versioning
+  * EKR button ordering fixed
+  * Stylus grouping added
+  Changes from version 0.33:
+  - New devices:
+  * Wacom Bamboo Fun 4x5, Bamboo Fun 6x8, Bamboo1 5x8, Cintiq 16
+  * HP EliteBook x360, x2, HP Envy x360
+  * Acer Switch SA5
+  * Huion H420
+  * Lenovo Thinkpad L380 Yoga, L390 Yoga, Ideapad Flex, Yoga 730
+  * Dell Latitude 7390
+- Switch to meson for 15.2/tumbleweed
+- Remove URI from keyring: file is no longer there.
+- Add libxml2 to BuildRequires.
+- Don't manually install udev rules: now done by install.
+- Switch URL to github.
+  
 -------------------------------------------------------------------
 Tue Jan 29 08:42:16 UTC 2019 - cornelis@solcon.nl
 

libwacom.spec

@@ -16,20 +16,29 @@
 #
 
 
+%if 0%{?suse_version} > 1510
+%bcond_without meson
+%else
+%bcond_with meson
+%endif
 Name:           libwacom
-Version:        0.32
+Version:        1.1
 Release:        0
 Summary:        Library to identify wacom tablets
 License:        MIT
 Group:          System/Libraries
-URL:            http://linuxwacom.sourceforge.net/
+URL:            https://linuxwacom.github.io/
 Source:         https://github.com/linuxwacom/libwacom/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
 Source2:        https://github.com/linuxwacom/libwacom/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2.sig
-Source3:        http://www.who-t.net/contact/hutterer_peter.asc#/%{name}.keyring
+Source3:        %{name}.keyring
 Source99:       baselibs.conf
+%if %{with meson}
+BuildRequires:  meson >= 0.47.0
+%endif
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gudev-1.0)
+BuildRequires:  pkgconfig(libxml-2.0)
 
 %description
 libwacom is a library to identify wacom tablets and their model-specific
@@ -78,14 +87,22 @@ built-in on-screen tablet", "what is the size of this model", etc.
 %setup -q
 
 %build
+%if %{with meson}
+%meson
+%meson_build
+%else
 %configure \
+        --with-udev-dir=%{_libexecdir}/udev \
         --disable-static
 make %{?_smp_mflags}
+%endif
 
 %install
+%if %{with meson}
+%meson_install
+%else
 %make_install
-mkdir -p %{buildroot}%{_udevrulesdir}
-tools/generate-udev-rules > %{buildroot}%{_udevrulesdir}/65-libwacom.rules
+%endif
 
 find %{buildroot} -type f -name "*.la" -delete -print
 
@@ -94,7 +111,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
 
 %files -n libwacom2
 %license COPYING
-%doc NEWS README
+%doc NEWS README.md
 %{_libdir}/libwacom.so.2*
 
 %files data