SHA256
1
0
forked from pool/xpra

Accepting request 993433 from home:sbradnick

- %{_libexecdir} issue was fixed upstream, cleaning up spec file
  * See https://github.com/Xpra-org/xpra/issues/3597

- Update to version 4.4+git20220726.a03b3f67e:
  * #3597 openSUSE Leap 15.4 still does not use libexec
  * always pop GDK errors
  * #3595 add man page entry
  * #3595 'exit-with-windows' option
  * fix removing monitor: logging was causing an error
  * layout may be 'None'
  * close the splash screen if it loses top level focus
  * #2630 these values aren't 'real' layout names, don't try to use them
  * #2630 modify shadow keymap when '--keyboard-layout=auto'
  * `xpra/x11/server_keyboard_config.py`: `'NoneType' object is not iterable`
  * #3594 fix vim typo
  * #3594 backwards compatibility fix
  * f-strings and more dense output
  * safer: don't delete recursively, delete with glob explicitly
  * when calling 'xpra clean' explicitly, we can remove session sub-directories
  * run 'late_cleanup' before trying to remove the session dir
  * don't try to parse 'resize-display' as a resolution if it is a boolean
  * remove spurious import added by IDE
  * distinguish directories from regular files
  * it is possible to run without the 'rgb' encoder
  * make it easier to build without any codecs
  * we can only use the 'native' mapping with existing x11 keycodes
  * simplify: remove unused argument
  * #3592 remove redundant 'xkbmap_' prefix
  * #3592 remove unstructured setxkbmap query data from server
  * #35822 start removing 'setxkbmap -query' and 'setxkbmap -print'

OBS-URL: https://build.opensuse.org/request/show/993433
OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xpra?expand=0&rev=109
This commit is contained in:
Scott Bradnick 2022-08-06 06:56:01 +00:00 committed by Git OBS Bridge
parent 721d14f2e1
commit accb81f225
7 changed files with 75 additions and 23 deletions

View File

@ -1,15 +1,12 @@
<!--
# vim: set syntax=xml
-->
<services>
<service name="obs_scm" mode="disabled">
<param name="url">https://github.com/Xpra-org/xpra</param>
<param name="scm">git</param>
<!-- TESTING -->
<param name="revision">c001342</param>
<!-- LAST VERIFIED GOOD
<param name="revision">a03b3f6</param>
<!-- LAST VERIFIED GOOD:  (older) ;  (newer)
<param name="revision">d0ae240</param>
<param name="revision">c001342</param>
-->
<param name="versionformat">@PARENT_TAG@+git%cd.%h</param>
<!-- These need changed dependent on tags

View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/Xpra-org/xpra</param>
<param name="changesrevision">c0013421137962dcfdd9a9f97f4c7b4b456d05de</param></service></servicedata>
<param name="changesrevision">a03b3f67e953c342cb9d71a0c91cdf51ab002a18</param></service></servicedata>

View File

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

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a8abcfd879c05434a95d85c7aff374142a20e37469c86858df68132c48499fda
size 49700713

View File

@ -1,3 +1,64 @@
-------------------------------------------------------------------
Sat Aug 6 06:52:23 UTC 2022 - Scott Bradnick <scott.bradnick@suse.com>
- %{_libexecdir} issue was fixed upstream, cleaning up spec file
* See https://github.com/Xpra-org/xpra/issues/3597
-------------------------------------------------------------------
Wed Jul 27 16:08:58 UTC 2022 - scott.bradnick@suse.com
- Update to version 4.4+git20220726.a03b3f67e:
* #3597 openSUSE Leap 15.4 still does not use libexec
* always pop GDK errors
* #3595 add man page entry
* #3595 'exit-with-windows' option
* fix removing monitor: logging was causing an error
* layout may be 'None'
* close the splash screen if it loses top level focus
* #2630 these values aren't 'real' layout names, don't try to use them
* #2630 modify shadow keymap when '--keyboard-layout=auto'
* `xpra/x11/server_keyboard_config.py`: `'NoneType' object is not iterable`
* #3594 fix vim typo
* #3594 backwards compatibility fix
* f-strings and more dense output
* safer: don't delete recursively, delete with glob explicitly
* when calling 'xpra clean' explicitly, we can remove session sub-directories
* run 'late_cleanup' before trying to remove the session dir
* don't try to parse 'resize-display' as a resolution if it is a boolean
* remove spurious import added by IDE
* distinguish directories from regular files
* it is possible to run without the 'rgb' encoder
* make it easier to build without any codecs
* we can only use the 'native' mapping with existing x11 keycodes
* simplify: remove unused argument
* #3592 remove redundant 'xkbmap_' prefix
* #3592 remove unstructured setxkbmap query data from server
* #35822 start removing 'setxkbmap -query' and 'setxkbmap -print'
* #3582 audio info may be missing - and that's fine
* don't pretend that these versions should work
* more resilient version parsing
* #3592 remove xkbmap prefix from client
* #3582 audio info may be missing - and that's fine
* #3592 same as f192c0312bc98360aec94e6aa92af90511259401 but for the server
* #3592 move keymap to a substructure
* #2303 support agent forwarding with the builtin ssh server
* cosmetic
* #2303 ignore '_proxy' command line arguments
* cosmetic
* #2303 when client exits, find another auth socket
* unused import
* #2303 keep track of sock path
* #2303 make function more re-usable
* dead symlinks don't "exist"
* #3592 remove unused tcp-proxy feature
* typo - why didn't this trigger problems?
* the 'install' subcommand does add data files
* #2303 error handling
* return the exit code
* #3592 remove uncompressed 'premult_argb32' icon format
* #3592 never use zlib for pixel data
* unused import
-------------------------------------------------------------------
Tue Jul 26 01:52:30 UTC 2022 - Scott Bradnick <scott.bradnick@suse.com>

View File

@ -1,4 +1,4 @@
name: xpra
version: 4.4+git20220721.c00134211
mtime: 1658437988
commit: c0013421137962dcfdd9a9f97f4c7b4b456d05de
version: 4.4+git20220726.a03b3f67e
mtime: 1658863895
commit: a03b3f67e953c342cb9d71a0c91cdf51ab002a18

View File

@ -28,7 +28,7 @@
# -----
%global __requires_exclude ^typelib\\(GtkosxApplication\\)|typelib\\(GdkGLExt\\)|typelib\\(GtkGLExt\\).*$
Name: xpra
Version: 4.4+git20220721.c00134211
Version: 4.4+git20220726.a03b3f67e
Release: 0
Summary: Remote display server for applications and desktops
License: BSD-3-Clause AND GPL-2.0-or-later AND LGPL-3.0-or-later AND MIT
@ -143,10 +143,12 @@ network bandwidth constraints.
find -name '*.py' \
-exec sed -i '1{\@^#!/usr/bin/env python@d}' {} +
install -m0644 %{SOURCE1} -T fs/share/icons/xpra.png
# set fillup dir
# misc fixes for SUSE specific differences upstream
baselibexec=$(basename $(rpm -E '%{_libexecdir}'))
sed -e 's|__FILLUPDIR__|%{_fillupdir}|' \
-e 's|__UNITDIR__|%{_unitdir}|' \
-e 's|share/doc/xpra|share/doc/packages/xpra|' \
-e "s|__LIBEXECDIR__|$baselibexec|" \
-i setup.py
%build
@ -203,14 +205,6 @@ rm -rf %{buildroot}%{_datadir}/xpra/cuda
mkdir -pv %{buildroot}%{_sbindir}
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
# 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
%fdupes -s %{buildroot}
%pre