Merge branch 'rawhide' into epel8

xorgxrdp.spec

@@ -1,8 +1,6 @@
-%global xorg_server_version %(pkg-config --silence-errors --modversion xorg-server 2>/dev/null || echo 65536)
-
 Name:           xorgxrdp
 Version:        0.2.16
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Implementation of xrdp backend as Xorg modules
 
 License:        MIT
@@ -18,7 +16,9 @@ BuildRequires:  libXfont-devel
 %else
 BuildRequires:  libXfont2-devel
 %endif
-Requires:       xorg-x11-server-Xorg%{_isa} = %{xorg_server_version}
+Requires:       Xorg %(xserver-sdk-abi-requires videodrv)
+Requires:       Xorg %(xserver-sdk-abi-requires xinput)
+
 
 %description
 xorgxrdp is a set of X11 modules that make Xorg act as a backend for
@@ -56,6 +56,9 @@ for screen resizing and multiple monitors.
 
 
 %changelog
+* Sat Aug 21 2021 Carl George <carl@george.computer> - 0.2.16-3
+- Use xserver-sdk-abi-requires to require xserver ABI versions
+
 * Mon Jun  7 2021 Bojan Smojver <bojan@rexursive.com> - 0.2.16-2
 - Rebuild against xorg-x11-server 1.20.10