x11/xpra: Fix packaging with Python 3.8

While I'm here:

* Fix pkg-plist entries of the AVAHI option which contained hardcoded Python
  version artifacts.

* Add "noflavors" to USE_PYTHON to avoid package name collisions if built
  with "BUILD_ALL_PYTHON_FLAVORS".

PR:		253815
Approved by:	python (with hat)

2 files changed, 46 insertions, 46 deletions

diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile
index 20b6915a96e2..3967837827d1 100644
--- a/x11/xpra/Makefile
+++ b/x11/xpra/Makefile
@@ -34,7 +34,7 @@ USES=		desktop-file-utils fortran gettext-runtime gnome pkgconfig \
 		python:3.6+ shared-mime-info shebangfix tar:xz xorg
 
 USE_GNOME=	cairo gdkpixbuf2 gtk30 pygobject3
-USE_PYTHON=	cython distutils
+USE_PYTHON=	cython distutils noflavors
 USE_XORG=	x11 xcomposite xdamage xext xfixes xi xkbfile xrandr xtst
 PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
 		PYTHON_SUFFIX=${PYTHON_SUFFIX} \
diff --git a/x11/xpra/pkg-plist b/x11/xpra/pkg-plist
index a045d9271b35..a3026f67e397 100644
--- a/x11/xpra/pkg-plist
+++ b/x11/xpra/pkg-plist
@@ -60,7 +60,7 @@ libexec/xpra/xdg-open
 %%PYTHON_SITELIBDIR%%/xpra/buffers/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/buffers/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/buffers/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/xpra/buffers/membuf.so
+%%PYTHON_SITELIBDIR%%/xpra/buffers/membuf%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/build_info.py
 %%PYTHON_SITELIBDIR%%/xpra/child_reaper.py
 %%PYTHON_SITELIBDIR%%/xpra/client/__init__.py
@@ -177,7 +177,7 @@ libexec/xpra/xdg-open
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk3/__pycache__/tray_menu.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk3/__pycache__/tray_menu.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk3/cairo_backing.py
-%%PYTHON_SITELIBDIR%%/xpra/client/gtk3/cairo_workaround.so
+%%PYTHON_SITELIBDIR%%/xpra/client/gtk3/cairo_workaround%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk3/client.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk3/client_window.py
 %%PYTHON_SITELIBDIR%%/xpra/client/gtk3/gtk3_client_window.py
@@ -406,29 +406,29 @@ libexec/xpra/xdg-open
 %%PYTHON_SITELIBDIR%%/xpra/codecs/argb/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/argb/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/argb/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/xpra/codecs/argb/argb.so
+%%PYTHON_SITELIBDIR%%/xpra/codecs/argb/argb%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/codecs/codec_checks.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/codec_constants.py
 %%LIBYUV%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_libyuv/__init__.py
 %%LIBYUV%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_libyuv/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%LIBYUV%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_libyuv/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%LIBYUV%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_libyuv/colorspace_converter.so
+%%LIBYUV%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_libyuv/colorspace_converter%%PYTHON_EXT_SUFFIX%%.so
 %%SWSCALE%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_swscale/__init__.py
 %%SWSCALE%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_swscale/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%SWSCALE%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_swscale/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%SWSCALE%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_swscale/colorspace_converter.so
+%%SWSCALE%%%%PYTHON_SITELIBDIR%%/xpra/codecs/csc_swscale/colorspace_converter%%PYTHON_EXT_SUFFIX%%.so
 %%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/__init__.py
 %%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/decoder.so
+%%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/dec_avcodec2/decoder%%PYTHON_EXT_SUFFIX%%.so
 %%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/libav_common/__init__.py
 %%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/libav_common/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/libav_common/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/libav_common/av_log.so
+%%AVCODEC%%%%PYTHON_SITELIBDIR%%/xpra/codecs/libav_common/av_log%%PYTHON_EXT_SUFFIX%%.so
 %%FFMPEG%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_ffmpeg/__init__.py
 %%FFMPEG%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_ffmpeg/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%FFMPEG%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_ffmpeg/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%FFMPEG%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_ffmpeg/encoder.so
+%%FFMPEG%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_ffmpeg/encoder%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/codecs/enc_proxy/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/enc_proxy/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/enc_proxy/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
@@ -438,11 +438,11 @@ libexec/xpra/xdg-open
 %%X264%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x264/__init__.py
 %%X264%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x264/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%X264%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x264/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%X264%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x264/encoder.so
+%%X264%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x264/encoder%%PYTHON_EXT_SUFFIX%%.so
 %%X265%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/__init__.py
 %%X265%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%X265%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%X265%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/encoder.so
+%%X265%%%%PYTHON_SITELIBDIR%%/xpra/codecs/enc_x265/encoder%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/codecs/image_wrapper.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/loader.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/pillow/__init__.py
@@ -459,12 +459,12 @@ libexec/xpra/xdg-open
 %%WEBCAM%%%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/__init__.py
 %%WEBCAM%%%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%WEBCAM%%%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%WEBCAM%%%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/decoder.so
-%%WEBCAM%%%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/encoder.so
+%%WEBCAM%%%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/decoder%%PYTHON_EXT_SUFFIX%%.so
+%%WEBCAM%%%%PYTHON_SITELIBDIR%%/xpra/codecs/webp/encoder%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/codecs/xor/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/codecs/xor/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/codecs/xor/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/xpra/codecs/xor/cyxor.so
+%%PYTHON_SITELIBDIR%%/xpra/codecs/xor/cyxor%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/colorstreamhandler.py
 %%PYTHON_SITELIBDIR%%/xpra/common.py
 %%PYTHON_SITELIBDIR%%/xpra/dbus/__init__.py
@@ -497,8 +497,8 @@ libexec/xpra/xdg-open
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/__pycache__/gobject_util.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/__pycache__/graph.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/__pycache__/graph.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/xpra/gtk_common/__pycache__/gtk_clipboard.cpython-37.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/xpra/gtk_common/__pycache__/gtk_clipboard.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/xpra/gtk_common/__pycache__/gtk_clipboard.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/xpra/gtk_common/__pycache__/gtk_clipboard.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/__pycache__/gtk_notifier.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/__pycache__/gtk_notifier.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/__pycache__/gtk_util.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
@@ -520,8 +520,8 @@ libexec/xpra/xdg-open
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/gobject_compat.py
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/gobject_util.py
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/graph.py
-%%PYTHON_SITELIBDIR%%/xpra/gtk_common/gtk3/gdk_atoms.so
-%%PYTHON_SITELIBDIR%%/xpra/gtk_common/gtk3/gdk_bindings.so
+%%PYTHON_SITELIBDIR%%/xpra/gtk_common/gtk3/gdk_atoms%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/xpra/gtk_common/gtk3/gdk_bindings%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/gtk_clipboard.py
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/gtk_notifier.py
 %%PYTHON_SITELIBDIR%%/xpra/gtk_common/gtk_util.py
@@ -544,7 +544,7 @@ libexec/xpra/xdg-open
 %%PYTHON_SITELIBDIR%%/xpra/keyboard/mask.py
 %%PYTHON_SITELIBDIR%%/xpra/log.py
 %%PYTHON_SITELIBDIR%%/xpra/make_thread.py
-%%PYTHON_SITELIBDIR%%/xpra/monotonic_time.so
+%%PYTHON_SITELIBDIR%%/xpra/monotonic_time%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/net/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/net/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/net/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
@@ -594,7 +594,7 @@ libexec/xpra/xdg-open
 %%PYTHON_SITELIBDIR%%/xpra/net/bencode/__pycache__/bencode.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/net/bencode/__pycache__/bencode.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/net/bencode/bencode.py
-%%PYTHON_SITELIBDIR%%/xpra/net/bencode/cython_bencode.so
+%%PYTHON_SITELIBDIR%%/xpra/net/bencode/cython_bencode%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/net/bytestreams.py
 %%PYTHON_SITELIBDIR%%/xpra/net/common.py
 %%PYTHON_SITELIBDIR%%/xpra/net/compression.py
@@ -605,16 +605,16 @@ libexec/xpra/xdg-open
 %%PYTHON_SITELIBDIR%%/xpra/net/file_transfer.py
 %%PYTHON_SITELIBDIR%%/xpra/net/header.py
 %%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/__init__.py
-%%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/__pycache__/__init__.cpython-37.opt-1.pyc
-%%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/__pycache__/__init__.cpython-37.pyc
-%%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/__pycache__/avahi_listener.cpython-37.opt-1.pyc
-%%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/__pycache__/avahi_listener.cpython-37.pyc
-%%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/__pycache__/avahi_publisher.cpython-37.opt-1.pyc
-%%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/__pycache__/avahi_publisher.cpython-37.pyc
-%%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/__pycache__/zeroconf_listener.cpython-37.opt-1.pyc
-%%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/__pycache__/zeroconf_listener.cpython-37.pyc
-%%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/__pycache__/zeroconf_publisher.cpython-37.opt-1.pyc
-%%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/__pycache__/zeroconf_publisher.cpython-37.pyc
+%%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/__pycache__/avahi_listener.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/__pycache__/avahi_listener.cpython-%%PYTHON_SUFFIX%%.pyc
+%%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/__pycache__/avahi_publisher.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/__pycache__/avahi_publisher.cpython-%%PYTHON_SUFFIX%%.pyc
+%%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/__pycache__/zeroconf_listener.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/__pycache__/zeroconf_listener.cpython-%%PYTHON_SUFFIX%%.pyc
+%%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/__pycache__/zeroconf_publisher.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/__pycache__/zeroconf_publisher.cpython-%%PYTHON_SUFFIX%%.pyc
 %%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/avahi_listener.py
 %%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/avahi_publisher.py
 %%AVAHI%%%%PYTHON_SITELIBDIR%%/xpra/net/mdns/zeroconf_listener.py
@@ -755,7 +755,7 @@ libexec/xpra/xdg-open
 %%PYTHON_SITELIBDIR%%/xpra/platform/xposix/webcam.py
 %%PYTHON_SITELIBDIR%%/xpra/platform/xposix/xdg_helper.py
 %%PYTHON_SITELIBDIR%%/xpra/queue_scheduler.py
-%%PYTHON_SITELIBDIR%%/xpra/rectangle.so
+%%PYTHON_SITELIBDIR%%/xpra/rectangle%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/scripts/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/scripts/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/scripts/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
@@ -893,7 +893,7 @@ libexec/xpra/xdg-open
 %%PYTHON_SITELIBDIR%%/xpra/server/auth/win32_auth.py
 %%PYTHON_SITELIBDIR%%/xpra/server/background_worker.py
 %%PYTHON_SITELIBDIR%%/xpra/server/control_command.py
-%%PYTHON_SITELIBDIR%%/xpra/server/cystats.so
+%%PYTHON_SITELIBDIR%%/xpra/server/cystats%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/server/dbus/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/server/dbus/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/server/dbus/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
@@ -1111,7 +1111,7 @@ libexec/xpra/xdg-open
 %%PYTHON_SITELIBDIR%%/xpra/server/window/content_guesser.py
 %%PYTHON_SITELIBDIR%%/xpra/server/window/filters.py
 %%PYTHON_SITELIBDIR%%/xpra/server/window/metadata.py
-%%PYTHON_SITELIBDIR%%/xpra/server/window/motion.so
+%%PYTHON_SITELIBDIR%%/xpra/server/window/motion%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/server/window/video_scoring.py
 %%PYTHON_SITELIBDIR%%/xpra/server/window/video_subregion.py
 %%PYTHON_SITELIBDIR%%/xpra/server/window/window_source.py
@@ -1198,15 +1198,15 @@ libexec/xpra/xdg-open
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/bindings/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/core_bindings.so
-%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/display_source.so
-%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/keyboard_bindings.so
-%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/posix_display_source.so
-%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/randr_bindings.so
-%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/wait_for_x_server.so
-%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/window_bindings.so
-%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/xi2_bindings.so
-%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/ximage.so
+%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/core_bindings%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/display_source%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/keyboard_bindings%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/posix_display_source%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/randr_bindings%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/wait_for_x_server%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/window_bindings%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/xi2_bindings%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/xpra/x11/bindings/ximage%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/x11/common.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/dbus/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/dbus/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
@@ -1221,8 +1221,8 @@ libexec/xpra/xdg-open
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk3/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk3/__pycache__/gdk_display_util.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk3/__pycache__/gdk_display_util.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk3/gdk_bindings.so
-%%PYTHON_SITELIBDIR%%/xpra/x11/gtk3/gdk_display_source.so
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk3/gdk_bindings%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/xpra/x11/gtk3/gdk_display_source%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk3/gdk_display_util.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/__init__.py
 %%PYTHON_SITELIBDIR%%/xpra/x11/gtk_x11/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
@@ -1401,8 +1401,8 @@ share/pixmaps/xpra.png
 %%VPX%%%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/__init__.py
 %%VPX%%%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%VPX%%%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%VPX%%%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/decoder.so
-%%VPX%%%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/encoder.so
+%%VPX%%%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/decoder%%PYTHON_EXT_SUFFIX%%.so
+%%VPX%%%%PYTHON_SITELIBDIR%%/xpra/codecs/vpx/encoder%%PYTHON_EXT_SUFFIX%%.so
 %%HTML5%%%%DATADIR%%/www/LICENSE
 %%HTML5%%%%DATADIR%%/www/LICENSE.br
 %%HTML5%%%%DATADIR%%/www/LICENSE.gz