import libwacom-1.1-2.el8

.gitignore

@@ -1 +1 @@
-SOURCES/libwacom-0.31.tar.bz2
+SOURCES/libwacom-1.1.tar.bz2

.libwacom.metadata

@@ -1 +1 @@
-09ee6ae1d4e8b55756a8ffaf9136df03c521ae44 SOURCES/libwacom-0.31.tar.bz2
+c25913c39cb6c7ca6e7d6b9fd390ad8bb4046f84 SOURCES/libwacom-1.1.tar.bz2

SPECS/libwacom.spec

@@ -1,6 +1,6 @@
 Name:           libwacom
-Version:        0.31
-Release:        1%{?dist}
+Version:        1.1
+Release:        2%{?dist}
 Summary:        Tablet Information Client Library
 Requires:       %{name}-data
 
@@ -10,10 +10,13 @@ URL:            https://github.com/linuxwacom/libwacom
 
 Source0:        https://github.com/linuxwacom/libwacom/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
 
-BuildRequires:  autoconf automake libtool doxygen
+BuildRequires:  meson gcc
 BuildRequires:  glib2-devel libgudev1-devel
 BuildRequires:  systemd systemd-devel
 BuildRequires:  git
+BuildRequires:  libxml2-devel
+
+Requires:       %{name}-data = %{version}-%{release}
 
 %description
 %{name} is a library that provides information about Wacom tablets and
@@ -32,6 +35,13 @@ Tablet information client library library development package.
 Summary:        Tablet Information Client Library Library Data Files
 BuildArch:      noarch
 
+# 65-libwacom.rules moved from libwacom to libwacom-data. Conflict here
+# because there's no real use-case for having old libwacom and new
+# libwacom-data installed. libwacom-data doesn't require libwacom but it
+# does require the same version, so let's conflict with any older version
+# here.
+Conflicts:      %{name} < %{version}
+
 %description data
 Tablet information client library library data files.
 
@@ -39,31 +49,24 @@ Tablet information client library library data files.
 %autosetup -S git
 
 %build
-autoreconf --force -v --install || exit 1
-%configure --disable-static --disable-silent-rules
-make %{?_smp_mflags}
+%meson -Dtests=true
+%meson_build
 
 %install
-make install DESTDIR=%{buildroot} INSTALL="install -p"
+%meson_install
 install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir}
 # auto-generate the udev rule from the database entries
-pushd tools
-./generate-udev-rules > ${RPM_BUILD_ROOT}/%{_udevrulesdir}/65-libwacom.rules
-popd
-
-# We intentionally don't ship *.la files
-find %{buildroot} -type f -name "*.la" -delete
+%_vpath_builddir/generate-udev-rules > ${RPM_BUILD_ROOT}/%{_udevrulesdir}/65-libwacom.rules
 
 %check
-make %{?_smp_mflags} check
+%meson_test
 
 %ldconfig_scriptlets
 
 %files
 %license COPYING
-%doc README
+%doc README.md
 %{_libdir}/libwacom.so.*
-%{_udevrulesdir}/65-libwacom.rules
 %{_bindir}/libwacom-list-local-devices
 %{_mandir}/man1/libwacom-list-local-devices.1*
 
@@ -76,6 +79,7 @@ make %{?_smp_mflags} check
 
 %files data
 %doc COPYING
+%{_udevrulesdir}/65-libwacom.rules
 %dir %{_datadir}/libwacom
 %{_datadir}/libwacom/*.tablet
 %{_datadir}/libwacom/*.stylus
@@ -83,6 +87,12 @@ make %{?_smp_mflags} check
 %{_datadir}/libwacom/layouts/*.svg
 
 %changelog
+* Thu Nov 07 2019 Peter Hutterer <peter.hutterer@redhat.com> 1.1-2
+- Conflict with older libwacom
+
+* Thu Nov 07 2019 Peter Hutterer <peter.hutterer@redhat.com> 1.1-1
+- libwacom 1.1 (#1741423)
+
 * Thu Aug 09 2018 Peter Hutterer <peter.hutterer@redhat.com> 0.31-1
 - libwacom 0.31 (#1612758)