From 721d14f2e16c4cc7de0da141919d5309d843e9543c014d80d2b18113eaa2fa4e Mon Sep 17 00:00:00 2001
From: Scott Bradnick <scott.bradnick@suse.com>
Date: Tue, 26 Jul 2022 02:17:24 +0000
Subject: [PATCH] Accepting request 991166 from home:sbradnick

- A few changes related to local builds of Leap 15.4 referencing 150500

OBS-URL: https://build.opensuse.org/request/show/991166
OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xpra?expand=0&rev=108
---
 xpra-4.4+git20220721.c00134211.tar.gz |  4 ++--
 xpra.changes                          |  5 +++++
 xpra.spec                             | 18 ++++++++++++++++--
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/xpra-4.4+git20220721.c00134211.tar.gz b/xpra-4.4+git20220721.c00134211.tar.gz
index 9591c19..c96446b 100644
--- a/xpra-4.4+git20220721.c00134211.tar.gz
+++ b/xpra-4.4+git20220721.c00134211.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:421acad26935530e6cb219eeb5fa91bd235d4ebd4f16d093f9f6275a0d85cbce
-size 50052340
+oid sha256:e25cc822fde17056f1df74fb37a645de05998312d3cfb05a0f06993a746e759a
+size 50480925
diff --git a/xpra.changes b/xpra.changes
index 1d840be..b259301 100644
--- a/xpra.changes
+++ b/xpra.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul 26 01:52:30 UTC 2022 - Scott Bradnick <scott.bradnick@suse.com>
+
+- A few changes related to local builds of Leap 15.4 referencing 150500
+
 -------------------------------------------------------------------
 Fri Jul 22 20:22:17 UTC 2022 - scott.bradnick@suse.com
 
diff --git a/xpra.spec b/xpra.spec
index 74d0e71..cf82bfd 100644
--- a/xpra.spec
+++ b/xpra.spec
@@ -46,9 +46,14 @@ BuildRequires:  fdupes
 BuildRequires:  git-core
 BuildRequires:  hicolor-icon-theme
 # Needed for proper OS detection by setup.py
-%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150500
+### 20220725, smb: This line seems to goof up 15.4; 15.3 gets "openSUSE-release", 15.4 gets "dummy-release" this way
+#%%if 0%%{?suse_version} >= 1550 || 0%%{?sle_version} >= 150500
+#####
+%if 0%{?suse_version} >= 1550
+%define using_release "distribution-release"
 BuildRequires: distribution-release
 %else
+%define using_release "openSUSE-release"
 BuildRequires: openSUSE-release
 %endif
 # ---------
@@ -146,6 +151,12 @@ sed -e 's|__FILLUPDIR__|%{_fillupdir}|' \
 
 %build
 
+### DEBUGGING
+echo "using_release: %using_release"
+echo "sle_version:   %sle_version"
+echo "suse_version:  %suse_version"
+#####
+
 export CFLAGS="%{optflags}"
 %if 0%{?suse_version} <= 1500
 export CFLAGS="$CFLAGS -Wno-error=deprecated-declarations"
@@ -192,7 +203,10 @@ rm -rf %{buildroot}%{_datadir}/xpra/cuda
 mkdir -pv %{buildroot}%{_sbindir}
 ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 
-%if ( 0%{?sle_version} == 150300 || 0%{?sle_version} == 150400 ) && 0%{?is_opensuse}
+# 150300 == OBS build of Leap 15.3
+# 150400 == OBS build of Leap 15.4
+# 150500 == local build of Leap 15.4
+%if ( 0%{?sle_version} == 150300 || 0%{?sle_version} == 150400 || 0%{?sle_version} == 150500 ) && 0%{?is_opensuse}
 mkdir -vp %{buildroot}%{_libexecdir}/%{name}
 mv -v %{buildroot}%{_prefix}/libexec/%{name}/* %{buildroot}%{_libexecdir}/%{name}
 %endif