rpm/xpra
SHA256
1
0
Fork 0
forked from pool/xpra
Code Pull Requests Activity

Accepting request 991166 from home:sbradnick

Browse Source 
- 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
This commit is contained in:
Scott Bradnick 2022-07-26 02:17:24 +00:00 committed by Git OBS Bridge
parent ac8b7a6eb4
commit 721d14f2e1
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xpra-4.4+git20220721.c00134211.tar.gz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:421acad26935530e6cb219eeb5fa91bd235d4ebd4f16d093f9f6275a0d85cbce oid sha256:e25cc822fde17056f1df74fb37a645de05998312d3cfb05a0f06993a746e759a
size 50052340 size 50480925

5
xpra.changes
View File

@ -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 Fri Jul 22 20:22:17 UTC 2022 - scott.bradnick@suse.com

18
xpra.spec
View File

@ -46,9 +46,14 @@ BuildRequires: fdupes
BuildRequires: git-core BuildRequires: git-core
BuildRequires: hicolor-icon-theme BuildRequires: hicolor-icon-theme
# Needed for proper OS detection by setup.py # 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 BuildRequires: distribution-release
%else %else
%define using_release "openSUSE-release"
BuildRequires: openSUSE-release BuildRequires: openSUSE-release
%endif %endif
# --------- # ---------
@ -146,6 +151,12 @@ sed -e 's|__FILLUPDIR__|%{_fillupdir}|' \
%build %build
### DEBUGGING
echo "using_release: %using_release"
echo "sle_version: %sle_version"
echo "suse_version: %suse_version"
#####
export CFLAGS="%{optflags}" export CFLAGS="%{optflags}"
%if 0%{?suse_version} <= 1500 %if 0%{?suse_version} <= 1500
export CFLAGS="$CFLAGS -Wno-error=deprecated-declarations" export CFLAGS="$CFLAGS -Wno-error=deprecated-declarations"
@ -192,7 +203,10 @@ rm -rf %{buildroot}%{_datadir}/xpra/cuda
mkdir -pv %{buildroot}%{_sbindir} mkdir -pv %{buildroot}%{_sbindir}
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} 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} mkdir -vp %{buildroot}%{_libexecdir}/%{name}
mv -v %{buildroot}%{_prefix}/libexec/%{name}/* %{buildroot}%{_libexecdir}/%{name} mv -v %{buildroot}%{_prefix}/libexec/%{name}/* %{buildroot}%{_libexecdir}/%{name}
%endif %endif