From 127480e1bb6c0aeb4ed908be1b130acef2de3f7487e52826f2081706f23b57ee Mon Sep 17 00:00:00 2001 From: Scott Bradnick Date: Fri, 8 Apr 2022 23:32:15 +0000 Subject: [PATCH] Accepting request 967936 from home:sbradnick - Adding 'Recommends: lsb-release' so 'Information' -> 'Session Info' returns results vs. 'unknown'. - Removing 'BuildRequires: lsb-release'. - Adjusting to use 'distribution-release' for Tumbleweed and 'openSUSE-release' for < Tumbleweed. OBS-URL: https://build.opensuse.org/request/show/967936 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xpra?expand=0&rev=95 --- xpra.changes | 17 +++++++++++++++++ xpra.spec | 10 +++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/xpra.changes b/xpra.changes index eacfcaf..4921e4e 100644 --- a/xpra.changes +++ b/xpra.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Fri Apr 8 22:57:54 UTC 2022 - Scott Bradnick + +- Adding 'Recommends: lsb-release' so 'Information' -> 'Session Info' + returns results vs. 'unknown'. + +------------------------------------------------------------------- +Fri Apr 8 20:36:15 UTC 2022 - Scott Bradnick + +- Removing 'BuildRequires: lsb-release'. + +------------------------------------------------------------------- +Fri Apr 8 17:47:47 UTC 2022 - Scott Bradnick + +- Adjusting to use 'distribution-release' for Tumbleweed and + 'openSUSE-release' for < Tumbleweed. + ------------------------------------------------------------------- Fri Apr 8 16:31:22 UTC 2022 - Scott Bradnick diff --git a/xpra.spec b/xpra.spec index 6b02bd3..a971d69 100644 --- a/xpra.spec +++ b/xpra.spec @@ -45,9 +45,12 @@ BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: git-core BuildRequires: hicolor-icon-theme -# These 2 are needed for proper OS detection by setup.py -BuildRequires: lsb-release -BuildRequires: distribution-release +# Needed for proper OS detection by setup.py +%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150500 +BuildRequires: distribution-release +%else +BuildRequires: openSUSE-release +%endif # --------- BuildRequires: pam-devel %if %{with pandoc} @@ -98,6 +101,7 @@ Requires: shared-mime-info Requires: xf86-video-dummy Requires: xorg-x11-xauth Requires(post): %fillup_prereq +Recommends: lsb-release Recommends: pinentry Recommends: python3-dnspython Recommends: python3-netifaces