Accepting request 997567 from X11:Utilities
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/997567 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xpra?expand=0&rev=49
This commit is contained in:
Richard Brown
Git OBS Bridge
commit
830ab73732
14
_service
14
_service
@ -1,11 +1,13 @@
|
||||
<!--
|
||||
# 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">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
|
||||
at github.com/Xpra-org/xpra ; Currently
|
||||
@ -22,10 +24,14 @@
|
||||
<service name="tar" mode="disabled">
|
||||
<!-- I'd like to include this, but METADATA_PATTERN
|
||||
seems to block including .git
|
||||
* 20220718:
|
||||
* need "package-meta" here too
|
||||
* "include" || "exclude", not both
|
||||
<param name="include">.git</param>
|
||||
<param name="exclude">.github</param>
|
||||
<param name="exclude">.git/objects/pack</param>
|
||||
-->
|
||||
<param name="package-meta">yes</param>
|
||||
</service>
|
||||
<service name="recompress" mode="disabled">
|
||||
<param name="compression">gz</param>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://github.com/Xpra-org/xpra</param>
|
||||
<param name="changesrevision">872c7f8d861777f09cb765b945cc600e49a7f47d</param></service></servicedata>
|
||||
<param name="changesrevision">a03b3f67e953c342cb9d71a0c91cdf51ab002a18</param></service></servicedata>
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:52e3ff5cdc9674a01a0fecccf2b6a26b8ff75770139666725320be7f62948068
|
||||
size 52235769
|
||||
3
xpra-4.4+git20220726.a03b3f67e.tar.gz
Normal file
3
xpra-4.4+git20220726.a03b3f67e.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a8abcfd879c05434a95d85c7aff374142a20e37469c86858df68132c48499fda
|
||||
size 49700713
|
||||
181
xpra.changes
181
xpra.changes
@ -1,3 +1,184 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 10 12:43:24 UTC 2022 - Scott Bradnick <scott.bradnick@suse.com>
|
||||
|
||||
- Making adjustments as per https://build.opensuse.org/request/show/994288
|
||||
* Swapping out '--without-strict'
|
||||
* Using CFLAGS '-Wno-error=deprecated-declarations' for all flavors
|
||||
* Addin 'ExcludeArch: %ix86'
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Aug 7 01:55:02 UTC 2022 - Scott Bradnick <scott.bradnick@suse.com>
|
||||
|
||||
- Making adjustments for 'ffmpeg-4' vs. 'ffmpeg-5'
|
||||
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
- 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
|
||||
|
||||
- Update to version 4.4+git20220721.c00134211:
|
||||
* place the verification token at a random address
|
||||
* remove ancient mmap token location code
|
||||
* #3582 limit audio info
|
||||
* always enable bundling - no need for env switch
|
||||
* the '_proxy' subcommand doesn't need to load compressors
|
||||
* skip lib validation warnings when running 'sdist'
|
||||
* #3582 limit client info exposed
|
||||
* doh: return the info
|
||||
* return a dict even when we hit an error
|
||||
* #3591 clamp negative values to display
|
||||
* #3591 also drop negative dimensions
|
||||
* #2303 honour env var and skip processing ssh agent paths
|
||||
* some clients don't have ssh-auth-sock specified.. don't error out
|
||||
* silence linter
|
||||
* only forward ssl socket options to the ssl wrap function
|
||||
* fix ssl breakage: convert attribute names to arguments
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 22 19:37:59 UTC 2022 - scott.bradnick@suse.com
|
||||
|
||||
- Update to version 4.4+git20220720.22e3ae211:
|
||||
* don't compress rgb pixels with anything but lz4
|
||||
* rename method to prevent confusion
|
||||
* #2303 ssh agent forwarding
|
||||
* #3582 hide detailed version info
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 20 20:09:42 UTC 2022 - scott.bradnick@suse.com
|
||||
|
||||
- Update to version 4.4+git20220720.d0ae240e2:
|
||||
* #3582 skip opengl info
|
||||
* fixup estr logging method
|
||||
* #2303 make is_socket re-usable
|
||||
* #3483 pycuda also imports numpy
|
||||
* #3579 more f-strings
|
||||
* oops: missing import
|
||||
* #3582 mixins info, option to log capabilities
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 19 19:01:06 UTC 2022 - scott.bradnick@suse.com
|
||||
|
||||
- Update to version 4.4+git20220719.d301bf723:
|
||||
* #3582 restrict client info exposed
|
||||
* the system tray forwarding is challenging
|
||||
* we are forced to use appindicator now
|
||||
* simplify
|
||||
* #3577 simplify
|
||||
* #3577 reorder
|
||||
* #3577 remove v4l2 legacy workarounds
|
||||
* typo
|
||||
* too many distros are missing pam pkgconfig files
|
||||
* not all Linux distros have this header file
|
||||
* another strangely misnamed package: libpam0g'
|
||||
* fix misnamed package dependencies
|
||||
* RHEL doesn't have a pam-devel package?
|
||||
* distros have all moved pam to /usr/include/security/pam*
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 18 22:29:08 UTC 2022 - scott.bradnick@suse.com
|
||||
|
||||
- Update to version 4.4+git20220718.6b84ef9f6:
|
||||
* skip all guessing using an env var
|
||||
* #3386 fix typo
|
||||
* procps-devel is not available on RHEL?
|
||||
* pam pkgconfig refs had gone missing
|
||||
* refer to Cython 'Extension' class directly
|
||||
* oops: nvenc is not a package
|
||||
* make it easier to change the number of cores used
|
||||
* ignore 'address' warnings building nvenc
|
||||
* use booleans for switches
|
||||
* no longer used
|
||||
* try the local cuda symlink before anything else
|
||||
* this doesn't do anything
|
||||
* make it easier to choose the number of threads
|
||||
* #3577 remove legacy workarounds
|
||||
* #3577 add switch for 'argb' codec
|
||||
* #3577 group subsystems together
|
||||
* #3577 group macos / win32 bundling workarounds together
|
||||
* #3577 nvenc must use pkgconfig
|
||||
* #3577 enable '-DDEBUG' globally
|
||||
* #3577 convert pam module in pkg-config
|
||||
* CUDA symlink on MS Windows:
|
||||
* #3577 move nvenc tweaks to pkgconfig file
|
||||
* ignore temporary build generated installer file
|
||||
* #3390 evdi uses c++
|
||||
* #3577 use pkgconfig file for nvfbc flags
|
||||
* #3577 simplify nvenc / nvjpeg using pkgconfig files on win32
|
||||
* #3584 typo
|
||||
* fixup bccf36d62f6857094054cb3bd5cefd70b1fd5423: directories must start with a '/'
|
||||
* #2753 RPM file list update
|
||||
* #2753 add new packaging dependency
|
||||
* #3582 limit the info available to remote hosts
|
||||
* convert tray menu to use the new qrencode module
|
||||
* #56 fix miscalculation of initial refresh rate
|
||||
* #3583 update to the new python-cryptography API
|
||||
* #3579 (almost) finish this one module
|
||||
* #3483 only import numpy once, block if necessary
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jun 21 17:37:18 UTC 2022 - scott.bradnick@suse.com
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
name: xpra
|
||||
version: 4.4+git20220621.872c7f8d8
|
||||
mtime: 1655829759
|
||||
commit: 872c7f8d861777f09cb765b945cc600e49a7f47d
|
||||
version: 4.4+git20220726.a03b3f67e
|
||||
mtime: 1658863895
|
||||
commit: a03b3f67e953c342cb9d71a0c91cdf51ab002a18
|
||||
|
||||
73
xpra.spec
73
xpra.spec
@ -25,10 +25,17 @@
|
||||
# setup.py build --verbose ...
|
||||
# Xpra version 4.4
|
||||
%define xpra_ver 4.4
|
||||
# -----
|
||||
# ----
|
||||
%if 0%{?suse_version} >= 1550
|
||||
%define ffmpeg_ver 5
|
||||
%else
|
||||
%define ffmpeg_ver 4
|
||||
%endif
|
||||
|
||||
# ----
|
||||
%global __requires_exclude ^typelib\\(GtkosxApplication\\)|typelib\\(GdkGLExt\\)|typelib\\(GtkGLExt\\).*$
|
||||
Name: xpra
|
||||
Version: 4.4+git20220621.872c7f8d8
|
||||
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
|
||||
@ -36,22 +43,30 @@ Group: System/X11/Utilities
|
||||
URL: https://www.xpra.org/
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Source1: xpra-icon.png
|
||||
# -----
|
||||
# ----
|
||||
BuildRequires: ImageMagick
|
||||
BuildRequires: brotli
|
||||
BuildRequires: cups
|
||||
BuildRequires: cups-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: ffmpeg-%{ffmpeg_ver}
|
||||
BuildRequires: ffmpeg-%{ffmpeg_ver}-libavcodec-devel
|
||||
BuildRequires: ffmpeg-%{ffmpeg_ver}-libavformat-devel
|
||||
BuildRequires: ffmpeg-%{ffmpeg_ver}-libavutil-devel
|
||||
BuildRequires: ffmpeg-%{ffmpeg_ver}-libswresample-devel
|
||||
BuildRequires: ffmpeg-%{ffmpeg_ver}-libswscale-devel
|
||||
BuildRequires: git-core
|
||||
BuildRequires: hicolor-icon-theme
|
||||
# Needed for proper OS detection by setup.py
|
||||
%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150500
|
||||
BuildRequires: distribution-release
|
||||
# ----
|
||||
%if 0%{?suse_version} >= 1550
|
||||
%define using_release "distribution-release"
|
||||
BuildRequires: distribution-release
|
||||
%else
|
||||
BuildRequires: openSUSE-release
|
||||
%define using_release "openSUSE-release"
|
||||
BuildRequires: openSUSE-release
|
||||
%endif
|
||||
# ---------
|
||||
# ----
|
||||
BuildRequires: pam-devel
|
||||
%if %{with pandoc}
|
||||
BuildRequires: pandoc
|
||||
@ -60,8 +75,8 @@ BuildRequires: pkgconfig
|
||||
BuildRequires: python3-Cython >= 0.20.0
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-gobject-devel
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: python3-pyxdg
|
||||
BuildRequires: python3-setuptools
|
||||
BuildRequires: update-desktop-files
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(libavcodec) >= 58
|
||||
@ -69,6 +84,9 @@ BuildRequires: pkgconfig(libavformat) >= 58
|
||||
BuildRequires: pkgconfig(libswscale) >= 5
|
||||
BuildRequires: pkgconfig(libsystemd)
|
||||
BuildRequires: pkgconfig(libwebp) >= 0.4
|
||||
# TW can do this, 15.4 can't ...
|
||||
#BuildRequires: pkgconfig(pam)
|
||||
#BuildRequires: pkgconfig(pam_misc)
|
||||
BuildRequires: pkgconfig(py3cairo)
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
BuildRequires: pkgconfig(vpx) >= 1.4.0
|
||||
@ -78,6 +96,8 @@ BuildRequires: pkgconfig(xkbfile)
|
||||
BuildRequires: pkgconfig(xrandr)
|
||||
BuildRequires: pkgconfig(xres)
|
||||
BuildRequires: pkgconfig(xtst)
|
||||
BuildRequires: procps-devel
|
||||
BuildRequires: qrencode-devel
|
||||
Requires: dbus-1-x11
|
||||
Requires: gstreamer-plugins-base
|
||||
Requires: gstreamer-plugins-good
|
||||
@ -101,7 +121,6 @@ Requires: shared-mime-info
|
||||
Requires: xf86-video-dummy
|
||||
Requires: xorg-x11-xauth
|
||||
Requires(post): %fillup_prereq
|
||||
Recommends: xdg-menu
|
||||
Recommends: lsb-release
|
||||
Recommends: pinentry
|
||||
Recommends: pulseaudio-module-x11
|
||||
@ -113,6 +132,9 @@ Recommends: python3-opengl-accelerate
|
||||
Recommends: python3-paramiko
|
||||
Recommends: python3-pyinotify
|
||||
Recommends: python3-pyxdg
|
||||
Recommends: xdg-menu
|
||||
# Overflow errors on 32-bit
|
||||
ExcludeArch: %ix86
|
||||
%{?systemd_ordering}
|
||||
|
||||
%description
|
||||
@ -133,18 +155,27 @@ 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
|
||||
|
||||
### DEBUGGING
|
||||
echo "ffmpeg_ver: %ffmpeg_ver"
|
||||
echo "sle_version: %sle_version"
|
||||
echo "suse_version: %suse_version"
|
||||
echo "using_release: %using_release"
|
||||
#####
|
||||
|
||||
export CFLAGS="%{optflags}"
|
||||
%if 0%{?suse_version} <= 1500
|
||||
#%%if 0%%{?suse_version} <= 1500
|
||||
export CFLAGS="$CFLAGS -Wno-error=deprecated-declarations"
|
||||
%endif
|
||||
#%%endif
|
||||
python3 setup.py clean
|
||||
|
||||
python3 setup.py build \
|
||||
@ -163,7 +194,16 @@ python3 setup.py build \
|
||||
%if !%{with pandoc}
|
||||
--without-docs \
|
||||
%endif
|
||||
%if %{ffmpeg_ver} == 4
|
||||
--without-nvfbc
|
||||
%endif
|
||||
%if %{ffmpeg_ver} == 5
|
||||
--without-nvfbc
|
||||
%endif
|
||||
#%%if %%{ffmpeg_ver} == 5
|
||||
# --without-nvfbc \
|
||||
# --without-strict
|
||||
#%%endif
|
||||
|
||||
%install
|
||||
python3 setup.py install \
|
||||
@ -187,11 +227,6 @@ 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}
|
||||
mkdir -vp %{buildroot}%{_libexecdir}/%{name}
|
||||
mv -v %{buildroot}%{_prefix}/libexec/%{name}/* %{buildroot}%{_libexecdir}/%{name}
|
||||
%endif
|
||||
|
||||
%fdupes -s %{buildroot}
|
||||
|
||||
%pre
|
||||
@ -225,6 +260,7 @@ mkdir -p %{_rundir}/%{name} || exit 1
|
||||
%dir %{_sysconfdir}/xpra
|
||||
%dir %{_sysconfdir}/xpra/conf.d
|
||||
%dir %{_sysconfdir}/xpra/content-categories
|
||||
%dir %{_sysconfdir}/xpra/content-parent
|
||||
%dir %{_sysconfdir}/xpra/content-type
|
||||
%dir %{_sysconfdir}/xpra/http-headers
|
||||
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/xpra.conf
|
||||
@ -232,6 +268,7 @@ mkdir -p %{_rundir}/%{name} || exit 1
|
||||
%config(noreplace) %{_sysconfdir}/xpra/*.conf
|
||||
%config(noreplace) %{_sysconfdir}/xpra/conf.d/*.conf
|
||||
%config(noreplace) %{_sysconfdir}/xpra/content-categories/*.conf
|
||||
%config(noreplace) %{_sysconfdir}/xpra/content-parent/*.conf
|
||||
%config(noreplace) %{_sysconfdir}/xpra/content-type/*.conf
|
||||
%config(noreplace) %{_sysconfdir}/xpra/http-headers/*.txt
|
||||
%config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/90-xpra-virtual.conf
|
||||
|
||||
Loading…
Reference in New Issue
Block a user