From 78345dbe01474ca14f179bbe8c782957c03c060e Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Wed, 25 Mar 2015 11:37:58 +0000 Subject: [PATCH 001/267] Initial check in of package --- .gitignore | 1 + sources | 1 + xpra-unbundle-rencode.patch | 15 ++ xpra.spec | 295 ++++++++++++++++++++++++++++++++++++ 4 files changed, 312 insertions(+) create mode 100644 xpra-unbundle-rencode.patch create mode 100644 xpra.spec diff --git a/.gitignore b/.gitignore index e69de29..044f3a2 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/xpra-0.14.21.tar.xz diff --git a/sources b/sources index e69de29..6ea1b8a 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +f22af4f2942dd2fa6224af45a7363ab2 xpra-0.14.21.tar.xz diff --git a/xpra-unbundle-rencode.patch b/xpra-unbundle-rencode.patch new file mode 100644 index 0000000..6210d2a --- /dev/null +++ b/xpra-unbundle-rencode.patch @@ -0,0 +1,15 @@ +diff -up xpra-0.14.19/setup.py.orig xpra-0.14.19/setup.py +--- xpra-0.14.19/setup.py.orig 2015-03-03 18:09:22.759395756 +0000 ++++ xpra-0.14.19/setup.py 2015-03-03 18:43:03.947388532 +0000 +@@ -1744,11 +1744,6 @@ if vpx_ENABLED: + + + toggle_packages(rencode_ENABLED, "xpra.net.rencode") +-if rencode_ENABLED: +- rencode_pkgconfig = pkgconfig(optimize=not debug_ENABLED) +- cython_add(Extension("xpra.net.rencode.rencode", +- ["xpra/net/rencode/rencode.pyx"], +- **rencode_pkgconfig)) + + + toggle_packages(bencode_ENABLED, "xpra.net.bencode") diff --git a/xpra.spec b/xpra.spec new file mode 100644 index 0000000..75daa84 --- /dev/null +++ b/xpra.spec @@ -0,0 +1,295 @@ +%bcond_with enc_x264 +%bcond_with dec_avcodec +%bcond_with csc_swscale + +# These are nececessary as the _with_foo is *not* defined if the +# --with flag isn't specifed, and we need to have the --without +# specified option in that case. +%if !%{with enc_x264} +%define _with_enc_x264 --without-enc_x264 +%endif + +%if !%{with dec_avcodec} +%define _with_dec_avcodec --without-dec_avcodec +%endif + +%if !%{with csc_swscale} +%define _with_csc_swscale --without-csc_swscale +%endif + +# Remove private provides from .so files in the python_sitearch directory +%global __provides_exclude_from ^%{python_sitearch}/.*\\.so$ + +Name: xpra +Version: 0.14.21 +Release: 3%{?dist} +Summary: Remote display server for applications and desktops + +License: GPLv2+ and BSD and LGPLv3+ and MIT +URL: https://www.xpra.org/ +Source0: https://xpra.org/src/%{name}-%{version}.tar.xz + +# patch setup.py to disable building bundled libraries +Patch1: %{name}-unbundle-rencode.patch + +BuildRequires: python2-devel pygobject2-devel pygtk2-devel +BuildRequires: libXtst-devel +BuildRequires: libxkbfile-devel +BuildRequires: Cython +BuildRequires: desktop-file-utils +BuildRequires: libvpx-devel +BuildRequires: libwebp-devel +%if %{with enc_x264} +BuildRequires: x264-devel +%endif +%if %{with dec_avcodec} || %{with csc_swscale} +BuildRequires: ffmpeg-devel +%endif + +Requires: python-imaging +Requires: dbus-python +Requires: xorg-x11-server-utils xorg-x11-server-Xvfb +Requires: xorg-x11-drv-dummy xorg-x11-drv-void +Requires: PyOpenGL pygtkglext +Requires: python-numeric numpy +Requires: gstreamer gstreamer-python +Requires: gstreamer-plugins-base gstreamer-plugins-good +Requires: pulseaudio pulseaudio-utils +Requires: python-rencode +Requires: js-web-socket-js +Requires: js-jquery + +Provides: bundled(js-jquery-ui) = 1.10.4 +%if 0%{?fedora} >= 21 +Requires: js-zlib +%else +Provides: bundled(js-zlib) +%endif + + +%description +Xpra is "screen for X": it allows you to run X programs, usually on a remote +host, direct their display to your local machine, and then to disconnect from +these programs and reconnect from the same or another machine, without losing +any state. It gives you remote access to individual applications. + +Xpra is "rootless" or "seamless": programs you run under it show up on your +desktop as regular programs, managed by your regular window manager. +Sessions can be accessed over SSH, or password protected over plain TCP sockets. +Xpra is usable over reasonably slow links and does its best to adapt to changing +network bandwidth constraints. + + +%prep +%setup -q +%patch1 -p1 + +#use the system python-rencode +rm -f xpra/net/rencode/* +echo "from rencode import *" > xpra/net/rencode/__init__.py +echo "from rencode._rencode import __version__" >> xpra/net/rencode/__init__.py + +%build +CFLAGS="%{optflags}" %{__python} setup.py build \ + --with-vpx \ + --with-webp \ + %{?_with_enc_x264} \ + %{?_with_dec_avcodec} \ + %{?_with_csc_swscale} \ + --with-Xdummy \ + --with-Xdummy_wrapper + + +%install +%{__python} setup.py install --skip-build --root %{buildroot} + +#move icon to proper directory +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps +mv %{buildroot}%{_datadir}/icons/xpra.png \ + %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ + +#remove doc stuff from /usr/share +rm -f \ + %{buildroot}%{_datadir}/xpra/README \ + %{buildroot}%{_datadir}/xpra/COPYING + +#drop shebangs from python_sitearch +find %{buildroot}%{python_sitearch}/xpra -name '*.py' \ + -exec sed -i '1{\@^#!/usr/bin/env python@d}' {} \; + +#fix permissions on shared objects +find %{buildroot}%{python_sitearch}/xpra -name '*.so' \ + -exec chmod 0755 {} \; + +# delete any bundled SWFs - binary content forbidden by packaging +# guidelines +find %{buildroot}%{_datadir}/xpra -name '*.swf' -exec rm {} \; + +# Use system js-query rather than the bundled one +ln -sf ../../../javascript/jquery/2/jquery.min.js \ + %{buildroot}%{_datadir}/xpra/www/include/jquery.min.js + +# Use system web-socket-js rather than the bundled one +rm -rf %{buildroot}%{_datadir}/xpra/www/include/web-socket-js +ln -sf ../../../javascript/web-socket-js \ + %{buildroot}%{_datadir}/xpra/www/include/web-socket-js + +# Use system js-zlib instead of bundled one on Fedora >= 21 +%if 0%{?fedora} >= 21 +for file in deflate.min.js inflate.min.js ; do + ln -sf ../../../javascript/zlib/$file \ + %{buildroot}%{_datadir}/xpra/www/include/$file +done +%endif + +# Ensure all .js files are not executeable +find %{buildroot}%{_datadir}/xpra/www/include -name '*.js' \ + -exec chmod 0644 {} \; + +%check +desktop-file-validate %{buildroot}%{_datadir}/applications/xpra.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/xpra_launcher.desktop + + +%post +/usr/bin/update-desktop-database &> /dev/null || : +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + + +%postun +/usr/bin/update-desktop-database &> /dev/null || : + +if [ $1 -eq 0 ] ; then + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + + +%posttrans +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + + +%files +%dir %{_sysconfdir}/xpra +%config(noreplace) %{_sysconfdir}/xpra/xorg.conf +%config(noreplace) %{_sysconfdir}/xpra/xpra.conf +%{_bindir}/xpra +%{_bindir}/xpra_Xdummy +%{_bindir}/xpra_launcher +%{python_sitearch}/xpra +%{python_sitearch}/*.egg-info +%{_datadir}/applications/xpra*.desktop +%{_datadir}/icons/hicolor/48x48/apps/xpra.png +%{_mandir}/man1/xpra.1.* +%{_mandir}/man1/xpra_launcher.1.* +%{_datadir}/xpra +%doc README COPYING NEWS + + +%changelog +* Tue Mar 24 2015 Jonathan G. Underwood - 0.14.21-3 +- Update license tag from GPLv2+ to GPLv2+ and BSD and LGPLv3+ and MIT + +* Mon Mar 23 2015 Jonathan G. Underwood - 0.14.21-2 +- Add conditionals for building with ffmpeg and x264 support, disabled + by default +- Remove Provides for bundled(js-web-socket-js) +- Use system js-zlib on Fedora >= 21 +- On Fedora < 21 add Provides for bundled(js-zlib) + +* Wed Mar 18 2015 Jonathan G. Underwood - 0.14.21-1 +- Update to 0.14.21 + +* Wed Mar 18 2015 Jonathan G. Underwood - 0.14.19-6 +- Unbundle js-query even on Fedora 20 + +* Wed Mar 18 2015 Jonathan G. Underwood - 0.14.19-5 +- Unbundle web-socket-js + +* Tue Mar 3 2015 Jonathan G. Underwood - 0.14.19-4 +- Add --with-Xdummy and --with-Xdummy_wrapper build options since Xorg + not installed at build time so autodetection fails + +* Tue Mar 3 2015 Jonathan G. Underwood - 0.14.19-3 +- Use js-jquery package only on F22 or later - not available on + earlier distros + +* Tue Mar 3 2015 Jonathan G. Underwood - 0.14.19-2 +- Update Summary to be more descriptive of package +- Use packaged js-jquery +- Add provides for bundled(js-jquery-ui) and bundled(js-web-socket-js) +- Build with vpx and webp support enabled +- Remove any installed SWF files +- Remove executable flag for all .js files +- Remove Requires for python-webm + +* Tue Mar 3 2015 Jonathan G. Underwood - 0.14.19-1 +- Update to upstream 0.14.19 +- Add BuildRequires for libxkbfile-devel +- No longer need to unbundle webp +- Rework and rename patch for unbundling of rencode + +* Fri Oct 18 2013 T.C. Hollingsworth - 0.10.6-1 +- new upstream release 0.10.6 + http://lists.devloop.org.uk/pipermail/shifter-users/2013-October/000726.html + +* Tue Oct 08 2013 T.C. Hollingsworth - 0.10.4-2 +- reenable webp support +- fix webm unbundling to support importing all modules in the webm package +- require latest python-webm so it matches what's bundled upstream + +* Mon Oct 07 2013 T.C. Hollingsworth - 0.10.4-1 +- rebase to 0.10.4 +- don't ship webm stuff that doesn't work without ffmpeg anyway + +* Thu Aug 01 2013 T.C. Hollingsworth - 0.9.8-1 +- new upstream release 0.9.8 + http://lists.devloop.org.uk/pipermail/shifter-users/2013-July/000615.html +- use HTTPS for URL and Source0 + +* Wed Jul 03 2013 T.C. Hollingsworth - 0.9.6-1 +- new upstream release 0.9.6 + http://lists.devloop.org.uk/pipermail/shifter-users/2013-June/000552.html + +* Thu Jun 27 2013 T.C. Hollingsworth - 0.9.5-1 +- new upstream release 0.9.5 + http://lists.devloop.org.uk/pipermail/shifter-users/2013-June/000549.html + +* Thu May 30 2013 T.C. Hollingsworth - 0.9.4-1 +- new upstream release 0.9.4 + http://lists.devloop.org.uk/pipermail/shifter-users/2013-May/000539.html + +* Mon May 13 2013 T.C. Hollingsworth - 0.9.2-1 +- new upstream release 0.9.2 + http://lists.devloop.org.uk/pipermail/shifter-users/2013-May/000525.html + +* Fri May 10 2013 T.C. Hollingsworth - 0.9.1-1 +- new upstream release 0.9.1 + http://lists.devloop.org.uk/pipermail/shifter-users/2013-May/000522.html + +* Tue May 07 2013 T.C. Hollingsworth - 0.9.0-2 +- fix rencode __version__ importing + +* Thu May 02 2013 T.C. Hollingsworth - 0.9.0-1 +- new upstream release 0.9.0 + http://lists.devloop.org.uk/pipermail/shifter-users/2013-April/000479.html +- delete the bundled code in prep instead of inside the patches +- don't bother including parti; it's going away upstream soon +- merge python-wimpiggy into main xpra package; it won't be seperated upstream soon + +* Thu Apr 18 2013 T.C. Hollingsworth - 0.8.8-4 +- unbundle rencode and webm +- fix equality operator in Requires +- drop unnecessary multiple copies of NEWS +- don't remove buildroot + +* Thu Apr 11 2013 T.C. Hollingsworth - 0.8.8-3 +- drop unmet dependency on gstreamer-plugins-ugly +- fix permissions on shared objects +- add scriptlets necessary for icon/desktop file + +* Thu Mar 28 2013 T.C. Hollingsworth - 0.8.8-2 +- disable codecs prohibited in Fedora + +* Thu Mar 14 2013 T.C. Hollingsworth - 0.8.8-1 +- initial package From 5fb82e2b772c5b671180bb77d21835cd96600505 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 6 Apr 2015 16:33:06 -0400 Subject: [PATCH 002/267] rebuild for libvpx 1.4.0 --- xpra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 75daa84..d828afa 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,7 +22,7 @@ Name: xpra Version: 0.14.21 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -187,6 +187,9 @@ fi %changelog +* Mon Apr 6 2015 Tom Callaway - 0.14.21-4 +- rebuild for libvpx 1.4.0 + * Tue Mar 24 2015 Jonathan G. Underwood - 0.14.21-3 - Update license tag from GPLv2+ to GPLv2+ and BSD and LGPLv3+ and MIT From 0bb264dce7841221665199cff518bd2d545b0986 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Mon, 27 Apr 2015 15:16:24 +0100 Subject: [PATCH 003/267] Add patch to remove reference to the xorg void driver in xorg.conf (BZ #1215527) --- xpra-0.14-stop-using-void-driver.patch | 29 ++++++++++++++++++++++++++ xpra.spec | 12 ++++++++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 xpra-0.14-stop-using-void-driver.patch diff --git a/xpra-0.14-stop-using-void-driver.patch b/xpra-0.14-stop-using-void-driver.patch new file mode 100644 index 0000000..81df892 --- /dev/null +++ b/xpra-0.14-stop-using-void-driver.patch @@ -0,0 +1,29 @@ +diff -up xpra-0.14.21/etc/xpra/xorg.conf.orig xpra-0.14.21/etc/xpra/xorg.conf +--- xpra-0.14.21/etc/xpra/xorg.conf.orig 2015-01-17 06:08:12.000000000 +0000 ++++ xpra-0.14.21/etc/xpra/xorg.conf 2015-04-27 15:06:53.897095906 +0100 +@@ -11,18 +11,6 @@ Section "ServerFlags" + Option "AutoAddDevices" "false" + EndSection + +-Section "InputDevice" +- Identifier "dummy_mouse" +- Option "CorePointer" "true" +- Driver "void" +-EndSection +- +-Section "InputDevice" +- Identifier "dummy_keyboard" +- Option "CoreKeyboard" "true" +- Driver "void" +-EndSection +- + Section "Device" + Identifier "dummy_videocard" + Driver "dummy" +@@ -173,6 +161,4 @@ EndSection + Section "ServerLayout" + Identifier "dummy_layout" + Screen "dummy_screen" +- InputDevice "dummy_mouse" +- InputDevice "dummy_keyboard" + EndSection diff --git a/xpra.spec b/xpra.spec index d828afa..7275310 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,7 +22,7 @@ Name: xpra Version: 0.14.21 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -31,6 +31,12 @@ Source0: https://xpra.org/src/%{name}-%{version}.tar.xz # patch setup.py to disable building bundled libraries Patch1: %{name}-unbundle-rencode.patch +# Patch to remove reference to the xorg void driver from xorg.conf +# This patch can be removed for 0.15 as merged upstream +# See: +# http://xpra.org/trac/ticket/843 +# https://bugzilla.redhat.com/show_bug.cgi?id=1215527 +Patch2: xpra-0.14-stop-using-void-driver.patch BuildRequires: python2-devel pygobject2-devel pygtk2-devel BuildRequires: libXtst-devel @@ -83,6 +89,7 @@ network bandwidth constraints. %prep %setup -q %patch1 -p1 +%patch2 -p1 #use the system python-rencode rm -f xpra/net/rencode/* @@ -187,6 +194,9 @@ fi %changelog +* Mon Apr 27 2015 Jonathan G. Underwood - 0.14.21-5 +- Add patch to remove reference to the xorg void driver in xorg.conf (BZ #1215527) + * Mon Apr 6 2015 Tom Callaway - 0.14.21-4 - rebuild for libvpx 1.4.0 From 7ac90bc7447953085571deca7613b7f3565024bd Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Mon, 27 Apr 2015 15:56:12 +0100 Subject: [PATCH 004/267] Update to 0.14.22 --- .gitignore | 1 + sources | 2 +- xpra.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 044f3a2..02e6260 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /xpra-0.14.21.tar.xz +/xpra-0.14.22.tar.xz diff --git a/sources b/sources index 6ea1b8a..8a3ea4e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f22af4f2942dd2fa6224af45a7363ab2 xpra-0.14.21.tar.xz +5dde47a562d141cbd921cc191472f7c8 xpra-0.14.22.tar.xz diff --git a/xpra.spec b/xpra.spec index 7275310..49e2998 100644 --- a/xpra.spec +++ b/xpra.spec @@ -21,8 +21,8 @@ %global __provides_exclude_from ^%{python_sitearch}/.*\\.so$ Name: xpra -Version: 0.14.21 -Release: 5%{?dist} +Version: 0.14.22 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -194,6 +194,9 @@ fi %changelog +* Mon Apr 27 2015 Jonathan G. Underwood - 0.14.22-1 +- Update to 0.14.22 + * Mon Apr 27 2015 Jonathan G. Underwood - 0.14.21-5 - Add patch to remove reference to the xorg void driver in xorg.conf (BZ #1215527) From faf33293c43d13397f623923be4d38453ab73180 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Mon, 27 Apr 2015 16:09:50 +0100 Subject: [PATCH 005/267] Validate and own /usr/share/appdata/xpra.appdata.xml Add BuildRequires libappstream-glib --- xpra.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 49e2998..be29eef 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,7 +22,7 @@ Name: xpra Version: 0.14.22 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -45,6 +45,7 @@ BuildRequires: Cython BuildRequires: desktop-file-utils BuildRequires: libvpx-devel BuildRequires: libwebp-devel +BuildRequires: libappstream-glib %if %{with enc_x264} BuildRequires: x264-devel %endif @@ -153,6 +154,9 @@ done find %{buildroot}%{_datadir}/xpra/www/include -name '*.js' \ -exec chmod 0644 {} \; +appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/xpra.appdata.xml + + %check desktop-file-validate %{buildroot}%{_datadir}/applications/xpra.desktop desktop-file-validate %{buildroot}%{_datadir}/applications/xpra_launcher.desktop @@ -190,10 +194,15 @@ fi %{_mandir}/man1/xpra.1.* %{_mandir}/man1/xpra_launcher.1.* %{_datadir}/xpra +%{_datadir}/appdata/xpra.appdata.xml %doc README COPYING NEWS %changelog +* Mon Apr 27 2015 Jonathan G. Underwood - 0.14.22-2 +- Validate and own /usr/share/appdata/xpra.appdata.xml +- Add BuildRequires libappstream-glib + * Mon Apr 27 2015 Jonathan G. Underwood - 0.14.22-1 - Update to 0.14.22 From 0f8624aa64dbcabed962beb83c6c8565da066eaa Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Mon, 27 Apr 2015 18:18:30 +0100 Subject: [PATCH 006/267] Remove Requires for xorg-x11-drv-void --- xpra.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xpra.spec b/xpra.spec index be29eef..91ccd9f 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,7 +22,7 @@ Name: xpra Version: 0.14.22 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -56,7 +56,7 @@ BuildRequires: ffmpeg-devel Requires: python-imaging Requires: dbus-python Requires: xorg-x11-server-utils xorg-x11-server-Xvfb -Requires: xorg-x11-drv-dummy xorg-x11-drv-void +Requires: xorg-x11-drv-dummy Requires: PyOpenGL pygtkglext Requires: python-numeric numpy Requires: gstreamer gstreamer-python @@ -199,6 +199,9 @@ fi %changelog +* Mon Apr 27 2015 Jonathan G. Underwood - 0.14.22-3 +- Remove Requires for xorg-x11-drv-void + * Mon Apr 27 2015 Jonathan G. Underwood - 0.14.22-2 - Validate and own /usr/share/appdata/xpra.appdata.xml - Add BuildRequires libappstream-glib From cf33176e16045bd59f5585e4e981276d9bff7af0 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Tue, 28 Apr 2015 12:33:17 +0100 Subject: [PATCH 007/267] Patch appdata file to have more information and proper paragraph ending period so validation works --- xpra-0.14.22-appdata.patch | 35 +++++++++++++++++++++++++++++++++++ xpra.spec | 11 ++++++++++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 xpra-0.14.22-appdata.patch diff --git a/xpra-0.14.22-appdata.patch b/xpra-0.14.22-appdata.patch new file mode 100644 index 0000000..0d81355 --- /dev/null +++ b/xpra-0.14.22-appdata.patch @@ -0,0 +1,35 @@ +diff -up xpra-0.14.22/xdg/xpra.appdata.xml.orig xpra-0.14.22/xdg/xpra.appdata.xml +--- xpra-0.14.22/xdg/xpra.appdata.xml.orig 2015-04-02 10:05:47.000000000 +0100 ++++ xpra-0.14.22/xdg/xpra.appdata.xml 2015-04-28 12:02:59.593511678 +0100 +@@ -5,14 +5,27 @@ + CC0-1.0 + GPL-2.0+ + Xpra +- Screen for X11 ++ A persistent remote display server and client for X11 + +

+- Xpra gives you "persistent remote applications" for X11. ++ Xpra is a persistent remote display server and client for X11 ++ applications and desktops. +

+

+- Xpra allows you to forward applications or full desktops to remote clients, +- including sound, clipboard, printing, etc ++ Xpra is "screen for X": it allows you to run X programs, usually ++ on a remote host, direct their display to your local machine, and ++ then to disconnect from these programs and reconnect from the same ++ or another machine, without losing any state. It gives you remote ++ access to individual applications. Xpra also allows forwarding of ++ sound, clipboard and printing services. ++

++

++ Xpra is "rootless" or "seamless": programs you run under it show ++ up on your desktop as regular programs, managed by your regular ++ window manager. Sessions can be accessed over SSH, or password ++ protected over plain TCP sockets. Xpra is usable over reasonably ++ slow links and does its best to adapt to changing network ++ bandwidth constraints. +

+ + diff --git a/xpra.spec b/xpra.spec index 91ccd9f..1d2172e 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,7 +22,7 @@ Name: xpra Version: 0.14.22 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -37,6 +37,10 @@ Patch1: %{name}-unbundle-rencode.patch # http://xpra.org/trac/ticket/843 # https://bugzilla.redhat.com/show_bug.cgi?id=1215527 Patch2: xpra-0.14-stop-using-void-driver.patch +# This patch fixes up the paragraphs to end with a period so the +# validation doesn't bail. It also expands the text to be more +# helpful. +Patch3: xpra-0.14.22-appdata.patch BuildRequires: python2-devel pygobject2-devel pygtk2-devel BuildRequires: libXtst-devel @@ -91,6 +95,7 @@ network bandwidth constraints. %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 #use the system python-rencode rm -f xpra/net/rencode/* @@ -199,6 +204,10 @@ fi %changelog +* Tue Apr 28 2015 Jonathan G. Underwood - 0.14.22-4 +- Patch appdata file to have more information and proper paragraph + ending period so validation works + * Mon Apr 27 2015 Jonathan G. Underwood - 0.14.22-3 - Remove Requires for xorg-x11-drv-void From 644a86f3cca5a7d273aae978f505b19be5a842b7 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Tue, 26 May 2015 15:19:29 +0100 Subject: [PATCH 008/267] Add patch to correctly locate Xorg binary in Fedora 22 onwards (BZ 1224678) --- xpra-0.14.22-fedora22-xorg.patch | 19 +++++++++++++++++++ xpra.spec | 12 ++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 xpra-0.14.22-fedora22-xorg.patch diff --git a/xpra-0.14.22-fedora22-xorg.patch b/xpra-0.14.22-fedora22-xorg.patch new file mode 100644 index 0000000..8abd7c4 --- /dev/null +++ b/xpra-0.14.22-fedora22-xorg.patch @@ -0,0 +1,19 @@ +diff -up xpra-0.14.22/scripts/xpra_Xdummy.orig2 xpra-0.14.22/scripts/xpra_Xdummy +--- xpra-0.14.22/scripts/xpra_Xdummy.orig2 2015-05-26 14:48:03.916843869 +0100 ++++ xpra-0.14.22/scripts/xpra_Xdummy 2015-05-26 14:50:23.657805625 +0100 +@@ -35,8 +35,13 @@ find_ld_linux() { + fi + } + +-if [ -x "/usr/libexec/Xorg.bin" ]; then +- #Fedora 21+ workaround where /usr/bin/Xorg is not suid ++if [ -x "/usr/libexec/Xorg" ]; then ++ #Fedora 22+ workaround where /usr/bin/Xorg is not suid ++ #because it is a script, which calls /usr/libexec/Xorg.wrap ++ #which is setuid, and which eventually calls this one: ++ XORG_BIN="/usr/libexec/Xorg" ++elif [ -x "/usr/libexec/Xorg.bin" ]; then ++ #Fedora 21 workaround where /usr/bin/Xorg is not suid + #because it is a script, which calls /usr/libexec/Xorg.wrap + #which is setuid, and which eventually calls this one: + XORG_BIN="/usr/libexec/Xorg.bin" diff --git a/xpra.spec b/xpra.spec index 1d2172e..61472f0 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,7 +22,7 @@ Name: xpra Version: 0.14.22 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -39,8 +39,12 @@ Patch1: %{name}-unbundle-rencode.patch Patch2: xpra-0.14-stop-using-void-driver.patch # This patch fixes up the paragraphs to end with a period so the # validation doesn't bail. It also expands the text to be more -# helpful. +# helpful - will be included in 0.14.24. Patch3: xpra-0.14.22-appdata.patch +# This patch fixes: +# https://bugzilla.redhat.com/show_bug.cgi?id=1224678 +# https://www.xpra.org/trac/ticket/872 +Patch4: xpra-0.14.22-fedora22-xorg.patch BuildRequires: python2-devel pygobject2-devel pygtk2-devel BuildRequires: libXtst-devel @@ -96,6 +100,7 @@ network bandwidth constraints. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 #use the system python-rencode rm -f xpra/net/rencode/* @@ -204,6 +209,9 @@ fi %changelog +* Tue May 26 2015 Jonathan G. Underwood - 0.14.22-5 +- Add patch to correctly locate Xorg binary in Fedora 22 onwards (BZ 1224678) + * Tue Apr 28 2015 Jonathan G. Underwood - 0.14.22-4 - Patch appdata file to have more information and proper paragraph ending period so validation works From 2b4af443e9208db19461cecbda7b39795484a23d Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Wed, 27 May 2015 19:39:04 +0100 Subject: [PATCH 009/267] Update to 0.14.24 Remove Requires for xorg-x11-server-Xvfb Remove upstreamed appdata patch --- xpra-0.14.22-appdata.patch | 35 ----------------------------------- xpra.spec | 16 ++++++++-------- 2 files changed, 8 insertions(+), 43 deletions(-) delete mode 100644 xpra-0.14.22-appdata.patch diff --git a/xpra-0.14.22-appdata.patch b/xpra-0.14.22-appdata.patch deleted file mode 100644 index 0d81355..0000000 --- a/xpra-0.14.22-appdata.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -up xpra-0.14.22/xdg/xpra.appdata.xml.orig xpra-0.14.22/xdg/xpra.appdata.xml ---- xpra-0.14.22/xdg/xpra.appdata.xml.orig 2015-04-02 10:05:47.000000000 +0100 -+++ xpra-0.14.22/xdg/xpra.appdata.xml 2015-04-28 12:02:59.593511678 +0100 -@@ -5,14 +5,27 @@ - CC0-1.0 - GPL-2.0+ - Xpra -- Screen for X11 -+ A persistent remote display server and client for X11 - -

-- Xpra gives you "persistent remote applications" for X11. -+ Xpra is a persistent remote display server and client for X11 -+ applications and desktops. -

-

-- Xpra allows you to forward applications or full desktops to remote clients, -- including sound, clipboard, printing, etc -+ Xpra is "screen for X": it allows you to run X programs, usually -+ on a remote host, direct their display to your local machine, and -+ then to disconnect from these programs and reconnect from the same -+ or another machine, without losing any state. It gives you remote -+ access to individual applications. Xpra also allows forwarding of -+ sound, clipboard and printing services. -+

-+

-+ Xpra is "rootless" or "seamless": programs you run under it show -+ up on your desktop as regular programs, managed by your regular -+ window manager. Sessions can be accessed over SSH, or password -+ protected over plain TCP sockets. Xpra is usable over reasonably -+ slow links and does its best to adapt to changing network -+ bandwidth constraints. -

- - diff --git a/xpra.spec b/xpra.spec index 61472f0..e1d2574 100644 --- a/xpra.spec +++ b/xpra.spec @@ -21,8 +21,8 @@ %global __provides_exclude_from ^%{python_sitearch}/.*\\.so$ Name: xpra -Version: 0.14.22 -Release: 5%{?dist} +Version: 0.14.24 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -37,10 +37,6 @@ Patch1: %{name}-unbundle-rencode.patch # http://xpra.org/trac/ticket/843 # https://bugzilla.redhat.com/show_bug.cgi?id=1215527 Patch2: xpra-0.14-stop-using-void-driver.patch -# This patch fixes up the paragraphs to end with a period so the -# validation doesn't bail. It also expands the text to be more -# helpful - will be included in 0.14.24. -Patch3: xpra-0.14.22-appdata.patch # This patch fixes: # https://bugzilla.redhat.com/show_bug.cgi?id=1224678 # https://www.xpra.org/trac/ticket/872 @@ -63,7 +59,7 @@ BuildRequires: ffmpeg-devel Requires: python-imaging Requires: dbus-python -Requires: xorg-x11-server-utils xorg-x11-server-Xvfb +Requires: xorg-x11-server-utils Requires: xorg-x11-drv-dummy Requires: PyOpenGL pygtkglext Requires: python-numeric numpy @@ -99,7 +95,6 @@ network bandwidth constraints. %setup -q %patch1 -p1 %patch2 -p1 -%patch3 -p1 %patch4 -p1 #use the system python-rencode @@ -209,6 +204,11 @@ fi %changelog +* Wed May 27 2015 Jonathan G. Underwood - 0.14.24-1 +- Update to 0.14.24 +- Remove Requires for xorg-x11-server-Xvfb +- Remove upstreamed appdata patch + * Tue May 26 2015 Jonathan G. Underwood - 0.14.22-5 - Add patch to correctly locate Xorg binary in Fedora 22 onwards (BZ 1224678) From 938cf9600dafa633fc4b2c43ae5445665f4c25ab Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Thu, 28 May 2015 18:07:30 +0100 Subject: [PATCH 010/267] Update sources for 0.14.24 From d60358967856b848512ead084900dcf678f1f0f4 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Thu, 28 May 2015 18:12:20 +0100 Subject: [PATCH 011/267] Really update sources and .gitignore for 0.14.24 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 02e6260..3029aab 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /xpra-0.14.21.tar.xz /xpra-0.14.22.tar.xz +/xpra-0.14.24.tar.xz diff --git a/sources b/sources index 8a3ea4e..09f4df6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5dde47a562d141cbd921cc191472f7c8 xpra-0.14.22.tar.xz +dfe7119aedb240306f14707daf7a4d06 xpra-0.14.24.tar.xz From ff57c8429b3dcd97ca21ec5b8430a65b1a686cef Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Mon, 1 Jun 2015 16:53:18 +0100 Subject: [PATCH 012/267] Update to 0.15.0 Add BuildRequires for cups-devel and Requires for cups-filesystem Replace mention of avcodec with avcodec2 Drop xpra-unbundle-rencode.patch, and no longer patch to use system rencode Drop xpra-0.14-stop-using-void-driver.patch Drop xpra-0.14.22-fedora22-xorg.patch --- .gitignore | 1 + sources | 2 +- xpra-0.14-stop-using-void-driver.patch | 29 --------------- xpra-0.14.22-fedora22-xorg.patch | 19 ---------- xpra-unbundle-rencode.patch | 15 -------- xpra.spec | 51 +++++++++++--------------- 6 files changed, 24 insertions(+), 93 deletions(-) delete mode 100644 xpra-0.14-stop-using-void-driver.patch delete mode 100644 xpra-0.14.22-fedora22-xorg.patch delete mode 100644 xpra-unbundle-rencode.patch diff --git a/.gitignore b/.gitignore index 3029aab..117e888 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /xpra-0.14.21.tar.xz /xpra-0.14.22.tar.xz /xpra-0.14.24.tar.xz +/xpra-0.15.0.tar.xz diff --git a/sources b/sources index 09f4df6..6b52c39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dfe7119aedb240306f14707daf7a4d06 xpra-0.14.24.tar.xz +803020c4ceaf03f548fbcc9d3f7556f7 xpra-0.15.0.tar.xz diff --git a/xpra-0.14-stop-using-void-driver.patch b/xpra-0.14-stop-using-void-driver.patch deleted file mode 100644 index 81df892..0000000 --- a/xpra-0.14-stop-using-void-driver.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -up xpra-0.14.21/etc/xpra/xorg.conf.orig xpra-0.14.21/etc/xpra/xorg.conf ---- xpra-0.14.21/etc/xpra/xorg.conf.orig 2015-01-17 06:08:12.000000000 +0000 -+++ xpra-0.14.21/etc/xpra/xorg.conf 2015-04-27 15:06:53.897095906 +0100 -@@ -11,18 +11,6 @@ Section "ServerFlags" - Option "AutoAddDevices" "false" - EndSection - --Section "InputDevice" -- Identifier "dummy_mouse" -- Option "CorePointer" "true" -- Driver "void" --EndSection -- --Section "InputDevice" -- Identifier "dummy_keyboard" -- Option "CoreKeyboard" "true" -- Driver "void" --EndSection -- - Section "Device" - Identifier "dummy_videocard" - Driver "dummy" -@@ -173,6 +161,4 @@ EndSection - Section "ServerLayout" - Identifier "dummy_layout" - Screen "dummy_screen" -- InputDevice "dummy_mouse" -- InputDevice "dummy_keyboard" - EndSection diff --git a/xpra-0.14.22-fedora22-xorg.patch b/xpra-0.14.22-fedora22-xorg.patch deleted file mode 100644 index 8abd7c4..0000000 --- a/xpra-0.14.22-fedora22-xorg.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up xpra-0.14.22/scripts/xpra_Xdummy.orig2 xpra-0.14.22/scripts/xpra_Xdummy ---- xpra-0.14.22/scripts/xpra_Xdummy.orig2 2015-05-26 14:48:03.916843869 +0100 -+++ xpra-0.14.22/scripts/xpra_Xdummy 2015-05-26 14:50:23.657805625 +0100 -@@ -35,8 +35,13 @@ find_ld_linux() { - fi - } - --if [ -x "/usr/libexec/Xorg.bin" ]; then -- #Fedora 21+ workaround where /usr/bin/Xorg is not suid -+if [ -x "/usr/libexec/Xorg" ]; then -+ #Fedora 22+ workaround where /usr/bin/Xorg is not suid -+ #because it is a script, which calls /usr/libexec/Xorg.wrap -+ #which is setuid, and which eventually calls this one: -+ XORG_BIN="/usr/libexec/Xorg" -+elif [ -x "/usr/libexec/Xorg.bin" ]; then -+ #Fedora 21 workaround where /usr/bin/Xorg is not suid - #because it is a script, which calls /usr/libexec/Xorg.wrap - #which is setuid, and which eventually calls this one: - XORG_BIN="/usr/libexec/Xorg.bin" diff --git a/xpra-unbundle-rencode.patch b/xpra-unbundle-rencode.patch deleted file mode 100644 index 6210d2a..0000000 --- a/xpra-unbundle-rencode.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up xpra-0.14.19/setup.py.orig xpra-0.14.19/setup.py ---- xpra-0.14.19/setup.py.orig 2015-03-03 18:09:22.759395756 +0000 -+++ xpra-0.14.19/setup.py 2015-03-03 18:43:03.947388532 +0000 -@@ -1744,11 +1744,6 @@ if vpx_ENABLED: - - - toggle_packages(rencode_ENABLED, "xpra.net.rencode") --if rencode_ENABLED: -- rencode_pkgconfig = pkgconfig(optimize=not debug_ENABLED) -- cython_add(Extension("xpra.net.rencode.rencode", -- ["xpra/net/rencode/rencode.pyx"], -- **rencode_pkgconfig)) - - - toggle_packages(bencode_ENABLED, "xpra.net.bencode") diff --git a/xpra.spec b/xpra.spec index e1d2574..abbbd06 100644 --- a/xpra.spec +++ b/xpra.spec @@ -1,5 +1,5 @@ %bcond_with enc_x264 -%bcond_with dec_avcodec +%bcond_with dec_avcodec2 %bcond_with csc_swscale # These are nececessary as the _with_foo is *not* defined if the @@ -9,8 +9,8 @@ %define _with_enc_x264 --without-enc_x264 %endif -%if !%{with dec_avcodec} -%define _with_dec_avcodec --without-dec_avcodec +%if !%{with dec_avcodec2} +%define _with_dec_avcodec2 --without-dec_avcodec2 %endif %if !%{with csc_swscale} @@ -21,7 +21,7 @@ %global __provides_exclude_from ^%{python_sitearch}/.*\\.so$ Name: xpra -Version: 0.14.24 +Version: 0.15.0 Release: 1%{?dist} Summary: Remote display server for applications and desktops @@ -29,19 +29,6 @@ License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ Source0: https://xpra.org/src/%{name}-%{version}.tar.xz -# patch setup.py to disable building bundled libraries -Patch1: %{name}-unbundle-rencode.patch -# Patch to remove reference to the xorg void driver from xorg.conf -# This patch can be removed for 0.15 as merged upstream -# See: -# http://xpra.org/trac/ticket/843 -# https://bugzilla.redhat.com/show_bug.cgi?id=1215527 -Patch2: xpra-0.14-stop-using-void-driver.patch -# This patch fixes: -# https://bugzilla.redhat.com/show_bug.cgi?id=1224678 -# https://www.xpra.org/trac/ticket/872 -Patch4: xpra-0.14.22-fedora22-xorg.patch - BuildRequires: python2-devel pygobject2-devel pygtk2-devel BuildRequires: libXtst-devel BuildRequires: libxkbfile-devel @@ -50,11 +37,13 @@ BuildRequires: desktop-file-utils BuildRequires: libvpx-devel BuildRequires: libwebp-devel BuildRequires: libappstream-glib +BuildRequires: cups-devel + %if %{with enc_x264} BuildRequires: x264-devel %endif -%if %{with dec_avcodec} || %{with csc_swscale} -BuildRequires: ffmpeg-devel +%if %{with dec_avcodec2} || %{with csc_swscale} +%BuildRequires: ffmpeg-devel %endif Requires: python-imaging @@ -69,6 +58,7 @@ Requires: pulseaudio pulseaudio-utils Requires: python-rencode Requires: js-web-socket-js Requires: js-jquery +Requires: cups-filesystem Provides: bundled(js-jquery-ui) = 1.10.4 %if 0%{?fedora} >= 21 @@ -90,29 +80,21 @@ Sessions can be accessed over SSH, or password protected over plain TCP sockets. Xpra is usable over reasonably slow links and does its best to adapt to changing network bandwidth constraints. +%global cupslibdir %(cups-config --serverbin) %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch4 -p1 - -#use the system python-rencode -rm -f xpra/net/rencode/* -echo "from rencode import *" > xpra/net/rencode/__init__.py -echo "from rencode._rencode import __version__" >> xpra/net/rencode/__init__.py %build CFLAGS="%{optflags}" %{__python} setup.py build \ --with-vpx \ --with-webp \ %{?_with_enc_x264} \ - %{?_with_dec_avcodec} \ + %{?_with_dec_avcodec2} \ %{?_with_csc_swscale} \ --with-Xdummy \ --with-Xdummy_wrapper - %install %{__python} setup.py install --skip-build --root %{buildroot} @@ -200,10 +182,21 @@ fi %{_mandir}/man1/xpra_launcher.1.* %{_datadir}/xpra %{_datadir}/appdata/xpra.appdata.xml +%global cupslibdir %(cups-config --serverbin) +%{cupslibdir}/backend/xpraforwarder %doc README COPYING NEWS %changelog +* Mon Jun 1 2015 Jonathan G. Underwood - 0.15.0-1 +- Update to 0.15.0 +- Add BuildRequires for cups-devel and Requires for cups-filesystem +- Replace mention of avcodec with avcodec2 +- Drop xpra-unbundle-rencode.patch, and no longer patch to use system + rencode +- Drop xpra-0.14-stop-using-void-driver.patch +- Drop xpra-0.14.22-fedora22-xorg.patch + * Wed May 27 2015 Jonathan G. Underwood - 0.14.24-1 - Update to 0.14.24 - Remove Requires for xorg-x11-server-Xvfb From 1a26bb3500f5c3648e2bec59be92139555279ae6 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Thu, 4 Jun 2015 14:18:09 +0100 Subject: [PATCH 013/267] Remove extraneous second definition of cupslibdir --- xpra.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xpra.spec b/xpra.spec index abbbd06..37ed0e3 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,7 +22,7 @@ Name: xpra Version: 0.15.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -182,12 +182,14 @@ fi %{_mandir}/man1/xpra_launcher.1.* %{_datadir}/xpra %{_datadir}/appdata/xpra.appdata.xml -%global cupslibdir %(cups-config --serverbin) %{cupslibdir}/backend/xpraforwarder %doc README COPYING NEWS %changelog +* Thu Jun 4 2015 Jonathan G. Underwood - 0.15.0-2 +- Remove extraneous second definition of cupslibdir + * Mon Jun 1 2015 Jonathan G. Underwood - 0.15.0-1 - Update to 0.15.0 - Add BuildRequires for cups-devel and Requires for cups-filesystem From 17e55197f6fd3e36f46d14981846ed78ae6adf9b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:25:14 +0000 Subject: [PATCH 014/267] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xpra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 37ed0e3..1957abc 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,7 +22,7 @@ Name: xpra Version: 0.15.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -187,6 +187,9 @@ fi %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 0.15.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Thu Jun 4 2015 Jonathan G. Underwood - 0.15.0-2 - Remove extraneous second definition of cupslibdir From 9ac5dd02314913ed6bb4d59a3772b3b7db78a241 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Mon, 22 Jun 2015 15:43:49 +0100 Subject: [PATCH 015/267] Update to 0.15.1 Add Requires shared-mime-info for (/usr/share/mime/packages ownership) Add /usr/share/mime/packages/application-x-xpraconfig.xml file --- .gitignore | 1 + sources | 2 +- xpra.spec | 11 +++++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 117e888..f367286 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /xpra-0.14.22.tar.xz /xpra-0.14.24.tar.xz /xpra-0.15.0.tar.xz +/xpra-0.15.1.tar.xz diff --git a/sources b/sources index 6b52c39..4686b83 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -803020c4ceaf03f548fbcc9d3f7556f7 xpra-0.15.0.tar.xz +198b235030d93b6f66d459f96aa5f40f xpra-0.15.1.tar.xz diff --git a/xpra.spec b/xpra.spec index 1957abc..c15a4d2 100644 --- a/xpra.spec +++ b/xpra.spec @@ -21,8 +21,8 @@ %global __provides_exclude_from ^%{python_sitearch}/.*\\.so$ Name: xpra -Version: 0.15.0 -Release: 3%{?dist} +Version: 0.15.1 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -59,6 +59,7 @@ Requires: python-rencode Requires: js-web-socket-js Requires: js-jquery Requires: cups-filesystem +Requires: shared-mime-info Provides: bundled(js-jquery-ui) = 1.10.4 %if 0%{?fedora} >= 21 @@ -182,11 +183,17 @@ fi %{_mandir}/man1/xpra_launcher.1.* %{_datadir}/xpra %{_datadir}/appdata/xpra.appdata.xml +%{_datadir}/mime/packages/application-x-xpraconfig.xml %{cupslibdir}/backend/xpraforwarder %doc README COPYING NEWS %changelog +* Mon Jun 22 2015 Jonathan G. Underwood - 0.15.1-1 +- Update to 0.15.1 +- Add Requires shared-mime-info for (/usr/share/mime/packages ownership) +- Add /usr/share/mime/packages/application-x-xpraconfig.xml file + * Fri Jun 19 2015 Fedora Release Engineering - 0.15.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 67247c7c4a3137a7746ad4d72b7b031ba6b8e6e9 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Thu, 2 Jul 2015 14:13:07 +0100 Subject: [PATCH 016/267] Update to 0.15.2 Add Requires for python-lz4 and python-cups --- .gitignore | 1 + sources | 2 +- xpra.spec | 8 +++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f367286..ee8815b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /xpra-0.14.24.tar.xz /xpra-0.15.0.tar.xz /xpra-0.15.1.tar.xz +/xpra-0.15.2.tar.xz diff --git a/sources b/sources index 4686b83..e62b00e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -198b235030d93b6f66d459f96aa5f40f xpra-0.15.1.tar.xz +634e7ff531efe7d58ee2a76f753a252d xpra-0.15.2.tar.xz diff --git a/xpra.spec b/xpra.spec index c15a4d2..587c11a 100644 --- a/xpra.spec +++ b/xpra.spec @@ -21,7 +21,7 @@ %global __provides_exclude_from ^%{python_sitearch}/.*\\.so$ Name: xpra -Version: 0.15.1 +Version: 0.15.2 Release: 1%{?dist} Summary: Remote display server for applications and desktops @@ -60,6 +60,8 @@ Requires: js-web-socket-js Requires: js-jquery Requires: cups-filesystem Requires: shared-mime-info +Requires: python-cups +Requires: python-lz4 Provides: bundled(js-jquery-ui) = 1.10.4 %if 0%{?fedora} >= 21 @@ -189,6 +191,10 @@ fi %changelog +* Thu Jul 2 2015 Jonathan G. Underwood - 0.15.2-1 +- Update to 0.15.2 +- Add Requires for python-lz4 and python-cups + * Mon Jun 22 2015 Jonathan G. Underwood - 0.15.1-1 - Update to 0.15.1 - Add Requires shared-mime-info for (/usr/share/mime/packages ownership) From 5d639e6ada8ba63362d21f5e47534711f72f7551 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Thu, 2 Jul 2015 16:10:42 +0100 Subject: [PATCH 017/267] Add small fix from upsteam (rev 9768) --- xpra-0.15.2-9768.patch | 11 +++++++++++ xpra.spec | 11 ++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 xpra-0.15.2-9768.patch diff --git a/xpra-0.15.2-9768.patch b/xpra-0.15.2-9768.patch new file mode 100644 index 0000000..d5d9df7 --- /dev/null +++ b/xpra-0.15.2-9768.patch @@ -0,0 +1,11 @@ +Index: tags/v0.15.x/src/xpra/x11/gtk_x11/window.py +=================================================================== +--- tags/v0.15.x/src/xpra/x11/gtk_x11/window.py (revision 9753) ++++ tags/v0.15.x/src/xpra/x11/gtk_x11/window.py (revision 9768) +@@ -1471,5 +1471,5 @@ + log("_handle_motif_wm_hints() motif_hints=%s", motif_hints) + DECORATIONS_BIT = 1 +- if motif_hints and motif_hints.flags&(2**MotifWMHints.DECORATIONS_BIT): ++ if motif_hints and motif_hints.flags&(2**DECORATIONS_BIT): + self._internal_set_property("decorations", motif_hints.decorations) + _property_handlers["_MOTIF_WM_HINTS"] = _handle_motif_wm_hints diff --git a/xpra.spec b/xpra.spec index 587c11a..4b32b5e 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,13 +22,18 @@ Name: xpra Version: 0.15.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ Source0: https://xpra.org/src/%{name}-%{version}.tar.xz +# Small fix, can be removed after 0.15.2 +# http://lists.devloop.org.uk/pipermail/shifter-users/2015-June/001300.html +# http://xpra.org/trac/changeset/9768/xpra/tags/v0.15.x/src/xpra/x11/gtk_x11/window.py?format=diff&new=9768 +Patch0: xpra-0.15.2-9768.patch + BuildRequires: python2-devel pygobject2-devel pygtk2-devel BuildRequires: libXtst-devel BuildRequires: libxkbfile-devel @@ -87,6 +92,7 @@ network bandwidth constraints. %prep %setup -q +%patch0 -p3 %build CFLAGS="%{optflags}" %{__python} setup.py build \ @@ -191,6 +197,9 @@ fi %changelog +* Thu Jul 2 2015 Jonathan G. Underwood - 0.15.2-2 +- Add small fix from upsteam (rev 9768) + * Thu Jul 2 2015 Jonathan G. Underwood - 0.15.2-1 - Update to 0.15.2 - Add Requires for python-lz4 and python-cups From 1196876bbe11fb003fb1e9aef63fecf1e50c09d3 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Tue, 14 Jul 2015 21:23:47 +0100 Subject: [PATCH 018/267] Update to 0.15.3 Remove xpra-0.15.2-9768.patch Add BuildRequires for redhat-lsb-core to make lsb_release available at build time (used to detect system type) Add --with-Xdummy and --with-Xdummy_wrapper to install options to ensure Xdummy is used --- .gitignore | 1 + sources | 2 +- xpra-0.15.2-9768.patch | 11 ----------- xpra.spec | 28 +++++++++++++++++++--------- 4 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 xpra-0.15.2-9768.patch diff --git a/.gitignore b/.gitignore index ee8815b..584b45b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /xpra-0.15.0.tar.xz /xpra-0.15.1.tar.xz /xpra-0.15.2.tar.xz +/xpra-0.15.3.tar.xz diff --git a/sources b/sources index e62b00e..bdd7b08 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -634e7ff531efe7d58ee2a76f753a252d xpra-0.15.2.tar.xz +6ed2002365b4432fa80120c0dff27487 xpra-0.15.3.tar.xz diff --git a/xpra-0.15.2-9768.patch b/xpra-0.15.2-9768.patch deleted file mode 100644 index d5d9df7..0000000 --- a/xpra-0.15.2-9768.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: tags/v0.15.x/src/xpra/x11/gtk_x11/window.py -=================================================================== ---- tags/v0.15.x/src/xpra/x11/gtk_x11/window.py (revision 9753) -+++ tags/v0.15.x/src/xpra/x11/gtk_x11/window.py (revision 9768) -@@ -1471,5 +1471,5 @@ - log("_handle_motif_wm_hints() motif_hints=%s", motif_hints) - DECORATIONS_BIT = 1 -- if motif_hints and motif_hints.flags&(2**MotifWMHints.DECORATIONS_BIT): -+ if motif_hints and motif_hints.flags&(2**DECORATIONS_BIT): - self._internal_set_property("decorations", motif_hints.decorations) - _property_handlers["_MOTIF_WM_HINTS"] = _handle_motif_wm_hints diff --git a/xpra.spec b/xpra.spec index 4b32b5e..93e4912 100644 --- a/xpra.spec +++ b/xpra.spec @@ -21,19 +21,14 @@ %global __provides_exclude_from ^%{python_sitearch}/.*\\.so$ Name: xpra -Version: 0.15.2 -Release: 2%{?dist} +Version: 0.15.3 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ Source0: https://xpra.org/src/%{name}-%{version}.tar.xz -# Small fix, can be removed after 0.15.2 -# http://lists.devloop.org.uk/pipermail/shifter-users/2015-June/001300.html -# http://xpra.org/trac/changeset/9768/xpra/tags/v0.15.x/src/xpra/x11/gtk_x11/window.py?format=diff&new=9768 -Patch0: xpra-0.15.2-9768.patch - BuildRequires: python2-devel pygobject2-devel pygtk2-devel BuildRequires: libXtst-devel BuildRequires: libxkbfile-devel @@ -43,6 +38,7 @@ BuildRequires: libvpx-devel BuildRequires: libwebp-devel BuildRequires: libappstream-glib BuildRequires: cups-devel +BuildRequires: redhat-lsb-core %if %{with enc_x264} BuildRequires: x264-devel @@ -92,10 +88,10 @@ network bandwidth constraints. %prep %setup -q -%patch0 -p3 %build CFLAGS="%{optflags}" %{__python} setup.py build \ + --verbose \ --with-vpx \ --with-webp \ %{?_with_enc_x264} \ @@ -105,7 +101,12 @@ CFLAGS="%{optflags}" %{__python} setup.py build \ --with-Xdummy_wrapper %install -%{__python} setup.py install --skip-build --root %{buildroot} +%{__python} setup.py install \ + --skip-build \ + --root %{buildroot} \ + --with-Xdummy \ + --with-Xdummy_wrapper + #move icon to proper directory mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps @@ -193,10 +194,19 @@ fi %{_datadir}/appdata/xpra.appdata.xml %{_datadir}/mime/packages/application-x-xpraconfig.xml %{cupslibdir}/backend/xpraforwarder +#{_prefix}/lib/tmpfiles.d/xpra.conf %doc README COPYING NEWS %changelog +* Tue Jul 14 2015 Jonathan G. Underwood - 0.15.3 +- Update to 0.15.3 +- Remove xpra-0.15.2-9768.patch +- Add BuildRequires for redhat-lsb-core to make lsb_release available + at build time (used to detect system type) +- Add --with-Xdummy and --with-Xdummy_wrapper to install options to + ensure Xdummy is used + * Thu Jul 2 2015 Jonathan G. Underwood - 0.15.2-2 - Add small fix from upsteam (rev 9768) From 35e2363c5459ad12254969f8e3585cdf3ba0e052 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Tue, 4 Aug 2015 11:14:22 +0100 Subject: [PATCH 019/267] Update to 0.15.4 Add missing release tag to previous rpm changelog entry --- .gitignore | 1 + sources | 2 +- xpra.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 584b45b..bea7498 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /xpra-0.15.1.tar.xz /xpra-0.15.2.tar.xz /xpra-0.15.3.tar.xz +/xpra-0.15.4.tar.xz diff --git a/sources b/sources index bdd7b08..5f8eb3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6ed2002365b4432fa80120c0dff27487 xpra-0.15.3.tar.xz +19ea271b5de89b504eff84f2a03f4a8b xpra-0.15.4.tar.xz diff --git a/xpra.spec b/xpra.spec index 93e4912..fec01ce 100644 --- a/xpra.spec +++ b/xpra.spec @@ -21,7 +21,7 @@ %global __provides_exclude_from ^%{python_sitearch}/.*\\.so$ Name: xpra -Version: 0.15.3 +Version: 0.15.4 Release: 1%{?dist} Summary: Remote display server for applications and desktops @@ -199,7 +199,11 @@ fi %changelog -* Tue Jul 14 2015 Jonathan G. Underwood - 0.15.3 +* Tue Aug 4 2015 Jonathan G. Underwood - 0.15.4-1 +- Update to 0.15.4 +- Add missing release tag to previous rpm changelog entry + +* Tue Jul 14 2015 Jonathan G. Underwood - 0.15.3-1 - Update to 0.15.3 - Remove xpra-0.15.2-9768.patch - Add BuildRequires for redhat-lsb-core to make lsb_release available From 1b26b2d32df1de2e83857b16c53effe57046c877 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Wed, 5 Aug 2015 23:38:11 +0100 Subject: [PATCH 020/267] Add patch to revert upstream commit r9983 which breaks color encodding --- xpra-r9983.patch | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ xpra.spec | 13 +++++++++++- 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 xpra-r9983.patch diff --git a/xpra-r9983.patch b/xpra-r9983.patch new file mode 100644 index 0000000..f3ebdce --- /dev/null +++ b/xpra-r9983.patch @@ -0,0 +1,54 @@ +Index: /trunk/src/xpra/codecs/csc_cython/colorspace_converter.pyx +=================================================================== +--- /trunk/src/xpra/codecs/csc_cython/colorspace_converter.pyx (revision 9982) ++++ /trunk/src/xpra/codecs/csc_cython/colorspace_converter.pyx (revision 9983) +@@ -42,30 +42,25 @@ + + #precalculate indexes in native endianness: +-BYTEORDER = struct.pack("=BBBB", 0, 1, 2, 3) +-def byteorder(v): +- for i in range(4): +- bv = BYTEORDER[i] +- if type(bv)==str: +- #old versions of python: byte value is in fact a character (str) +- bv = ord(bv) +- if bv==v: +- return i +- raise Exception("cannot find byteorder for %s" % v) +-cdef uint8_t BGRA_B = byteorder(0) +-cdef uint8_t BGRA_G = byteorder(1) +-cdef uint8_t BGRA_R = byteorder(2) +-cdef uint8_t BGRA_A = byteorder(3) +-cdef uint8_t BGRX_R = BGRA_R +-cdef uint8_t BGRX_G = BGRA_G +-cdef uint8_t BGRX_B = BGRA_B +-cdef uint8_t BGRX_X = BGRA_A +- +-cdef uint8_t RGBX_R = byteorder(0) +-cdef uint8_t RGBX_G = byteorder(1) +-cdef uint8_t RGBX_B = byteorder(2) +-cdef uint8_t RGBX_X = byteorder(3) +- ++cdef uint8_t BGRA_B, BGRA_G, BGRA_R, BGRA_A ++cdef uint8_t BGRX_R, BGRX_G, BGRX_B, BGRX_X ++cdef uint8_t BGR_R, BGR_G, BGR_B ++cdef uint8_t RGBX_R, RGBX_G, RGBX_B, RGBX_X ++cdef uint8_t RGB_R, RGB_G, RGB_B ++import sys ++if sys.byteorder=="little": ++ BGRA_B, BGRA_G, BGRA_R, BGRA_A = 2, 1, 0, 3 ++ RGBX_R, RGBX_G, RGBX_B, RGBX_X = 2, 1, 0, 3 ++ BGR_R, BGR_G, BGR_B = 2, 1, 0 ++ RGB_R, RGB_G, RGB_B = 2, 1, 0 ++else: ++ BGRA_B, BGRA_G, BGRA_R, BGRA_A = 3, 0, 1, 2 ++ RGBX_R, RGBX_G, RGBX_B, RGBX_X = 3, 0, 1, 2 ++ BGR_R, BGR_G, BGR_B = 0, 1, 2 ++ RGB_R, RGB_G, RGB_B = 0, 1, 2 ++ + log("csc_cython: byteorder(BGRA)=%s", (BGRA_B, BGRA_G, BGRA_R, BGRA_A)) ++log("csc_cython: byteorder(BGR)=%s", (BGR_B, BGR_G, BGR_R)) + log("csc_cython: byteorder(RGBX)=%s", (RGBX_R, RGBX_G, RGBX_B, RGBX_X)) ++log("csc_cython: byteorder(RGB)=%s", (RGB_R, RGB_G, RGB_B)) + + COLORSPACES = {"BGRX" : ["YUV420P"], "YUV420P" : ["RGB", "BGR", "RGBX", "BGRX"], "GBRP" : ["RGBX", "BGRX"] } diff --git a/xpra.spec b/xpra.spec index fec01ce..2709946 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,13 +22,20 @@ Name: xpra Version: 0.15.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ Source0: https://xpra.org/src/%{name}-%{version}.tar.xz +# This patch corresponds to upstream commit r9983 which unfortunately +# breaks colour encoding when using VP8/9 encodings. So we apply it +# reversed below to revert it. This requires increasing the fuzz too. +# See http://xpra.org/trac/ticket/937 +%global _default_patch_fuzz 2 +Patch0: xpra-r9983.patch + BuildRequires: python2-devel pygobject2-devel pygtk2-devel BuildRequires: libXtst-devel BuildRequires: libxkbfile-devel @@ -88,6 +95,7 @@ network bandwidth constraints. %prep %setup -q +%patch0 -p3 -R %build CFLAGS="%{optflags}" %{__python} setup.py build \ @@ -199,6 +207,9 @@ fi %changelog +* Tue Aug 5 2015 Jonathan G. Underwood - 0.15.4-2 +- Add patch to revert upstream commit r9983 which breaks color encodding + * Tue Aug 4 2015 Jonathan G. Underwood - 0.15.4-1 - Update to 0.15.4 - Add missing release tag to previous rpm changelog entry From 14015e179a3434574e23c8a0cf1498214d49862b Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Wed, 5 Aug 2015 23:40:37 +0100 Subject: [PATCH 021/267] Fix bogus date in spec changelog --- xpra.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 2709946..88dd005 100644 --- a/xpra.spec +++ b/xpra.spec @@ -207,7 +207,7 @@ fi %changelog -* Tue Aug 5 2015 Jonathan G. Underwood - 0.15.4-2 +* Wed Aug 5 2015 Jonathan G. Underwood - 0.15.4-2 - Add patch to revert upstream commit r9983 which breaks color encodding * Tue Aug 4 2015 Jonathan G. Underwood - 0.15.4-1 From 246bd2104303c5193b8c9e27c28b91de61281f1a Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Fri, 21 Aug 2015 13:31:46 +0100 Subject: [PATCH 022/267] No longer revert r9983, but include xpra-r10393.patch to fix the color encoding --- xpra-r10393.patch | 25 ++++++++++++++++++++++ xpra-r9983.patch | 54 ----------------------------------------------- xpra.spec | 17 ++++++++------- 3 files changed, 34 insertions(+), 62 deletions(-) create mode 100644 xpra-r10393.patch delete mode 100644 xpra-r9983.patch diff --git a/xpra-r10393.patch b/xpra-r10393.patch new file mode 100644 index 0000000..47975fa --- /dev/null +++ b/xpra-r10393.patch @@ -0,0 +1,25 @@ +Index: /trunk/src/xpra/codecs/csc_cython/colorspace_converter.pyx +=================================================================== +--- /trunk/src/xpra/codecs/csc_cython/colorspace_converter.pyx (revision 10392) ++++ /trunk/src/xpra/codecs/csc_cython/colorspace_converter.pyx (revision 10393) +@@ -49,13 +49,13 @@ + import sys + if sys.byteorder=="little": +- BGRA_B, BGRA_G, BGRA_R, BGRA_A = 2, 1, 0, 3 +- RGBX_R, RGBX_G, RGBX_B, RGBX_X = 2, 1, 0, 3 ++ BGRA_B, BGRA_G, BGRA_R, BGRA_A = 0, 1, 2, 3 ++ RGBX_R, RGBX_G, RGBX_B, RGBX_X = 0, 1, 2, 3 ++ BGR_R, BGR_G, BGR_B = 0, 1, 2 ++ RGB_R, RGB_G, RGB_B = 0, 1, 2 ++else: ++ BGRA_B, BGRA_G, BGRA_R, BGRA_A = 3, 2, 1, 0 ++ RGBX_R, RGBX_G, RGBX_B, RGBX_X = 3, 2, 1, 0 + BGR_R, BGR_G, BGR_B = 2, 1, 0 + RGB_R, RGB_G, RGB_B = 2, 1, 0 +-else: +- BGRA_B, BGRA_G, BGRA_R, BGRA_A = 3, 0, 1, 2 +- RGBX_R, RGBX_G, RGBX_B, RGBX_X = 3, 0, 1, 2 +- BGR_R, BGR_G, BGR_B = 0, 1, 2 +- RGB_R, RGB_G, RGB_B = 0, 1, 2 + + log("csc_cython: byteorder(BGRA)=%s", (BGRA_B, BGRA_G, BGRA_R, BGRA_A)) diff --git a/xpra-r9983.patch b/xpra-r9983.patch deleted file mode 100644 index f3ebdce..0000000 --- a/xpra-r9983.patch +++ /dev/null @@ -1,54 +0,0 @@ -Index: /trunk/src/xpra/codecs/csc_cython/colorspace_converter.pyx -=================================================================== ---- /trunk/src/xpra/codecs/csc_cython/colorspace_converter.pyx (revision 9982) -+++ /trunk/src/xpra/codecs/csc_cython/colorspace_converter.pyx (revision 9983) -@@ -42,30 +42,25 @@ - - #precalculate indexes in native endianness: --BYTEORDER = struct.pack("=BBBB", 0, 1, 2, 3) --def byteorder(v): -- for i in range(4): -- bv = BYTEORDER[i] -- if type(bv)==str: -- #old versions of python: byte value is in fact a character (str) -- bv = ord(bv) -- if bv==v: -- return i -- raise Exception("cannot find byteorder for %s" % v) --cdef uint8_t BGRA_B = byteorder(0) --cdef uint8_t BGRA_G = byteorder(1) --cdef uint8_t BGRA_R = byteorder(2) --cdef uint8_t BGRA_A = byteorder(3) --cdef uint8_t BGRX_R = BGRA_R --cdef uint8_t BGRX_G = BGRA_G --cdef uint8_t BGRX_B = BGRA_B --cdef uint8_t BGRX_X = BGRA_A -- --cdef uint8_t RGBX_R = byteorder(0) --cdef uint8_t RGBX_G = byteorder(1) --cdef uint8_t RGBX_B = byteorder(2) --cdef uint8_t RGBX_X = byteorder(3) -- -+cdef uint8_t BGRA_B, BGRA_G, BGRA_R, BGRA_A -+cdef uint8_t BGRX_R, BGRX_G, BGRX_B, BGRX_X -+cdef uint8_t BGR_R, BGR_G, BGR_B -+cdef uint8_t RGBX_R, RGBX_G, RGBX_B, RGBX_X -+cdef uint8_t RGB_R, RGB_G, RGB_B -+import sys -+if sys.byteorder=="little": -+ BGRA_B, BGRA_G, BGRA_R, BGRA_A = 2, 1, 0, 3 -+ RGBX_R, RGBX_G, RGBX_B, RGBX_X = 2, 1, 0, 3 -+ BGR_R, BGR_G, BGR_B = 2, 1, 0 -+ RGB_R, RGB_G, RGB_B = 2, 1, 0 -+else: -+ BGRA_B, BGRA_G, BGRA_R, BGRA_A = 3, 0, 1, 2 -+ RGBX_R, RGBX_G, RGBX_B, RGBX_X = 3, 0, 1, 2 -+ BGR_R, BGR_G, BGR_B = 0, 1, 2 -+ RGB_R, RGB_G, RGB_B = 0, 1, 2 -+ - log("csc_cython: byteorder(BGRA)=%s", (BGRA_B, BGRA_G, BGRA_R, BGRA_A)) -+log("csc_cython: byteorder(BGR)=%s", (BGR_B, BGR_G, BGR_R)) - log("csc_cython: byteorder(RGBX)=%s", (RGBX_R, RGBX_G, RGBX_B, RGBX_X)) -+log("csc_cython: byteorder(RGB)=%s", (RGB_R, RGB_G, RGB_B)) - - COLORSPACES = {"BGRX" : ["YUV420P"], "YUV420P" : ["RGB", "BGR", "RGBX", "BGRX"], "GBRP" : ["RGBX", "BGRX"] } diff --git a/xpra.spec b/xpra.spec index 88dd005..90062e7 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,19 +22,16 @@ Name: xpra Version: 0.15.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ Source0: https://xpra.org/src/%{name}-%{version}.tar.xz -# This patch corresponds to upstream commit r9983 which unfortunately -# breaks colour encoding when using VP8/9 encodings. So we apply it -# reversed below to revert it. This requires increasing the fuzz too. -# See http://xpra.org/trac/ticket/937 -%global _default_patch_fuzz 2 -Patch0: xpra-r9983.patch +# This patch corresponds to upstream commit r10393 which fixes the +# broken color encoding problem. See http://xpra.org/trac/ticket/937 +Patch0: xpra-r10393.patch BuildRequires: python2-devel pygobject2-devel pygtk2-devel BuildRequires: libXtst-devel @@ -95,7 +92,7 @@ network bandwidth constraints. %prep %setup -q -%patch0 -p3 -R +%patch0 -p3 %build CFLAGS="%{optflags}" %{__python} setup.py build \ @@ -207,6 +204,10 @@ fi %changelog +* Fri Aug 21 2015 Jonathan G. Underwood - 0.15.4-3 +- No longer revert r9983, but include xpra-r10393.patch to fix the + color encoding + * Wed Aug 5 2015 Jonathan G. Underwood - 0.15.4-2 - Add patch to revert upstream commit r9983 which breaks color encodding From 9c424fcb1877b7859e42bebf3d97af81f65084e9 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Fri, 21 Aug 2015 17:43:06 +0100 Subject: [PATCH 023/267] Remove xpra-r10393.patch and add xpra-r10396.patch and xpra-r10399.patch as second attempt to fix the color encoding issues --- xpra-r10393.patch | 25 -------------- xpra-r10396.patch | 86 +++++++++++++++++++++++++++++++++++++++++++++++ xpra-r10399.patch | 21 ++++++++++++ xpra.spec | 16 ++++++--- 4 files changed, 118 insertions(+), 30 deletions(-) delete mode 100644 xpra-r10393.patch create mode 100644 xpra-r10396.patch create mode 100644 xpra-r10399.patch diff --git a/xpra-r10393.patch b/xpra-r10393.patch deleted file mode 100644 index 47975fa..0000000 --- a/xpra-r10393.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: /trunk/src/xpra/codecs/csc_cython/colorspace_converter.pyx -=================================================================== ---- /trunk/src/xpra/codecs/csc_cython/colorspace_converter.pyx (revision 10392) -+++ /trunk/src/xpra/codecs/csc_cython/colorspace_converter.pyx (revision 10393) -@@ -49,13 +49,13 @@ - import sys - if sys.byteorder=="little": -- BGRA_B, BGRA_G, BGRA_R, BGRA_A = 2, 1, 0, 3 -- RGBX_R, RGBX_G, RGBX_B, RGBX_X = 2, 1, 0, 3 -+ BGRA_B, BGRA_G, BGRA_R, BGRA_A = 0, 1, 2, 3 -+ RGBX_R, RGBX_G, RGBX_B, RGBX_X = 0, 1, 2, 3 -+ BGR_R, BGR_G, BGR_B = 0, 1, 2 -+ RGB_R, RGB_G, RGB_B = 0, 1, 2 -+else: -+ BGRA_B, BGRA_G, BGRA_R, BGRA_A = 3, 2, 1, 0 -+ RGBX_R, RGBX_G, RGBX_B, RGBX_X = 3, 2, 1, 0 - BGR_R, BGR_G, BGR_B = 2, 1, 0 - RGB_R, RGB_G, RGB_B = 2, 1, 0 --else: -- BGRA_B, BGRA_G, BGRA_R, BGRA_A = 3, 0, 1, 2 -- RGBX_R, RGBX_G, RGBX_B, RGBX_X = 3, 0, 1, 2 -- BGR_R, BGR_G, BGR_B = 0, 1, 2 -- RGB_R, RGB_G, RGB_B = 0, 1, 2 - - log("csc_cython: byteorder(BGRA)=%s", (BGRA_B, BGRA_G, BGRA_R, BGRA_A)) diff --git a/xpra-r10396.patch b/xpra-r10396.patch new file mode 100644 index 0000000..51a1a58 --- /dev/null +++ b/xpra-r10396.patch @@ -0,0 +1,86 @@ +Index: /tags/v0.15.x/src/xpra/codecs/argb/argb.pyx +=================================================================== +--- /tags/v0.15.x/src/xpra/codecs/argb/argb.pyx (revision 10395) ++++ /tags/v0.15.x/src/xpra/codecs/argb/argb.pyx (revision 10396) +@@ -31,4 +31,10 @@ + assert object_as_buffer(buf, &cbuf, &cbuf_len)==0, "cannot convert %s to a readable buffer" % type(buf) + return argbdata_to_rgba(cbuf, cbuf_len) ++ ++ ++cdef inline unsigned char clamp(int v): ++ if v>255: ++ return 255 ++ return v + + cdef argbdata_to_rgba(const unsigned char* argb, int argb_len): +@@ -137,5 +143,5 @@ + # cbuf contains non-premultiplied ARGB32 data in native-endian. + # We convert to premultiplied ARGB32 data, in-place. +- cdef unsigned int a, r, g, b ++ cdef unsigned char a, r, g, b + cdef unsigned int argb + assert sizeof(int) == 4 +@@ -146,9 +152,9 @@ + a = (argb >> 24) & 0xff + r = (argb >> 16) & 0xff +- r = r * a / 255 ++ r = r * a // 255 + g = (argb >> 8) & 0xff +- g = g * a / 255 ++ g = g * a // 255 + b = (argb >> 0) & 0xff +- b = b * a / 255 ++ b = b * a // 255 + buf[i] = (a << 24) | (r << 16) | (g << 8) | (b << 0) + +@@ -165,5 +171,5 @@ + # cbuf contains non-premultiplied ARGB32 data in native-endian. + # We convert to premultiplied ARGB32 data, in-place. +- cdef unsigned int a, r, g, b #@DuplicateSignature ++ cdef unsigned char a, r, g, b #@DuplicateSignature + cdef unsigned int argb #@DuplicateSignature + assert sizeof(int) == 4 +@@ -176,10 +182,7 @@ + buf[i] = 0 + continue +- r = (argb >> 16) & 0xff +- r = r * 255 / a +- g = (argb >> 8) & 0xff +- g = g * 255 / a +- b = (argb >> 0) & 0xff +- b = b * 255 / a ++ r = clamp(((argb >> 16) & 0xff) * 255 // a) ++ g = clamp(((argb >> 8) & 0xff) * 255 // a) ++ b = clamp(((argb >> 0) & 0xff) * 255 // a) + buf[i] = (a << 24) | (r << 16) | (g << 8) | (b << 0) + +@@ -196,13 +199,13 @@ + #precalculate indexes in native endianness: + tmp = str(struct.pack("=BBBB", 0, 1, 2, 3)) +-cdef int B = tmp.find('\0') +-cdef int G = tmp.find('\1') +-cdef int R = tmp.find('\2') +-cdef int A = tmp.find('\3') ++cdef unsigned char B = tmp.find('\0') ++cdef unsigned char G = tmp.find('\1') ++cdef unsigned char R = tmp.find('\2') ++cdef unsigned char A = tmp.find('\3') + + cdef do_unpremultiply_argb(unsigned int * argb_in, Py_ssize_t argb_len): + # cbuf contains non-premultiplied ARGB32 data in native-endian. + # We convert to premultiplied ARGB32 data +- cdef unsigned int a, r, g, b #@DuplicateSignature ++ cdef unsigned char a, r, g, b #@DuplicateSignature + cdef unsigned int argb #@DuplicateSignature + assert sizeof(int) == 4 +@@ -217,7 +220,7 @@ + b = (argb >> 0) & 0xff + if a!=0: +- r = r * 255 / a +- g = g * 255 / a +- b = b * 255 / a ++ r = clamp(r * 255 // a) ++ g = clamp(g * 255 // a) ++ b = clamp(b * 255 // a) + else: + r = 0 diff --git a/xpra-r10399.patch b/xpra-r10399.patch new file mode 100644 index 0000000..9a41968 --- /dev/null +++ b/xpra-r10399.patch @@ -0,0 +1,21 @@ +Index: /tags/v0.15.x/src/xpra/codecs/csc_cython/colorspace_converter.pyx +=================================================================== +--- /tags/v0.15.x/src/xpra/codecs/csc_cython/colorspace_converter.pyx (revision 10398) ++++ /tags/v0.15.x/src/xpra/codecs/csc_cython/colorspace_converter.pyx (revision 10399) +@@ -48,12 +48,12 @@ + import sys + if sys.byteorder=="little": +- BGRA_B, BGRA_G, BGRA_R, BGRA_A = 2, 1, 0, 3 ++ BGRA_B, BGRA_G, BGRA_R, BGRA_A = 0, 1, 2, 3 + RGBX_R, RGBX_G, RGBX_B, RGBX_X = 2, 1, 0, 3 +- BGR_R, BGR_G, BGR_B = 2, 1, 0 ++ BGR_R, BGR_G, BGR_B = 0, 1, 2 + RGB_R, RGB_G, RGB_B = 2, 1, 0 + else: +- BGRA_B, BGRA_G, BGRA_R, BGRA_A = 3, 0, 1, 2 ++ BGRA_B, BGRA_G, BGRA_R, BGRA_A = 3, 2, 1, 0 + RGBX_R, RGBX_G, RGBX_B, RGBX_X = 3, 0, 1, 2 +- BGR_R, BGR_G, BGR_B = 0, 1, 2 ++ BGR_R, BGR_G, BGR_B = 2, 1, 0 + RGB_R, RGB_G, RGB_B = 0, 1, 2 + diff --git a/xpra.spec b/xpra.spec index 90062e7..3f5abbe 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,16 +22,17 @@ Name: xpra Version: 0.15.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ Source0: https://xpra.org/src/%{name}-%{version}.tar.xz -# This patch corresponds to upstream commit r10393 which fixes the -# broken color encoding problem. See http://xpra.org/trac/ticket/937 -Patch0: xpra-r10393.patch +# These patches fix the broken color encoding problem. See +# http://xpra.org/trac/ticket/937 +Patch0: xpra-r10396.patch +Patch1: xpra-r10399.patch BuildRequires: python2-devel pygobject2-devel pygtk2-devel BuildRequires: libXtst-devel @@ -92,7 +93,8 @@ network bandwidth constraints. %prep %setup -q -%patch0 -p3 +%patch0 -p4 +%patch1 -p4 %build CFLAGS="%{optflags}" %{__python} setup.py build \ @@ -204,6 +206,10 @@ fi %changelog +* Fri Aug 21 2015 Jonathan G. Underwood - 0.15.4-4 +- Remove xpra-r10393.patch and add xpra-r10396.patch and xpra-r10399.patch + as second attempt to fix the color encoding issues + * Fri Aug 21 2015 Jonathan G. Underwood - 0.15.4-3 - No longer revert r9983, but include xpra-r10393.patch to fix the color encoding From e3e744048d48695fa29c80c8bc7400a7df39d868 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Wed, 2 Sep 2015 13:57:17 +0100 Subject: [PATCH 024/267] Update to 0.15.5 Drop patches related to color encoding --- xpra-r10396.patch | 86 ----------------------------------------------- xpra-r10399.patch | 21 ------------ xpra.spec | 14 ++++---- 3 files changed, 6 insertions(+), 115 deletions(-) delete mode 100644 xpra-r10396.patch delete mode 100644 xpra-r10399.patch diff --git a/xpra-r10396.patch b/xpra-r10396.patch deleted file mode 100644 index 51a1a58..0000000 --- a/xpra-r10396.patch +++ /dev/null @@ -1,86 +0,0 @@ -Index: /tags/v0.15.x/src/xpra/codecs/argb/argb.pyx -=================================================================== ---- /tags/v0.15.x/src/xpra/codecs/argb/argb.pyx (revision 10395) -+++ /tags/v0.15.x/src/xpra/codecs/argb/argb.pyx (revision 10396) -@@ -31,4 +31,10 @@ - assert object_as_buffer(buf, &cbuf, &cbuf_len)==0, "cannot convert %s to a readable buffer" % type(buf) - return argbdata_to_rgba(cbuf, cbuf_len) -+ -+ -+cdef inline unsigned char clamp(int v): -+ if v>255: -+ return 255 -+ return v - - cdef argbdata_to_rgba(const unsigned char* argb, int argb_len): -@@ -137,5 +143,5 @@ - # cbuf contains non-premultiplied ARGB32 data in native-endian. - # We convert to premultiplied ARGB32 data, in-place. -- cdef unsigned int a, r, g, b -+ cdef unsigned char a, r, g, b - cdef unsigned int argb - assert sizeof(int) == 4 -@@ -146,9 +152,9 @@ - a = (argb >> 24) & 0xff - r = (argb >> 16) & 0xff -- r = r * a / 255 -+ r = r * a // 255 - g = (argb >> 8) & 0xff -- g = g * a / 255 -+ g = g * a // 255 - b = (argb >> 0) & 0xff -- b = b * a / 255 -+ b = b * a // 255 - buf[i] = (a << 24) | (r << 16) | (g << 8) | (b << 0) - -@@ -165,5 +171,5 @@ - # cbuf contains non-premultiplied ARGB32 data in native-endian. - # We convert to premultiplied ARGB32 data, in-place. -- cdef unsigned int a, r, g, b #@DuplicateSignature -+ cdef unsigned char a, r, g, b #@DuplicateSignature - cdef unsigned int argb #@DuplicateSignature - assert sizeof(int) == 4 -@@ -176,10 +182,7 @@ - buf[i] = 0 - continue -- r = (argb >> 16) & 0xff -- r = r * 255 / a -- g = (argb >> 8) & 0xff -- g = g * 255 / a -- b = (argb >> 0) & 0xff -- b = b * 255 / a -+ r = clamp(((argb >> 16) & 0xff) * 255 // a) -+ g = clamp(((argb >> 8) & 0xff) * 255 // a) -+ b = clamp(((argb >> 0) & 0xff) * 255 // a) - buf[i] = (a << 24) | (r << 16) | (g << 8) | (b << 0) - -@@ -196,13 +199,13 @@ - #precalculate indexes in native endianness: - tmp = str(struct.pack("=BBBB", 0, 1, 2, 3)) --cdef int B = tmp.find('\0') --cdef int G = tmp.find('\1') --cdef int R = tmp.find('\2') --cdef int A = tmp.find('\3') -+cdef unsigned char B = tmp.find('\0') -+cdef unsigned char G = tmp.find('\1') -+cdef unsigned char R = tmp.find('\2') -+cdef unsigned char A = tmp.find('\3') - - cdef do_unpremultiply_argb(unsigned int * argb_in, Py_ssize_t argb_len): - # cbuf contains non-premultiplied ARGB32 data in native-endian. - # We convert to premultiplied ARGB32 data -- cdef unsigned int a, r, g, b #@DuplicateSignature -+ cdef unsigned char a, r, g, b #@DuplicateSignature - cdef unsigned int argb #@DuplicateSignature - assert sizeof(int) == 4 -@@ -217,7 +220,7 @@ - b = (argb >> 0) & 0xff - if a!=0: -- r = r * 255 / a -- g = g * 255 / a -- b = b * 255 / a -+ r = clamp(r * 255 // a) -+ g = clamp(g * 255 // a) -+ b = clamp(b * 255 // a) - else: - r = 0 diff --git a/xpra-r10399.patch b/xpra-r10399.patch deleted file mode 100644 index 9a41968..0000000 --- a/xpra-r10399.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: /tags/v0.15.x/src/xpra/codecs/csc_cython/colorspace_converter.pyx -=================================================================== ---- /tags/v0.15.x/src/xpra/codecs/csc_cython/colorspace_converter.pyx (revision 10398) -+++ /tags/v0.15.x/src/xpra/codecs/csc_cython/colorspace_converter.pyx (revision 10399) -@@ -48,12 +48,12 @@ - import sys - if sys.byteorder=="little": -- BGRA_B, BGRA_G, BGRA_R, BGRA_A = 2, 1, 0, 3 -+ BGRA_B, BGRA_G, BGRA_R, BGRA_A = 0, 1, 2, 3 - RGBX_R, RGBX_G, RGBX_B, RGBX_X = 2, 1, 0, 3 -- BGR_R, BGR_G, BGR_B = 2, 1, 0 -+ BGR_R, BGR_G, BGR_B = 0, 1, 2 - RGB_R, RGB_G, RGB_B = 2, 1, 0 - else: -- BGRA_B, BGRA_G, BGRA_R, BGRA_A = 3, 0, 1, 2 -+ BGRA_B, BGRA_G, BGRA_R, BGRA_A = 3, 2, 1, 0 - RGBX_R, RGBX_G, RGBX_B, RGBX_X = 3, 0, 1, 2 -- BGR_R, BGR_G, BGR_B = 0, 1, 2 -+ BGR_R, BGR_G, BGR_B = 2, 1, 0 - RGB_R, RGB_G, RGB_B = 0, 1, 2 - diff --git a/xpra.spec b/xpra.spec index 3f5abbe..c6033c7 100644 --- a/xpra.spec +++ b/xpra.spec @@ -21,18 +21,14 @@ %global __provides_exclude_from ^%{python_sitearch}/.*\\.so$ Name: xpra -Version: 0.15.4 -Release: 4%{?dist} +Version: 0.15.5 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ Source0: https://xpra.org/src/%{name}-%{version}.tar.xz -# These patches fix the broken color encoding problem. See -# http://xpra.org/trac/ticket/937 -Patch0: xpra-r10396.patch -Patch1: xpra-r10399.patch BuildRequires: python2-devel pygobject2-devel pygtk2-devel BuildRequires: libXtst-devel @@ -93,8 +89,6 @@ network bandwidth constraints. %prep %setup -q -%patch0 -p4 -%patch1 -p4 %build CFLAGS="%{optflags}" %{__python} setup.py build \ @@ -206,6 +200,10 @@ fi %changelog +* Wed Sep 2 2015 Jonathan Underwood - 0.15.5-1 +- Update to 0.15.5 +- Drop patches related to color encoding + * Fri Aug 21 2015 Jonathan G. Underwood - 0.15.4-4 - Remove xpra-r10393.patch and add xpra-r10396.patch and xpra-r10399.patch as second attempt to fix the color encoding issues From c546991a02a0e00da41ac899624e72be7442d878 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Sat, 5 Sep 2015 14:56:06 +0100 Subject: [PATCH 025/267] Add 0.15.5 source tarball --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bea7498..e77eb71 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /xpra-0.15.2.tar.xz /xpra-0.15.3.tar.xz /xpra-0.15.4.tar.xz +/xpra-0.15.5.tar.xz diff --git a/sources b/sources index 5f8eb3c..c95877f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -19ea271b5de89b504eff84f2a03f4a8b xpra-0.15.4.tar.xz +5251411bd595fd3afaeac1cb42cdc452 xpra-0.15.5.tar.xz From 7a6bc7c0591c6ce5ab33cdda7d657a49eada6346 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Wed, 16 Sep 2015 13:57:46 +0100 Subject: [PATCH 026/267] Update to 0.15.6 --- .gitignore | 1 + sources | 2 +- xpra.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e77eb71..4cbd77c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /xpra-0.15.3.tar.xz /xpra-0.15.4.tar.xz /xpra-0.15.5.tar.xz +/xpra-0.15.6.tar.xz diff --git a/sources b/sources index c95877f..1048acb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5251411bd595fd3afaeac1cb42cdc452 xpra-0.15.5.tar.xz +0e115be1df40fe2ce2fe63ff2460488a xpra-0.15.6.tar.xz diff --git a/xpra.spec b/xpra.spec index c6033c7..cc0ff53 100644 --- a/xpra.spec +++ b/xpra.spec @@ -21,7 +21,7 @@ %global __provides_exclude_from ^%{python_sitearch}/.*\\.so$ Name: xpra -Version: 0.15.5 +Version: 0.15.6 Release: 1%{?dist} Summary: Remote display server for applications and desktops @@ -200,6 +200,9 @@ fi %changelog +* Wed Sep 16 2015 Jonathan Underwood - 0.15.5-1 +- Update to 0.15.6 + * Wed Sep 2 2015 Jonathan Underwood - 0.15.5-1 - Update to 0.15.5 - Drop patches related to color encoding From 70a297391deb73216e36ba2de4105534b3719459 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Wed, 14 Oct 2015 17:44:41 +0100 Subject: [PATCH 027/267] Update to 0.15.7 --- .gitignore | 1 + sources | 2 +- xpra.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4cbd77c..4407374 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /xpra-0.15.4.tar.xz /xpra-0.15.5.tar.xz /xpra-0.15.6.tar.xz +/xpra-0.15.7.tar.xz diff --git a/sources b/sources index 1048acb..9d55e2b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0e115be1df40fe2ce2fe63ff2460488a xpra-0.15.6.tar.xz +63fa9e2cab464f53d2f37154eccf7596 xpra-0.15.7.tar.xz diff --git a/xpra.spec b/xpra.spec index cc0ff53..cea8223 100644 --- a/xpra.spec +++ b/xpra.spec @@ -21,7 +21,7 @@ %global __provides_exclude_from ^%{python_sitearch}/.*\\.so$ Name: xpra -Version: 0.15.6 +Version: 0.15.7 Release: 1%{?dist} Summary: Remote display server for applications and desktops @@ -200,7 +200,11 @@ fi %changelog -* Wed Sep 16 2015 Jonathan Underwood - 0.15.5-1 +* Wed Sep 16 2015 Jonathan Underwood - 0.15.7-1 +- Update to 0.15.6 +- Fix typo in spec changelog + +* Wed Sep 16 2015 Jonathan Underwood - 0.15.6-1 - Update to 0.15.6 * Wed Sep 2 2015 Jonathan Underwood - 0.15.5-1 From b49ff14fd739d0687a2fa997deb5cfb2731b53db Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Sat, 14 Nov 2015 14:28:20 +0000 Subject: [PATCH 028/267] Update to 0.15.8. Fix typo in spec file --- .gitignore | 1 + sources | 2 +- xpra.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4407374..fe7efcc 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /xpra-0.15.5.tar.xz /xpra-0.15.6.tar.xz /xpra-0.15.7.tar.xz +/xpra-0.15.8.tar.xz diff --git a/sources b/sources index 9d55e2b..e443655 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -63fa9e2cab464f53d2f37154eccf7596 xpra-0.15.7.tar.xz +b80afd4209abe119d4d3de8dc4870d77 xpra-0.15.8.tar.xz diff --git a/xpra.spec b/xpra.spec index cea8223..790a742 100644 --- a/xpra.spec +++ b/xpra.spec @@ -21,7 +21,7 @@ %global __provides_exclude_from ^%{python_sitearch}/.*\\.so$ Name: xpra -Version: 0.15.7 +Version: 0.15.8 Release: 1%{?dist} Summary: Remote display server for applications and desktops @@ -200,8 +200,12 @@ fi %changelog +* Sat Nov 14 2015 Jonathan Underwood - 0.15.8-1 +- Update to 0.15.8 +- Fix typo in spec file + * Wed Sep 16 2015 Jonathan Underwood - 0.15.7-1 -- Update to 0.15.6 +- Update to 0.15.7 - Fix typo in spec changelog * Wed Sep 16 2015 Jonathan Underwood - 0.15.6-1 From 9778e482035189de0837cffb083085eb2e33b135 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Mon, 30 Nov 2015 16:47:27 +0000 Subject: [PATCH 029/267] Use same options for build and install --- xpra.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 790a742..942f334 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,7 +22,7 @@ Name: xpra Version: 0.15.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -105,6 +105,12 @@ CFLAGS="%{optflags}" %{__python} setup.py build \ %{__python} setup.py install \ --skip-build \ --root %{buildroot} \ + --verbose \ + --with-vpx \ + --with-webp \ + %{?_with_enc_x264} \ + %{?_with_dec_avcodec2} \ + %{?_with_csc_swscale} \ --with-Xdummy \ --with-Xdummy_wrapper @@ -200,6 +206,9 @@ fi %changelog +* Mon Nov 30 2015 Jonathan Underwood - 0.15.8-2 +- Use same options for build and install + * Sat Nov 14 2015 Jonathan Underwood - 0.15.8-1 - Update to 0.15.8 - Fix typo in spec file From d5b9f88b6bef4a8df917de0427cd92cb1ddd7794 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Mon, 30 Nov 2015 18:59:35 +0000 Subject: [PATCH 030/267] Add csc_opencl support for Fedora 24 and later --- xpra.spec | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/xpra.spec b/xpra.spec index 942f334..04c6031 100644 --- a/xpra.spec +++ b/xpra.spec @@ -65,6 +65,10 @@ Requires: shared-mime-info Requires: python-cups Requires: python-lz4 +%if 0%{?fedora} >= 24 +Suggests: python2-pyopencl +%endif + Provides: bundled(js-jquery-ui) = 1.10.4 %if 0%{?fedora} >= 21 Requires: js-zlib @@ -98,6 +102,9 @@ CFLAGS="%{optflags}" %{__python} setup.py build \ %{?_with_enc_x264} \ %{?_with_dec_avcodec2} \ %{?_with_csc_swscale} \ +%if 0%{?fedora} >= 24 + --with-csc_opencl \ +%endif --with-Xdummy \ --with-Xdummy_wrapper @@ -111,6 +118,9 @@ CFLAGS="%{optflags}" %{__python} setup.py build \ %{?_with_enc_x264} \ %{?_with_dec_avcodec2} \ %{?_with_csc_swscale} \ +%if 0%{?fedora} >= 24 + --with-csc_opencl \ +%endif --with-Xdummy \ --with-Xdummy_wrapper @@ -208,6 +218,7 @@ fi %changelog * Mon Nov 30 2015 Jonathan Underwood - 0.15.8-2 - Use same options for build and install +- Add csc_opencl support for Fedora 24 and later * Sat Nov 14 2015 Jonathan Underwood - 0.15.8-1 - Update to 0.15.8 From ef051d4df5e1ee5c5d7246717d5a3d53d66244e5 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 1 Dec 2015 16:33:02 -0500 Subject: [PATCH 031/267] rebuild for libvpx 1.5.0 --- xpra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 04c6031..8c45372 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,7 +22,7 @@ Name: xpra Version: 0.15.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -216,6 +216,9 @@ fi %changelog +* Tue Dec 1 2015 Tom Callaway - 0.15.8-3 +- rebuild for libvpx 1.5.0 + * Mon Nov 30 2015 Jonathan Underwood - 0.15.8-2 - Use same options for build and install - Add csc_opencl support for Fedora 24 and later From 981d163de4101047801a031f185a9bf3f18bdd85 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Wed, 2 Dec 2015 14:16:33 +0000 Subject: [PATCH 032/267] Update to 0.15.9 --- .gitignore | 1 + sources | 2 +- xpra.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fe7efcc..522a7f2 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /xpra-0.15.6.tar.xz /xpra-0.15.7.tar.xz /xpra-0.15.8.tar.xz +/xpra-0.15.9.tar.xz diff --git a/sources b/sources index e443655..d8f24d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b80afd4209abe119d4d3de8dc4870d77 xpra-0.15.8.tar.xz +f53775a100177e2b5f96b44fef70cc1f xpra-0.15.9.tar.xz diff --git a/xpra.spec b/xpra.spec index 8c45372..5b56516 100644 --- a/xpra.spec +++ b/xpra.spec @@ -21,8 +21,8 @@ %global __provides_exclude_from ^%{python_sitearch}/.*\\.so$ Name: xpra -Version: 0.15.8 -Release: 3%{?dist} +Version: 0.15.9 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -216,6 +216,9 @@ fi %changelog +* Wed Dec 2 2015 Jonathan Underwood - 0.15.9-1 +- Update to 0.15.9 + * Tue Dec 1 2015 Tom Callaway - 0.15.8-3 - rebuild for libvpx 1.5.0 From fcb6898375a739d6da9b2a7814fe01da8268eb9f Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Sat, 19 Dec 2015 15:04:29 +0000 Subject: [PATCH 033/267] Update to 0.15.10 --- .gitignore | 1 + sources | 2 +- xpra.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 522a7f2..8a53955 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /xpra-0.15.7.tar.xz /xpra-0.15.8.tar.xz /xpra-0.15.9.tar.xz +/xpra-0.15.10.tar.xz diff --git a/sources b/sources index d8f24d7..3856043 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f53775a100177e2b5f96b44fef70cc1f xpra-0.15.9.tar.xz +f783782e248fd71fd4b45a5969b588ac xpra-0.15.10.tar.xz diff --git a/xpra.spec b/xpra.spec index 5b56516..4f3f88e 100644 --- a/xpra.spec +++ b/xpra.spec @@ -21,7 +21,7 @@ %global __provides_exclude_from ^%{python_sitearch}/.*\\.so$ Name: xpra -Version: 0.15.9 +Version: 0.15.10 Release: 1%{?dist} Summary: Remote display server for applications and desktops @@ -216,6 +216,9 @@ fi %changelog +* Sat Dec 19 2015 Jonathan Underwood - 0.15.10-1 +- Update to 0.15.10 + * Wed Dec 2 2015 Jonathan Underwood - 0.15.9-1 - Update to 0.15.9 From 50384e48026d9d7d231a6c14836cd8e3982162ed Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Tue, 29 Dec 2015 14:41:53 +0000 Subject: [PATCH 034/267] Rebuild for libwebp 0.5.0 --- xpra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 4f3f88e..392801b 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,7 +22,7 @@ Name: xpra Version: 0.15.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -216,6 +216,9 @@ fi %changelog +* Tue Dec 29 2015 Jonathan Underwood - 0.15.10-2 +- Rebuild for libwebp 0.5.0 + * Sat Dec 19 2015 Jonathan Underwood - 0.15.10-1 - Update to 0.15.10 From bcbf94cbce2575e89415bab70fb612df71fbbdc4 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Thu, 7 Jan 2016 18:12:02 +0000 Subject: [PATCH 035/267] Update to 0.16.0 --- .gitignore | 1 + sources | 2 +- xpra.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 8a53955..8fa94d9 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /xpra-0.15.8.tar.xz /xpra-0.15.9.tar.xz /xpra-0.15.10.tar.xz +/xpra-0.16.0.tar.xz diff --git a/sources b/sources index 3856043..38c9d24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f783782e248fd71fd4b45a5969b588ac xpra-0.15.10.tar.xz +059a6e55b4c8b9c471101fec082b1499 xpra-0.16.0.tar.xz diff --git a/xpra.spec b/xpra.spec index 392801b..8349943 100644 --- a/xpra.spec +++ b/xpra.spec @@ -21,8 +21,8 @@ %global __provides_exclude_from ^%{python_sitearch}/.*\\.so$ Name: xpra -Version: 0.15.10 -Release: 2%{?dist} +Version: 0.16.0 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -211,11 +211,14 @@ fi %{_datadir}/appdata/xpra.appdata.xml %{_datadir}/mime/packages/application-x-xpraconfig.xml %{cupslibdir}/backend/xpraforwarder -#{_prefix}/lib/tmpfiles.d/xpra.conf +%{_prefix}/lib/tmpfiles.d/xpra.conf %doc README COPYING NEWS %changelog +* Thu Jan 7 2016 Jonathan Underwood - 0.16.0-1 +- Update to 0.16.0 + * Tue Dec 29 2015 Jonathan Underwood - 0.15.10-2 - Rebuild for libwebp 0.5.0 From a685e608a0bacb27253018560a4bc8cb026b1ca3 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Thu, 7 Jan 2016 19:00:47 +0000 Subject: [PATCH 036/267] Add patch to Move sockets, log files, script files from ~/.xpra to /var/run/user/$UID/xpra --- xpra-0.16.0-move-to-var-run.patch | 27 +++++++++++++++++++++++++++ xpra.spec | 9 ++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 xpra-0.16.0-move-to-var-run.patch diff --git a/xpra-0.16.0-move-to-var-run.patch b/xpra-0.16.0-move-to-var-run.patch new file mode 100644 index 0000000..6ed4557 --- /dev/null +++ b/xpra-0.16.0-move-to-var-run.patch @@ -0,0 +1,27 @@ +diff -up xpra-0.16.0/xpra/platform/paths.py.orig xpra-0.16.0/xpra/platform/paths.py +--- xpra-0.16.0/xpra/platform/paths.py.orig 2015-12-10 03:35:53.000000000 +0000 ++++ xpra-0.16.0/xpra/platform/paths.py 2016-01-07 18:50:03.627930571 +0000 +@@ -62,12 +62,12 @@ def do_get_default_conf_dirs(): + def get_socket_dirs(): + return envaslist_or_delegate("XPRA_SOCKET_DIRS", do_get_socket_dirs) + def do_get_socket_dirs(): +- return ["~/.xpra"] ++ return ["/var/run/user/$UID/xpra"] + + def get_default_log_dir(): + return env_or_delegate("XPRA_LOG_DIR", do_get_default_log_dir) + def do_get_default_log_dir(): +- return "~/.xpra" ++ return "/var/run/user/$UID/xpra" + + def get_download_dir(): + return env_or_delegate("XPRA_DOWNLOAD_DIR", do_get_download_dir) +@@ -80,7 +80,7 @@ def do_get_download_dir(): + def get_script_bin_dir(): + return env_or_delegate("XPRA_SCRIPT_BIN_DIR", do_get_script_bin_dir) + def do_get_script_bin_dir(): +- return "~/.xpra" ++ return "/var/run/user/$UID/xpra" + + + #overriden in platform code: diff --git a/xpra.spec b/xpra.spec index 8349943..bb28520 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,13 +22,15 @@ Name: xpra Version: 0.16.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ Source0: https://xpra.org/src/%{name}-%{version}.tar.xz +# Move sockets, log files, script files from ~/.xpra to /var/run/user/$UID/xpra +Patch0: xpra-0.16.0-move-to-var-run.patch BuildRequires: python2-devel pygobject2-devel pygtk2-devel BuildRequires: libXtst-devel @@ -93,6 +95,7 @@ network bandwidth constraints. %prep %setup -q +%patch0 -p1 -b .orig %build CFLAGS="%{optflags}" %{__python} setup.py build \ @@ -216,6 +219,10 @@ fi %changelog +* Thu Jan 7 2016 Jonathan Underwood - 0.16.0-2 +- Add patch to Move sockets, log files, script files from ~/.xpra to + /var/run/user/$UID/xpra + * Thu Jan 7 2016 Jonathan Underwood - 0.16.0-1 - Update to 0.16.0 From b65f2b410d9727328f6ffbc305d7cf0afbadd113 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Thu, 7 Jan 2016 19:09:29 +0000 Subject: [PATCH 037/267] Re-add ~/.xpra to socket-dirs for backwards compatibility as second in search order --- xpra-0.16.0-move-to-var-run.patch | 4 ++-- xpra.spec | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xpra-0.16.0-move-to-var-run.patch b/xpra-0.16.0-move-to-var-run.patch index 6ed4557..e92dd8c 100644 --- a/xpra-0.16.0-move-to-var-run.patch +++ b/xpra-0.16.0-move-to-var-run.patch @@ -1,12 +1,12 @@ diff -up xpra-0.16.0/xpra/platform/paths.py.orig xpra-0.16.0/xpra/platform/paths.py --- xpra-0.16.0/xpra/platform/paths.py.orig 2015-12-10 03:35:53.000000000 +0000 -+++ xpra-0.16.0/xpra/platform/paths.py 2016-01-07 18:50:03.627930571 +0000 ++++ xpra-0.16.0/xpra/platform/paths.py 2016-01-07 19:07:47.875258180 +0000 @@ -62,12 +62,12 @@ def do_get_default_conf_dirs(): def get_socket_dirs(): return envaslist_or_delegate("XPRA_SOCKET_DIRS", do_get_socket_dirs) def do_get_socket_dirs(): - return ["~/.xpra"] -+ return ["/var/run/user/$UID/xpra"] ++ return ["/var/run/user/$UID/xpra", "~/.xpra"] def get_default_log_dir(): return env_or_delegate("XPRA_LOG_DIR", do_get_default_log_dir) diff --git a/xpra.spec b/xpra.spec index bb28520..1769513 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,7 +22,7 @@ Name: xpra Version: 0.16.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -219,6 +219,10 @@ fi %changelog +* Thu Jan 7 2016 Jonathan Underwood - 0.16.0-3 +- Re-add ~/.xpra to socket-dirs for backwards compatibility as second + in search order + * Thu Jan 7 2016 Jonathan Underwood - 0.16.0-2 - Add patch to Move sockets, log files, script files from ~/.xpra to /var/run/user/$UID/xpra From d289d1afd9669aa8f46ed6ecea55a83fadec6057 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Tue, 26 Jan 2016 18:19:05 +0000 Subject: [PATCH 038/267] Update to 0.16.1 --- .gitignore | 1 + sources | 2 +- xpra.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8fa94d9..fa8879f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /xpra-0.15.9.tar.xz /xpra-0.15.10.tar.xz /xpra-0.16.0.tar.xz +/xpra-0.16.1.tar.xz diff --git a/sources b/sources index 38c9d24..d6a61d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -059a6e55b4c8b9c471101fec082b1499 xpra-0.16.0.tar.xz +b4eac6dc3b8b92720047e0205078fe51 xpra-0.16.1.tar.xz diff --git a/xpra.spec b/xpra.spec index 1769513..a6fc7b2 100644 --- a/xpra.spec +++ b/xpra.spec @@ -21,8 +21,8 @@ %global __provides_exclude_from ^%{python_sitearch}/.*\\.so$ Name: xpra -Version: 0.16.0 -Release: 3%{?dist} +Version: 0.16.1 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -219,6 +219,9 @@ fi %changelog +* Tue Jan 26 2016 Jonathan Underwood - 0.16.1-1 +- Update to 0.16.1 + * Thu Jan 7 2016 Jonathan Underwood - 0.16.0-3 - Re-add ~/.xpra to socket-dirs for backwards compatibility as second in search order From f8205bb55b8b47e9443ef983b6619cf81ad7cc59 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Tue, 26 Jan 2016 19:51:43 +0000 Subject: [PATCH 039/267] Split html5 support out into subpackage --- xpra.spec | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/xpra.spec b/xpra.spec index a6fc7b2..c0373db 100644 --- a/xpra.spec +++ b/xpra.spec @@ -60,8 +60,6 @@ Requires: gstreamer gstreamer-python Requires: gstreamer-plugins-base gstreamer-plugins-good Requires: pulseaudio pulseaudio-utils Requires: python-rencode -Requires: js-web-socket-js -Requires: js-jquery Requires: cups-filesystem Requires: shared-mime-info Requires: python-cups @@ -71,12 +69,6 @@ Requires: python-lz4 Suggests: python2-pyopencl %endif -Provides: bundled(js-jquery-ui) = 1.10.4 -%if 0%{?fedora} >= 21 -Requires: js-zlib -%else -Provides: bundled(js-zlib) -%endif %description @@ -91,6 +83,20 @@ Sessions can be accessed over SSH, or password protected over plain TCP sockets. Xpra is usable over reasonably slow links and does its best to adapt to changing network bandwidth constraints. +%package html5 +Summary: html5 server and client support for xpra +Requires: %{name} = %{version}-%{release} +# websockify is required to allow xpra to listen for an html5 client +Requires: python-websockify +Requires: js-web-socket-js +Requires: js-jquery +Provides: bundled(js-jquery-ui) = 1.10.4 +Requires: js-zlib + +%description html5 +This package adds websockify support to allow xpra to listen for http +connections, and also the xpra html5 client. + %global cupslibdir %(cups-config --serverbin) %prep @@ -210,15 +216,19 @@ fi %{_datadir}/icons/hicolor/48x48/apps/xpra.png %{_mandir}/man1/xpra.1.* %{_mandir}/man1/xpra_launcher.1.* -%{_datadir}/xpra %{_datadir}/appdata/xpra.appdata.xml %{_datadir}/mime/packages/application-x-xpraconfig.xml %{cupslibdir}/backend/xpraforwarder %{_prefix}/lib/tmpfiles.d/xpra.conf %doc README COPYING NEWS +%files html5 +%{_datadir}/xpra %changelog +* Tue Jan 26 2016 Jonathan Underwood - 0.16.1-2 +- Split html5 support out into subpackage + * Tue Jan 26 2016 Jonathan Underwood - 0.16.1-1 - Update to 0.16.1 From 2b209eb4230ac924a075176ef45c742726c76151 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:48:41 +0000 Subject: [PATCH 040/267] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xpra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index c0373db..3cb909a 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,7 +22,7 @@ Name: xpra Version: 0.16.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -226,6 +226,9 @@ fi %{_datadir}/xpra %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 0.16.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Jan 26 2016 Jonathan Underwood - 0.16.1-2 - Split html5 support out into subpackage From 897fab886adf5a0c759dcdc8060e07e24518c2a7 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Fri, 19 Feb 2016 08:45:32 +0000 Subject: [PATCH 041/267] Uodate to 0.16.2 (BZ 1301357), fix a number of deps: - Replace gstreamer Requires with gstreamer1 Requires (BZ 1309811) - Require python-gobject (BZ 1309811) - No longer Require gstreamer-python (BZ 1309811) - Require xorg-x11-xauth (BZ 1309804) - Require dbus-x11 (BZ 1309827) --- .gitignore | 1 + sources | 2 +- xpra.spec | 19 +++++++++++++++---- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index fa8879f..845f34f 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /xpra-0.15.10.tar.xz /xpra-0.16.0.tar.xz /xpra-0.16.1.tar.xz +/xpra-0.16.2.tar.xz diff --git a/sources b/sources index d6a61d1..39592d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b4eac6dc3b8b92720047e0205078fe51 xpra-0.16.1.tar.xz +f464f7ee6d88edb9874137b6e21ae310 xpra-0.16.2.tar.xz diff --git a/xpra.spec b/xpra.spec index 3cb909a..217385b 100644 --- a/xpra.spec +++ b/xpra.spec @@ -21,8 +21,8 @@ %global __provides_exclude_from ^%{python_sitearch}/.*\\.so$ Name: xpra -Version: 0.16.1 -Release: 2%{?dist} +Version: 0.16.2 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -52,12 +52,15 @@ BuildRequires: x264-devel Requires: python-imaging Requires: dbus-python +Requires: dbus-x11 Requires: xorg-x11-server-utils Requires: xorg-x11-drv-dummy +Requires: xorg-x11-xauth Requires: PyOpenGL pygtkglext Requires: python-numeric numpy -Requires: gstreamer gstreamer-python -Requires: gstreamer-plugins-base gstreamer-plugins-good +Requires: python-gobject +Requires: gstreamer1 +Requires: gstreamer1-plugins-base gstreamer1-plugins-good Requires: pulseaudio pulseaudio-utils Requires: python-rencode Requires: cups-filesystem @@ -226,6 +229,14 @@ fi %{_datadir}/xpra %changelog +* Fri Feb 19 2016 Jonathan Underwood - 0.16.2-1 +- Uodate to 0.16.2 (BZ 1301357) +- Replace gstreamer Requires with gstreamer1 Requires (BZ 1309811) +- Require python-gobject (BZ 1309811) +- No longer Require gstreamer-python (BZ 1309811) +- Require xorg-x11-xauth (BZ 1309804) +- Require dbus-x11 (BZ 1309827) + * Fri Feb 05 2016 Fedora Release Engineering - 0.16.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 9260e8f4ae4e591210a15c1b09a4e45b080c9004 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Fri, 19 Feb 2016 09:17:41 +0000 Subject: [PATCH 042/267] Add pyopencl Suggests for F23 --- xpra.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xpra.spec b/xpra.spec index 217385b..ff83937 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,7 +22,7 @@ Name: xpra Version: 0.16.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -68,7 +68,7 @@ Requires: shared-mime-info Requires: python-cups Requires: python-lz4 -%if 0%{?fedora} >= 24 +%if 0%{?fedora} >= 23 Suggests: python2-pyopencl %endif @@ -229,6 +229,9 @@ fi %{_datadir}/xpra %changelog +* Fri Feb 19 2016 Jonathan Underwood - 0.16.2-2 +- Add pyopencl Suggests for F23 + * Fri Feb 19 2016 Jonathan Underwood - 0.16.2-1 - Uodate to 0.16.2 (BZ 1301357) - Replace gstreamer Requires with gstreamer1 Requires (BZ 1309811) From f95f199bac9226b71fb7b38e1cdc13acbba12d63 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Fri, 19 Feb 2016 10:06:10 +0000 Subject: [PATCH 043/267] Use XDG_RUNTIME_DIR for socket and logs (BZ 1309872). No longer move the run script to /var/run - breaks other clients --- xpra-0.16.0-move-to-var-run.patch | 27 --------------------------- xpra-0.16.2-move-to-var-run.patch | 18 ++++++++++++++++++ xpra.spec | 4 +++- 3 files changed, 21 insertions(+), 28 deletions(-) delete mode 100644 xpra-0.16.0-move-to-var-run.patch create mode 100644 xpra-0.16.2-move-to-var-run.patch diff --git a/xpra-0.16.0-move-to-var-run.patch b/xpra-0.16.0-move-to-var-run.patch deleted file mode 100644 index e92dd8c..0000000 --- a/xpra-0.16.0-move-to-var-run.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up xpra-0.16.0/xpra/platform/paths.py.orig xpra-0.16.0/xpra/platform/paths.py ---- xpra-0.16.0/xpra/platform/paths.py.orig 2015-12-10 03:35:53.000000000 +0000 -+++ xpra-0.16.0/xpra/platform/paths.py 2016-01-07 19:07:47.875258180 +0000 -@@ -62,12 +62,12 @@ def do_get_default_conf_dirs(): - def get_socket_dirs(): - return envaslist_or_delegate("XPRA_SOCKET_DIRS", do_get_socket_dirs) - def do_get_socket_dirs(): -- return ["~/.xpra"] -+ return ["/var/run/user/$UID/xpra", "~/.xpra"] - - def get_default_log_dir(): - return env_or_delegate("XPRA_LOG_DIR", do_get_default_log_dir) - def do_get_default_log_dir(): -- return "~/.xpra" -+ return "/var/run/user/$UID/xpra" - - def get_download_dir(): - return env_or_delegate("XPRA_DOWNLOAD_DIR", do_get_download_dir) -@@ -80,7 +80,7 @@ def do_get_download_dir(): - def get_script_bin_dir(): - return env_or_delegate("XPRA_SCRIPT_BIN_DIR", do_get_script_bin_dir) - def do_get_script_bin_dir(): -- return "~/.xpra" -+ return "/var/run/user/$UID/xpra" - - - #overriden in platform code: diff --git a/xpra-0.16.2-move-to-var-run.patch b/xpra-0.16.2-move-to-var-run.patch new file mode 100644 index 0000000..fc5dd1f --- /dev/null +++ b/xpra-0.16.2-move-to-var-run.patch @@ -0,0 +1,18 @@ +diff -up xpra-0.16.2/xpra/platform/paths.py.orig xpra-0.16.2/xpra/platform/paths.py +--- xpra-0.16.2/xpra/platform/paths.py.orig 2015-12-10 03:35:53.000000000 +0000 ++++ xpra-0.16.2/xpra/platform/paths.py 2016-02-19 10:02:11.293665836 +0000 +@@ -62,12 +62,12 @@ def do_get_default_conf_dirs(): + def get_socket_dirs(): + return envaslist_or_delegate("XPRA_SOCKET_DIRS", do_get_socket_dirs) + def do_get_socket_dirs(): +- return ["~/.xpra"] ++ return ["$XDG_RUNTIME_DIR", "~/.xpra"] + + def get_default_log_dir(): + return env_or_delegate("XPRA_LOG_DIR", do_get_default_log_dir) + def do_get_default_log_dir(): +- return "~/.xpra" ++ return "$XDG_RUNTIME_DIR" + + def get_download_dir(): + return env_or_delegate("XPRA_DOWNLOAD_DIR", do_get_download_dir) diff --git a/xpra.spec b/xpra.spec index ff83937..87ee25a 100644 --- a/xpra.spec +++ b/xpra.spec @@ -30,7 +30,7 @@ URL: https://www.xpra.org/ Source0: https://xpra.org/src/%{name}-%{version}.tar.xz # Move sockets, log files, script files from ~/.xpra to /var/run/user/$UID/xpra -Patch0: xpra-0.16.0-move-to-var-run.patch +Patch0: xpra-0.16.2-move-to-var-run.patch BuildRequires: python2-devel pygobject2-devel pygtk2-devel BuildRequires: libXtst-devel @@ -231,6 +231,8 @@ fi %changelog * Fri Feb 19 2016 Jonathan Underwood - 0.16.2-2 - Add pyopencl Suggests for F23 +- No longer move the run script to /var/run - breaks other clients +- Use XDG_RUNTIME_DIR for socket and logs (BZ 1309872) * Fri Feb 19 2016 Jonathan Underwood - 0.16.2-1 - Uodate to 0.16.2 (BZ 1301357) From 191fdb6644c98b4d54b7194029077babfc8d82be Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Fri, 19 Feb 2016 14:26:07 +0000 Subject: [PATCH 044/267] Drop xpra-0.16.2-move-to-var-run.patch - broken --- xpra-0.16.2-move-to-var-run.patch | 18 ------------------ xpra.spec | 9 ++++----- 2 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 xpra-0.16.2-move-to-var-run.patch diff --git a/xpra-0.16.2-move-to-var-run.patch b/xpra-0.16.2-move-to-var-run.patch deleted file mode 100644 index fc5dd1f..0000000 --- a/xpra-0.16.2-move-to-var-run.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up xpra-0.16.2/xpra/platform/paths.py.orig xpra-0.16.2/xpra/platform/paths.py ---- xpra-0.16.2/xpra/platform/paths.py.orig 2015-12-10 03:35:53.000000000 +0000 -+++ xpra-0.16.2/xpra/platform/paths.py 2016-02-19 10:02:11.293665836 +0000 -@@ -62,12 +62,12 @@ def do_get_default_conf_dirs(): - def get_socket_dirs(): - return envaslist_or_delegate("XPRA_SOCKET_DIRS", do_get_socket_dirs) - def do_get_socket_dirs(): -- return ["~/.xpra"] -+ return ["$XDG_RUNTIME_DIR", "~/.xpra"] - - def get_default_log_dir(): - return env_or_delegate("XPRA_LOG_DIR", do_get_default_log_dir) - def do_get_default_log_dir(): -- return "~/.xpra" -+ return "$XDG_RUNTIME_DIR" - - def get_download_dir(): - return env_or_delegate("XPRA_DOWNLOAD_DIR", do_get_download_dir) diff --git a/xpra.spec b/xpra.spec index 87ee25a..cf66c5a 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,16 +22,13 @@ Name: xpra Version: 0.16.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ Source0: https://xpra.org/src/%{name}-%{version}.tar.xz -# Move sockets, log files, script files from ~/.xpra to /var/run/user/$UID/xpra -Patch0: xpra-0.16.2-move-to-var-run.patch - BuildRequires: python2-devel pygobject2-devel pygtk2-devel BuildRequires: libXtst-devel BuildRequires: libxkbfile-devel @@ -104,7 +101,6 @@ connections, and also the xpra html5 client. %prep %setup -q -%patch0 -p1 -b .orig %build CFLAGS="%{optflags}" %{__python} setup.py build \ @@ -229,6 +225,9 @@ fi %{_datadir}/xpra %changelog +* Fri Feb 19 2016 Jonathan Underwood - 0.16.2-3 +- Drop xpra-0.16.2-move-to-var-run.patch - broken + * Fri Feb 19 2016 Jonathan Underwood - 0.16.2-2 - Add pyopencl Suggests for F23 - No longer move the run script to /var/run - breaks other clients From dd177258c08cfffd9b152fbb6c11d97e76c03dce Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Fri, 19 Feb 2016 14:54:00 +0000 Subject: [PATCH 045/267] Move icon files back into main package --- xpra.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xpra.spec b/xpra.spec index cf66c5a..baf7029 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,7 +22,7 @@ Name: xpra Version: 0.16.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -217,14 +217,18 @@ fi %{_mandir}/man1/xpra_launcher.1.* %{_datadir}/appdata/xpra.appdata.xml %{_datadir}/mime/packages/application-x-xpraconfig.xml +%{_datadir}/xpra/icons %{cupslibdir}/backend/xpraforwarder %{_prefix}/lib/tmpfiles.d/xpra.conf %doc README COPYING NEWS %files html5 -%{_datadir}/xpra +%{_datadir}/xpra/www %changelog +* Fri Feb 19 2016 Jonathan Underwood - 0.16.2-4 +- Move icon files back into main package + * Fri Feb 19 2016 Jonathan Underwood - 0.16.2-3 - Drop xpra-0.16.2-move-to-var-run.patch - broken From f0e974c1f3b08d1dcdfc422d07c50eaa92478f52 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Mon, 22 Feb 2016 16:56:54 +0000 Subject: [PATCH 046/267] Fix cupslibdir macro to not spew errors during SRPM build --- xpra.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xpra.spec b/xpra.spec index baf7029..8020076 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,7 +22,7 @@ Name: xpra Version: 0.16.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -97,7 +97,9 @@ Requires: js-zlib This package adds websockify support to allow xpra to listen for http connections, and also the xpra html5 client. -%global cupslibdir %(cups-config --serverbin) +# Note: cups-config not in buildroot during srpm build, so we use the +# conditional execution to silence erros during srpm build. +%global cupslibdir %(cups-config --serverbin > /dev/null 2>&1 || echo "/usr/lib/cups") %prep %setup -q @@ -226,6 +228,9 @@ fi %{_datadir}/xpra/www %changelog +* Mon Feb 22 2016 Jonathan Underwood - 0.16.2-5 +- Fix cupslibdir macro to not spew errors during SRPM build + * Fri Feb 19 2016 Jonathan Underwood - 0.16.2-4 - Move icon files back into main package From d799b13f65d97b03ff6b7607d8978812a0bd0cf5 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Mon, 22 Feb 2016 18:08:58 +0000 Subject: [PATCH 047/267] Fixup redirection in cupslibdir definition --- xpra.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 8020076..4bbc870 100644 --- a/xpra.spec +++ b/xpra.spec @@ -99,7 +99,7 @@ connections, and also the xpra html5 client. # Note: cups-config not in buildroot during srpm build, so we use the # conditional execution to silence erros during srpm build. -%global cupslibdir %(cups-config --serverbin > /dev/null 2>&1 || echo "/usr/lib/cups") +%global cupslibdir %(cups-config --serverbin 2> /dev/null || echo "/usr/lib/cups") %prep %setup -q From 14b97fa656be98f4d84d3da2fd5591944091716e Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Sun, 28 Feb 2016 17:51:17 +0000 Subject: [PATCH 048/267] Update dependencies Remove python-numeric Requires Change python-rencode dep to python2-rencode Change python-lz4 dep to python2-lz4 --- xpra.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/xpra.spec b/xpra.spec index 4bbc870..f7647e4 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,7 +22,7 @@ Name: xpra Version: 0.16.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -54,16 +54,16 @@ Requires: xorg-x11-server-utils Requires: xorg-x11-drv-dummy Requires: xorg-x11-xauth Requires: PyOpenGL pygtkglext -Requires: python-numeric numpy +Requires: numpy Requires: python-gobject Requires: gstreamer1 Requires: gstreamer1-plugins-base gstreamer1-plugins-good Requires: pulseaudio pulseaudio-utils -Requires: python-rencode +Requires: python2-rencode Requires: cups-filesystem Requires: shared-mime-info Requires: python-cups -Requires: python-lz4 +Requires: python2-lz4 %if 0%{?fedora} >= 23 Suggests: python2-pyopencl @@ -228,6 +228,11 @@ fi %{_datadir}/xpra/www %changelog +* Sun Feb 28 2016 Jonathan Underwood - 0.16.2-5 +- Remove python-numeric Requires +- Change python-rencode dep to python2-rencode +- Change python-lz4 dep to python2-lz4 + * Mon Feb 22 2016 Jonathan Underwood - 0.16.2-5 - Fix cupslibdir macro to not spew errors during SRPM build From fb351be456f642bb734162ef7ab6c82db23d6dac Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Sun, 28 Feb 2016 18:05:17 +0000 Subject: [PATCH 049/267] More dep cleanup Change python-imaging dep to python[2]-pillow Change python-cups to python2-cups of F24 and higher --- xpra.spec | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/xpra.spec b/xpra.spec index f7647e4..7a5b2d8 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,7 +22,7 @@ Name: xpra Version: 0.16.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -47,7 +47,13 @@ BuildRequires: x264-devel %BuildRequires: ffmpeg-devel %endif -Requires: python-imaging +%if 0%{fedora} >= 24 +Requires: python2-pillow +Requires: python2-cups +%else +Requires: python-pillow +Requires: python-cups +%endif Requires: dbus-python Requires: dbus-x11 Requires: xorg-x11-server-utils @@ -62,7 +68,6 @@ Requires: pulseaudio pulseaudio-utils Requires: python2-rencode Requires: cups-filesystem Requires: shared-mime-info -Requires: python-cups Requires: python2-lz4 %if 0%{?fedora} >= 23 @@ -228,7 +233,11 @@ fi %{_datadir}/xpra/www %changelog -* Sun Feb 28 2016 Jonathan Underwood - 0.16.2-5 +* Sun Feb 28 2016 Jonathan Underwood - 0.16.2-7 +- Change python-imaging dep to python[2]-pillow +- Change python-cups to python2-cups of F24 and higher + +* Sun Feb 28 2016 Jonathan Underwood - 0.16.2-6 - Remove python-numeric Requires - Change python-rencode dep to python2-rencode - Change python-lz4 dep to python2-lz4 From be3f2ddb1a285e6fc0d23279381b52464b71cd1f Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Mon, 29 Feb 2016 18:12:40 +0000 Subject: [PATCH 050/267] Properly enable opencl support on Fedora 23 Change PyOpenGL requires to python2-opengl on f24 and higher --- xpra.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/xpra.spec b/xpra.spec index 7a5b2d8..d605847 100644 --- a/xpra.spec +++ b/xpra.spec @@ -50,16 +50,18 @@ BuildRequires: x264-devel %if 0%{fedora} >= 24 Requires: python2-pillow Requires: python2-cups +Requires: python2-pyopengl %else Requires: python-pillow Requires: python-cups +Requires: PyOpenGL %endif Requires: dbus-python Requires: dbus-x11 Requires: xorg-x11-server-utils Requires: xorg-x11-drv-dummy Requires: xorg-x11-xauth -Requires: PyOpenGL pygtkglext +Requires: pygtkglext Requires: numpy Requires: python-gobject Requires: gstreamer1 @@ -117,7 +119,7 @@ CFLAGS="%{optflags}" %{__python} setup.py build \ %{?_with_enc_x264} \ %{?_with_dec_avcodec2} \ %{?_with_csc_swscale} \ -%if 0%{?fedora} >= 24 +%if 0%{?fedora} >= 23 --with-csc_opencl \ %endif --with-Xdummy \ @@ -133,7 +135,7 @@ CFLAGS="%{optflags}" %{__python} setup.py build \ %{?_with_enc_x264} \ %{?_with_dec_avcodec2} \ %{?_with_csc_swscale} \ -%if 0%{?fedora} >= 24 +%if 0%{?fedora} >= 23 --with-csc_opencl \ %endif --with-Xdummy \ @@ -233,6 +235,10 @@ fi %{_datadir}/xpra/www %changelog +* Mon Feb 29 2016 Jonathan Underwood - 0.16.2-8 +- Properly enable opencl support on Fedora 23 +- Change PyOpenGL requires to python2-opengl on f24 and higher + * Sun Feb 28 2016 Jonathan Underwood - 0.16.2-7 - Change python-imaging dep to python[2]-pillow - Change python-cups to python2-cups of F24 and higher From 8595ffe480d666f42bb8f2e2cf99824d8174de6b Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Mon, 29 Feb 2016 18:13:33 +0000 Subject: [PATCH 051/267] Bump version --- xpra.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index d605847..3834c14 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,7 +22,7 @@ Name: xpra Version: 0.16.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT From cd1dd150e7a93be0a0caa6966b74734c47b8590a Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Thu, 24 Mar 2016 14:43:12 +0000 Subject: [PATCH 052/267] Update to 0.16.3 --- .gitignore | 1 + sources | 2 +- xpra.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 845f34f..3ecc00b 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /xpra-0.16.0.tar.xz /xpra-0.16.1.tar.xz /xpra-0.16.2.tar.xz +/xpra-0.16.3.tar.xz diff --git a/sources b/sources index 39592d0..3d89912 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f464f7ee6d88edb9874137b6e21ae310 xpra-0.16.2.tar.xz +9f81ac22991083ee49e01f62ae113a56 xpra-0.16.3.tar.xz diff --git a/xpra.spec b/xpra.spec index 3834c14..4beeee0 100644 --- a/xpra.spec +++ b/xpra.spec @@ -21,8 +21,8 @@ %global __provides_exclude_from ^%{python_sitearch}/.*\\.so$ Name: xpra -Version: 0.16.2 -Release: 8%{?dist} +Version: 0.16.3 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -235,6 +235,9 @@ fi %{_datadir}/xpra/www %changelog +* Thu Mar 24 2016 Jonathan Underwood - 0.16.3-1 +- Update to 0.16.3 + * Mon Feb 29 2016 Jonathan Underwood - 0.16.2-8 - Properly enable opencl support on Fedora 23 - Change PyOpenGL requires to python2-opengl on f24 and higher From f9732cae294fc919ce505dc74b50a6e6556bdda4 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Thu, 14 Apr 2016 15:40:14 +0100 Subject: [PATCH 053/267] Correctly enable use of shared sockets with the xpra group - Require(pre) for shadow-utils - Create xpra group during %pre - Create and ghost own %{_localstatedir}/run/lightdm/ --- xpra.spec | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 4beeee0..e0794df 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,7 +22,7 @@ Name: xpra Version: 0.16.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -72,6 +72,9 @@ Requires: cups-filesystem Requires: shared-mime-info Requires: python2-lz4 +# Needed to create the xpra group +Requires(pre): shadow-utils + %if 0%{?fedora} >= 23 Suggests: python2-pyopencl %endif @@ -185,6 +188,9 @@ done find %{buildroot}%{_datadir}/xpra/www/include -name '*.js' \ -exec chmod 0644 {} \; +# Create this directory for sharing sockets +mkdir -p %{buildroot}%{_localstatedir}/run/xpra/ + appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/xpra.appdata.xml @@ -193,6 +199,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/xpra.desktop desktop-file-validate %{buildroot}%{_datadir}/applications/xpra_launcher.desktop +%pre +getent group xpra >/dev/null || groupadd -r xpra + + %post /usr/bin/update-desktop-database &> /dev/null || : /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -229,12 +239,19 @@ fi %{_datadir}/xpra/icons %{cupslibdir}/backend/xpraforwarder %{_prefix}/lib/tmpfiles.d/xpra.conf +%ghost %dir %{_localstatedir}/run/xpra %doc README COPYING NEWS %files html5 %{_datadir}/xpra/www %changelog +* Thu Apr 14 2016 Jonathan Underwood - 0.16.3-2 +- Correctly enable use of shared sockets with the xpra group +- Require(pre) for shadow-utils +- Create xpra group during %%pre +- Create and ghost own %%{_localstatedir}/run/lightdm/ + * Thu Mar 24 2016 Jonathan Underwood - 0.16.3-1 - Update to 0.16.3 From b10911c264f4f6383bd2c3eebbe4c1537784123a Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Thu, 14 Apr 2016 16:40:46 +0100 Subject: [PATCH 054/267] Fix deps for F22 --- xpra.spec | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/xpra.spec b/xpra.spec index e0794df..74de9a1 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,7 +22,7 @@ Name: xpra Version: 0.16.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -56,6 +56,16 @@ Requires: python-pillow Requires: python-cups Requires: PyOpenGL %endif +%if 0%{fedora} >= 23 +Requires: python-gobject +Requires: python2-lz4 +Requires: python2-rencode +Suggests: python2-pyopencl +%else +Requires: pygobject2 +Requires: python-rencode +Requires: python-lz4 +%endif Requires: dbus-python Requires: dbus-x11 Requires: xorg-x11-server-utils @@ -63,24 +73,15 @@ Requires: xorg-x11-drv-dummy Requires: xorg-x11-xauth Requires: pygtkglext Requires: numpy -Requires: python-gobject Requires: gstreamer1 Requires: gstreamer1-plugins-base gstreamer1-plugins-good Requires: pulseaudio pulseaudio-utils -Requires: python2-rencode Requires: cups-filesystem Requires: shared-mime-info -Requires: python2-lz4 # Needed to create the xpra group Requires(pre): shadow-utils -%if 0%{?fedora} >= 23 -Suggests: python2-pyopencl -%endif - - - %description Xpra is "screen for X": it allows you to run X programs, usually on a remote host, direct their display to your local machine, and then to disconnect from @@ -246,6 +247,9 @@ fi %{_datadir}/xpra/www %changelog +* Thu Apr 14 2016 Jonathan Underwood - 0.16.3-3 +- Fix deps for F22 + * Thu Apr 14 2016 Jonathan Underwood - 0.16.3-2 - Correctly enable use of shared sockets with the xpra group - Require(pre) for shadow-utils From 8bcf16b392856d9cfdbbf3205d823f110cc058f0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 19 Jul 2016 13:12:32 +0000 Subject: [PATCH 055/267] - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages --- xpra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 74de9a1..30fb1c7 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,7 +22,7 @@ Name: xpra Version: 0.16.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -247,6 +247,9 @@ fi %{_datadir}/xpra/www %changelog +* Tue Jul 19 2016 Fedora Release Engineering - 0.16.3-4 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + * Thu Apr 14 2016 Jonathan Underwood - 0.16.3-3 - Fix deps for F22 From 9382833533a93a3ba021368be9dc23e6db62b742 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 22 Jul 2016 11:17:49 -0400 Subject: [PATCH 056/267] rebuild for libvpx 1.6.0 --- xpra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 30fb1c7..c1ab766 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,7 +22,7 @@ Name: xpra Version: 0.16.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -247,6 +247,9 @@ fi %{_datadir}/xpra/www %changelog +* Fri Jul 22 2016 Tom Callaway - 0.16.3-5 +- rebuild for libvpx 1.6.0 + * Tue Jul 19 2016 Fedora Release Engineering - 0.16.3-4 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages From ad954c55b16fba2493fdd9ded1f7e7b0091cd0db Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Sun, 31 Jul 2016 17:06:48 +0100 Subject: [PATCH 057/267] Update to 0.17.4 --- .gitignore | 1 + sources | 2 +- xpra.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3ecc00b..cb29814 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /xpra-0.16.1.tar.xz /xpra-0.16.2.tar.xz /xpra-0.16.3.tar.xz +/xpra-0.17.4.tar.xz diff --git a/sources b/sources index 3d89912..2ad7832 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9f81ac22991083ee49e01f62ae113a56 xpra-0.16.3.tar.xz +b8d028fe85245500bb3bfa041e04636f xpra-0.17.4.tar.xz diff --git a/xpra.spec b/xpra.spec index c1ab766..74b22fd 100644 --- a/xpra.spec +++ b/xpra.spec @@ -21,8 +21,8 @@ %global __provides_exclude_from ^%{python_sitearch}/.*\\.so$ Name: xpra -Version: 0.16.3 -Release: 5%{?dist} +Version: 0.17.4 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -247,6 +247,9 @@ fi %{_datadir}/xpra/www %changelog +* Sun Jul 31 2016 Jonathan Underwood - 0.17.4-1 +- Update to 0.17.4 + * Fri Jul 22 2016 Tom Callaway - 0.16.3-5 - rebuild for libvpx 1.6.0 From fe54b8a6e0d6170a06f58359a416ae48061539d0 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Sun, 11 Sep 2016 13:15:04 +0100 Subject: [PATCH 058/267] Update to 0.17.5 --- .gitignore | 1 + sources | 2 +- xpra.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cb29814..b23e3aa 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /xpra-0.16.2.tar.xz /xpra-0.16.3.tar.xz /xpra-0.17.4.tar.xz +/xpra-0.17.5.tar.xz diff --git a/sources b/sources index 2ad7832..e38f504 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b8d028fe85245500bb3bfa041e04636f xpra-0.17.4.tar.xz +9ec20dae64cee8dbc70e6d5dbae0ab4a xpra-0.17.5.tar.xz diff --git a/xpra.spec b/xpra.spec index 74b22fd..02b78eb 100644 --- a/xpra.spec +++ b/xpra.spec @@ -21,7 +21,7 @@ %global __provides_exclude_from ^%{python_sitearch}/.*\\.so$ Name: xpra -Version: 0.17.4 +Version: 0.17.5 Release: 1%{?dist} Summary: Remote display server for applications and desktops @@ -247,6 +247,9 @@ fi %{_datadir}/xpra/www %changelog +* Sun Sep 11 2016 Jonathan Underwood - 0.17.5-1 +- Update to 0.17.5 + * Sun Jul 31 2016 Jonathan Underwood - 0.17.4-1 - Update to 0.17.4 From e9253891e52ae3564c1071ab97d2c048ab41110a Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Sat, 1 Oct 2016 21:19:58 +0100 Subject: [PATCH 059/267] Clean up some rpmlint errors --- xpra.spec | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/xpra.spec b/xpra.spec index 02b78eb..8e13976 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,7 +22,7 @@ Name: xpra Version: 0.17.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -192,10 +192,12 @@ find %{buildroot}%{_datadir}/xpra/www/include -name '*.js' \ # Create this directory for sharing sockets mkdir -p %{buildroot}%{_localstatedir}/run/xpra/ -appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/xpra.appdata.xml - +# Remove use of /usr/bin/enx from xpraforwarder script +sed -i "1 s|^#!/usr/bin/env python\b|#!%{__python}|" %{buildroot}%{cupslibdir}/backend/xpraforwarder %check +appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/xpra.appdata.xml + desktop-file-validate %{buildroot}%{_datadir}/applications/xpra.desktop desktop-file-validate %{buildroot}%{_datadir}/applications/xpra_launcher.desktop @@ -239,7 +241,7 @@ fi %{_datadir}/mime/packages/application-x-xpraconfig.xml %{_datadir}/xpra/icons %{cupslibdir}/backend/xpraforwarder -%{_prefix}/lib/tmpfiles.d/xpra.conf +%{_libdir}/tmpfiles.d/xpra.conf %ghost %dir %{_localstatedir}/run/xpra %doc README COPYING NEWS @@ -247,6 +249,9 @@ fi %{_datadir}/xpra/www %changelog +* Sat Oct 1 2016 Jonathan Underwood - 0.17.5-1 +- Clean up some rpmlint errors + * Sun Sep 11 2016 Jonathan Underwood - 0.17.5-1 - Update to 0.17.5 From 28e43211de89ae966df423b501e84a13610a87c8 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Sun, 2 Oct 2016 10:31:49 +0100 Subject: [PATCH 060/267] Use %_cups_serverbin if defined --- xpra.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xpra.spec b/xpra.spec index 8e13976..e25e59d 100644 --- a/xpra.spec +++ b/xpra.spec @@ -110,7 +110,11 @@ connections, and also the xpra html5 client. # Note: cups-config not in buildroot during srpm build, so we use the # conditional execution to silence erros during srpm build. +%if 0%{?_cups_serverbin:1} +%global cupslibdir %_cups_serverbin +%else %global cupslibdir %(cups-config --serverbin 2> /dev/null || echo "/usr/lib/cups") +%endif %prep %setup -q From 102e6fd00de0497bfeee070bab45c280966e5070 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Sun, 2 Oct 2016 10:55:29 +0100 Subject: [PATCH 061/267] Use %{_tmpfilesdir} macro --- xpra.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index e25e59d..b358beb 100644 --- a/xpra.spec +++ b/xpra.spec @@ -245,7 +245,7 @@ fi %{_datadir}/mime/packages/application-x-xpraconfig.xml %{_datadir}/xpra/icons %{cupslibdir}/backend/xpraforwarder -%{_libdir}/tmpfiles.d/xpra.conf +%{_tmpfilesdir}/xpra.conf %ghost %dir %{_localstatedir}/run/xpra %doc README COPYING NEWS From 39bbd5664414cb7e3a36634acfa641f8541c3e22 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Sun, 2 Oct 2016 10:55:52 +0100 Subject: [PATCH 062/267] Fixup spec changelog --- xpra.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index b358beb..594e482 100644 --- a/xpra.spec +++ b/xpra.spec @@ -253,8 +253,10 @@ fi %{_datadir}/xpra/www %changelog -* Sat Oct 1 2016 Jonathan Underwood - 0.17.5-1 +* Sat Oct 1 2016 Jonathan Underwood - 0.17.5-2 - Clean up some rpmlint errors +- Use %%_cups_serverbin if defined +- Use %%{_tmpfilesdir} * Sun Sep 11 2016 Jonathan Underwood - 0.17.5-1 - Update to 0.17.5 From c7a15740945220d429339aa80592ca959cc9b22f Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 8 Nov 2016 16:38:29 -0700 Subject: [PATCH 063/267] Update to 0.17.6 - Fix build on EPEL7 - Use %license --- .gitignore | 1 + sources | 2 +- xpra-Werror.patch | 12 ++++++++++++ xpra.spec | 39 ++++++++++++++++++++++++--------------- 4 files changed, 38 insertions(+), 16 deletions(-) create mode 100644 xpra-Werror.patch diff --git a/.gitignore b/.gitignore index b23e3aa..d666df9 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /xpra-0.16.3.tar.xz /xpra-0.17.4.tar.xz /xpra-0.17.5.tar.xz +/xpra-0.17.6.tar.xz diff --git a/sources b/sources index e38f504..ebb0d4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9ec20dae64cee8dbc70e6d5dbae0ab4a xpra-0.17.5.tar.xz +8572df8e71f6f5b9ea8ebcdd40c0bedf xpra-0.17.6.tar.xz diff --git a/xpra-Werror.patch b/xpra-Werror.patch new file mode 100644 index 0000000..19d4006 --- /dev/null +++ b/xpra-Werror.patch @@ -0,0 +1,12 @@ +diff -up xpra-0.17.6/setup.py.Werror xpra-0.17.6/setup.py +--- xpra-0.17.6/setup.py.Werror 2016-10-09 23:37:10.000000000 -0600 ++++ xpra-0.17.6/setup.py 2016-11-08 16:12:52.322926868 -0700 +@@ -664,7 +664,7 @@ def exec_pkgconfig(*pkgs_options, **ekw) + elif get_gcc_version()>=[4, 4]: + eifd = ["-Werror", + #CentOS 6.x gives us some invalid warnings in nvenc, ignore those: +- #"-Wno-error=uninitialized", ++ "-Wno-error=unused-but-set-variable", + #needed on Debian and Ubuntu to avoid this error: + #/usr/include/gtk-2.0/gtk/gtkitemfactory.h:47:1: error: function declaration isn't a prototype [-Werror=strict-prototypes] + #"-Wno-error=strict-prototypes", diff --git a/xpra.spec b/xpra.spec index 594e482..8f6ce28 100644 --- a/xpra.spec +++ b/xpra.spec @@ -17,17 +17,20 @@ %define _with_csc_swscale --without-csc_swscale %endif -# Remove private provides from .so files in the python_sitearch directory -%global __provides_exclude_from ^%{python_sitearch}/.*\\.so$ +# Remove private provides from .so files in the python2_sitearch directory +%global __provides_exclude_from ^%{python2_sitearch}/.*\\.so$ Name: xpra -Version: 0.17.5 -Release: 2%{?dist} +Version: 0.17.6 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ Source0: https://xpra.org/src/%{name}-%{version}.tar.xz +# Fix build with Werror +# https://www.xpra.org/trac/ticket/1353 +Patch0: xpra-Werror.patch BuildRequires: python2-devel pygobject2-devel pygtk2-devel BuildRequires: libXtst-devel @@ -47,7 +50,7 @@ BuildRequires: x264-devel %BuildRequires: ffmpeg-devel %endif -%if 0%{fedora} >= 24 +%if 0%{?fedora} >= 24 Requires: python2-pillow Requires: python2-cups Requires: python2-pyopengl @@ -56,7 +59,7 @@ Requires: python-pillow Requires: python-cups Requires: PyOpenGL %endif -%if 0%{fedora} >= 23 +%if 0%{?fedora} >= 23 Requires: python-gobject Requires: python2-lz4 Requires: python2-rencode @@ -117,10 +120,10 @@ connections, and also the xpra html5 client. %endif %prep -%setup -q +%autosetup -p1 %build -CFLAGS="%{optflags}" %{__python} setup.py build \ +CFLAGS="%{optflags}" %{__python2} setup.py build \ --verbose \ --with-vpx \ --with-webp \ @@ -134,7 +137,7 @@ CFLAGS="%{optflags}" %{__python} setup.py build \ --with-Xdummy_wrapper %install -%{__python} setup.py install \ +%{__python2} setup.py install \ --skip-build \ --root %{buildroot} \ --verbose \ @@ -160,12 +163,12 @@ rm -f \ %{buildroot}%{_datadir}/xpra/README \ %{buildroot}%{_datadir}/xpra/COPYING -#drop shebangs from python_sitearch -find %{buildroot}%{python_sitearch}/xpra -name '*.py' \ +#drop shebangs from python2_sitearch +find %{buildroot}%{python2_sitearch}/xpra -name '*.py' \ -exec sed -i '1{\@^#!/usr/bin/env python@d}' {} \; #fix permissions on shared objects -find %{buildroot}%{python_sitearch}/xpra -name '*.so' \ +find %{buildroot}%{python2_sitearch}/xpra -name '*.so' \ -exec chmod 0755 {} \; # delete any bundled SWFs - binary content forbidden by packaging @@ -235,8 +238,8 @@ fi %{_bindir}/xpra %{_bindir}/xpra_Xdummy %{_bindir}/xpra_launcher -%{python_sitearch}/xpra -%{python_sitearch}/*.egg-info +%{python2_sitearch}/xpra +%{python2_sitearch}/*.egg-info %{_datadir}/applications/xpra*.desktop %{_datadir}/icons/hicolor/48x48/apps/xpra.png %{_mandir}/man1/xpra.1.* @@ -247,12 +250,18 @@ fi %{cupslibdir}/backend/xpraforwarder %{_tmpfilesdir}/xpra.conf %ghost %dir %{_localstatedir}/run/xpra -%doc README COPYING NEWS +%doc README NEWS +%license COPYING %files html5 %{_datadir}/xpra/www %changelog +* Tue Nov 8 2016 Orion Poplawski - 0.17.6-1 +- Update to 0.17.6 +- Fix build on EPEL7 +- Use %%license + * Sat Oct 1 2016 Jonathan Underwood - 0.17.5-2 - Clean up some rpmlint errors - Use %%_cups_serverbin if defined From bee0762cce1bcc65143ac6d192bf3f93e4d459bd Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Sat, 10 Dec 2016 12:27:17 +0000 Subject: [PATCH 064/267] Update to version 1.0 - No longer unbundle javascript libs - shipped versions in html4 client newer than packaged - Enumerate all bundled js Provides properly - Improve commentary of Werror patch - Include all new conf files in pakcage - Include systemd serice and add BR for systemd --- .gitignore | 1 + sources | 2 +- xpra.spec | 58 ++++++++++++++++++++++++++++++------------------------ 3 files changed, 34 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index d666df9..7d85d88 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /xpra-0.17.4.tar.xz /xpra-0.17.5.tar.xz /xpra-0.17.6.tar.xz +/xpra-1.0.tar.xz diff --git a/sources b/sources index ebb0d4d..04cd3b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8572df8e71f6f5b9ea8ebcdd40c0bedf xpra-0.17.6.tar.xz +4325abcfe95ede43209a212a13854b3c xpra-1.0.tar.xz diff --git a/xpra.spec b/xpra.spec index 8f6ce28..97c8a33 100644 --- a/xpra.spec +++ b/xpra.spec @@ -21,17 +21,22 @@ %global __provides_exclude_from ^%{python2_sitearch}/.*\\.so$ Name: xpra -Version: 0.17.6 +Version: 1.0 Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ Source0: https://xpra.org/src/%{name}-%{version}.tar.xz -# Fix build with Werror + +# Fix build with Werror on rhel (old cython) # https://www.xpra.org/trac/ticket/1353 Patch0: xpra-Werror.patch +# Fix import error in xpra/codecs/webp/encode.pyx +# https://www.xpra.org/trac/ticket/1379 +Patch1: xpra-1.0-webp-encode-fix-import.patch + BuildRequires: python2-devel pygobject2-devel pygtk2-devel BuildRequires: libXtst-devel BuildRequires: libxkbfile-devel @@ -42,6 +47,7 @@ BuildRequires: libwebp-devel BuildRequires: libappstream-glib BuildRequires: cups-devel BuildRequires: redhat-lsb-core +BuildRequires: systemd %if %{with enc_x264} BuildRequires: x264-devel @@ -102,10 +108,15 @@ Summary: html5 server and client support for xpra Requires: %{name} = %{version}-%{release} # websockify is required to allow xpra to listen for an html5 client Requires: python-websockify -Requires: js-web-socket-js -Requires: js-jquery -Provides: bundled(js-jquery-ui) = 1.10.4 -Requires: js-zlib +Provides: bundled(js-jquery) = 3.1.1 +Provides: bundled(js-jquery-ui) = 1.12.1 +Provides: bundled(js-lz4) +Provides: bundled(js-zlib) +Provides: bundled(js-forge) +Provides: bundled(js-aurora) +Provides: bundled(js-broadway) +Provides: bundled(js-bencode) + %description html5 This package adds websockify support to allow xpra to listen for http @@ -175,25 +186,8 @@ find %{buildroot}%{python2_sitearch}/xpra -name '*.so' \ # guidelines find %{buildroot}%{_datadir}/xpra -name '*.swf' -exec rm {} \; -# Use system js-query rather than the bundled one -ln -sf ../../../javascript/jquery/2/jquery.min.js \ - %{buildroot}%{_datadir}/xpra/www/include/jquery.min.js - -# Use system web-socket-js rather than the bundled one -rm -rf %{buildroot}%{_datadir}/xpra/www/include/web-socket-js -ln -sf ../../../javascript/web-socket-js \ - %{buildroot}%{_datadir}/xpra/www/include/web-socket-js - -# Use system js-zlib instead of bundled one on Fedora >= 21 -%if 0%{?fedora} >= 21 -for file in deflate.min.js inflate.min.js ; do - ln -sf ../../../javascript/zlib/$file \ - %{buildroot}%{_datadir}/xpra/www/include/$file -done -%endif - # Ensure all .js files are not executeable -find %{buildroot}%{_datadir}/xpra/www/include -name '*.js' \ +find %{buildroot}%{_datadir}/xpra/www/js -name '*.js' \ -exec chmod 0644 {} \; # Create this directory for sharing sockets @@ -233,8 +227,11 @@ fi %files %dir %{_sysconfdir}/xpra -%config(noreplace) %{_sysconfdir}/xpra/xorg.conf -%config(noreplace) %{_sysconfdir}/xpra/xpra.conf +%dir %{_sysconfdir}/xpra/conf.d +%config(noreplace) %{_sysconfdir}/xpra/*.conf +%config(noreplace) %{_sysconfdir}/xpra/nvenc.keys +%config(noreplace) %{_sysconfdir}/xpra/conf.d/*.conf +%config(noreplace) %{_sysconfdir}/sysconfig/xpra %{_bindir}/xpra %{_bindir}/xpra_Xdummy %{_bindir}/xpra_launcher @@ -249,6 +246,7 @@ fi %{_datadir}/xpra/icons %{cupslibdir}/backend/xpraforwarder %{_tmpfilesdir}/xpra.conf +%config %{_unitdir}/xpra.service %ghost %dir %{_localstatedir}/run/xpra %doc README NEWS %license COPYING @@ -257,6 +255,14 @@ fi %{_datadir}/xpra/www %changelog +* Sat Dec 10 2016 Jonathan Underwood - 1.0-1 +- Update to version 1.0 +- No longer unbundle javascript libs - shipped versions in html4 client newer than packaged +- Enumerate all bundled js Provides properly +- Improve commentary of Werror patch +- Include all new conf files in pakcage +- Include systemd serice and add BR for systemd + * Tue Nov 8 2016 Orion Poplawski - 0.17.6-1 - Update to 0.17.6 - Fix build on EPEL7 From 97e910c3940a2453b076fa00f4a25095592d3f31 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Sat, 10 Dec 2016 12:27:47 +0000 Subject: [PATCH 065/267] Add xpra-1.0-webp-encode-fix-import.patch --- xpra-1.0-webp-encode-fix-import.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 xpra-1.0-webp-encode-fix-import.patch diff --git a/xpra-1.0-webp-encode-fix-import.patch b/xpra-1.0-webp-encode-fix-import.patch new file mode 100644 index 0000000..d57473e --- /dev/null +++ b/xpra-1.0-webp-encode-fix-import.patch @@ -0,0 +1,12 @@ +diff -up xpra-1.0/xpra/codecs/webp/encode.pyx.orig xpra-1.0/xpra/codecs/webp/encode.pyx +--- xpra-1.0/xpra/codecs/webp/encode.pyx.orig 2016-12-06 10:56:27.000000000 +0000 ++++ xpra-1.0/xpra/codecs/webp/encode.pyx 2016-12-10 11:13:14.305360914 +0000 +@@ -8,7 +8,7 @@ import os + from xpra.log import Logger + log = Logger("encoder", "webp") + +-from xpra.util envbool ++from xpra.util import envbool + cdef int LOG_CONFIG = envbool("XPRA_WEBP_LOG_CONFIG", False) + cdef int USE_THREADS = envbool("XPRA_WEBP_THREADING", True) + From 08e678da00cf335e9f44b643e04740875e3c3760 Mon Sep 17 00:00:00 2001 From: Jonathan Underwood Date: Sat, 10 Dec 2016 14:08:58 +0000 Subject: [PATCH 066/267] Disable webp by default, consistent with upstream https://www.xpra.org/trac/ticket/1379 --- xpra.spec | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/xpra.spec b/xpra.spec index 97c8a33..0b42640 100644 --- a/xpra.spec +++ b/xpra.spec @@ -17,12 +17,16 @@ %define _with_csc_swscale --without-csc_swscale %endif +%if !%{with webp} +%define _with_webp --without-webp +%endif + # Remove private provides from .so files in the python2_sitearch directory %global __provides_exclude_from ^%{python2_sitearch}/.*\\.so$ Name: xpra Version: 1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -43,12 +47,15 @@ BuildRequires: libxkbfile-devel BuildRequires: Cython BuildRequires: desktop-file-utils BuildRequires: libvpx-devel -BuildRequires: libwebp-devel BuildRequires: libappstream-glib BuildRequires: cups-devel BuildRequires: redhat-lsb-core BuildRequires: systemd +%if %{with webp} +BuildRequires: libwebp-devel +%endif + %if %{with enc_x264} BuildRequires: x264-devel %endif @@ -137,7 +144,7 @@ connections, and also the xpra html5 client. CFLAGS="%{optflags}" %{__python2} setup.py build \ --verbose \ --with-vpx \ - --with-webp \ + %{?_with_webp} \ %{?_with_enc_x264} \ %{?_with_dec_avcodec2} \ %{?_with_csc_swscale} \ @@ -153,7 +160,7 @@ CFLAGS="%{optflags}" %{__python2} setup.py build \ --root %{buildroot} \ --verbose \ --with-vpx \ - --with-webp \ + %{?_with_webp} \ %{?_with_enc_x264} \ %{?_with_dec_avcodec2} \ %{?_with_csc_swscale} \ @@ -255,6 +262,10 @@ fi %{_datadir}/xpra/www %changelog +* Sat Dec 10 2016 Jonathan Underwood - 1.0-2 +- Disable webp by default, consistent with upstream + https://www.xpra.org/trac/ticket/1379 + * Sat Dec 10 2016 Jonathan Underwood - 1.0-1 - Update to version 1.0 - No longer unbundle javascript libs - shipped versions in html4 client newer than packaged From 5d3e26180b7a9a36bc0cd476a98400875ecc1198 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Mon, 6 Feb 2017 11:47:48 -0700 Subject: [PATCH 067/267] Update to 1.0.2 Drop webp import patch applied upstream --- .gitignore | 1 + sources | 2 +- xpra-1.0-webp-encode-fix-import.patch | 12 ------------ xpra.spec | 12 ++++++------ 4 files changed, 8 insertions(+), 19 deletions(-) delete mode 100644 xpra-1.0-webp-encode-fix-import.patch diff --git a/.gitignore b/.gitignore index 7d85d88..7f76ea2 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /xpra-0.17.5.tar.xz /xpra-0.17.6.tar.xz /xpra-1.0.tar.xz +/xpra-1.0.2.tar.xz diff --git a/sources b/sources index 04cd3b9..bce5c7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4325abcfe95ede43209a212a13854b3c xpra-1.0.tar.xz +SHA512 (xpra-1.0.2.tar.xz) = 417d59f16422d42cf3f337b0710e48a55764cdfc56364388e7132581f2d470e533aad5eff2ee50f37f87416731ca6e6590ecb09cd6d747f873824943a845d4a4 diff --git a/xpra-1.0-webp-encode-fix-import.patch b/xpra-1.0-webp-encode-fix-import.patch deleted file mode 100644 index d57473e..0000000 --- a/xpra-1.0-webp-encode-fix-import.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up xpra-1.0/xpra/codecs/webp/encode.pyx.orig xpra-1.0/xpra/codecs/webp/encode.pyx ---- xpra-1.0/xpra/codecs/webp/encode.pyx.orig 2016-12-06 10:56:27.000000000 +0000 -+++ xpra-1.0/xpra/codecs/webp/encode.pyx 2016-12-10 11:13:14.305360914 +0000 -@@ -8,7 +8,7 @@ import os - from xpra.log import Logger - log = Logger("encoder", "webp") - --from xpra.util envbool -+from xpra.util import envbool - cdef int LOG_CONFIG = envbool("XPRA_WEBP_LOG_CONFIG", False) - cdef int USE_THREADS = envbool("XPRA_WEBP_THREADING", True) - diff --git a/xpra.spec b/xpra.spec index 0b42640..ee723f0 100644 --- a/xpra.spec +++ b/xpra.spec @@ -25,8 +25,8 @@ %global __provides_exclude_from ^%{python2_sitearch}/.*\\.so$ Name: xpra -Version: 1.0 -Release: 2%{?dist} +Version: 1.0.2 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -37,10 +37,6 @@ Source0: https://xpra.org/src/%{name}-%{version}.tar.xz # https://www.xpra.org/trac/ticket/1353 Patch0: xpra-Werror.patch -# Fix import error in xpra/codecs/webp/encode.pyx -# https://www.xpra.org/trac/ticket/1379 -Patch1: xpra-1.0-webp-encode-fix-import.patch - BuildRequires: python2-devel pygobject2-devel pygtk2-devel BuildRequires: libXtst-devel BuildRequires: libxkbfile-devel @@ -262,6 +258,10 @@ fi %{_datadir}/xpra/www %changelog +* Mon Feb 6 2017 Orion Poplawski - 1.0.2-1 +- Update to 1.0.2 +- Drop webp import patch applied upstream + * Sat Dec 10 2016 Jonathan Underwood - 1.0-2 - Disable webp by default, consistent with upstream https://www.xpra.org/trac/ticket/1379 From 3a4e6c8d5161e1a5c89a5c3b037aaf217092b68a Mon Sep 17 00:00:00 2001 From: sagitter Date: Tue, 9 May 2017 19:22:36 +0200 Subject: [PATCH 068/267] Update to 2.0.2 --- .gitignore | 1 + sources | 2 +- xpra-Werror.patch | 10 +++++----- xpra.spec | 32 +++++++++++++------------------- 4 files changed, 20 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 7f76ea2..26bf782 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /xpra-0.17.6.tar.xz /xpra-1.0.tar.xz /xpra-1.0.2.tar.xz +/xpra-2.0.2.tar.xz diff --git a/sources b/sources index bce5c7a..482e196 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-1.0.2.tar.xz) = 417d59f16422d42cf3f337b0710e48a55764cdfc56364388e7132581f2d470e533aad5eff2ee50f37f87416731ca6e6590ecb09cd6d747f873824943a845d4a4 +SHA512 (xpra-2.0.2.tar.xz) = 4b36cf9cf96f094011412214368bc452ed597f1927f6488d6856ad80b575d7f37273cf49b8682fdbc137cf581d5a88b17a9241d508278e45e48f9451ba628b68 diff --git a/xpra-Werror.patch b/xpra-Werror.patch index 19d4006..3731b8c 100644 --- a/xpra-Werror.patch +++ b/xpra-Werror.patch @@ -1,12 +1,12 @@ diff -up xpra-0.17.6/setup.py.Werror xpra-0.17.6/setup.py --- xpra-0.17.6/setup.py.Werror 2016-10-09 23:37:10.000000000 -0600 +++ xpra-0.17.6/setup.py 2016-11-08 16:12:52.322926868 -0700 -@@ -664,7 +664,7 @@ def exec_pkgconfig(*pkgs_options, **ekw) +@@ -707,7 +707,7 @@ elif get_gcc_version()>=[4, 4]: eifd = ["-Werror", #CentOS 6.x gives us some invalid warnings in nvenc, ignore those: - #"-Wno-error=uninitialized", -+ "-Wno-error=unused-but-set-variable", - #needed on Debian and Ubuntu to avoid this error: - #/usr/include/gtk-2.0/gtk/gtkitemfactory.h:47:1: error: function declaration isn't a prototype [-Werror=strict-prototypes] - #"-Wno-error=strict-prototypes", ++ "-Wno-error=uninitialized", + ] + from xpra.os_util import is_Ubuntu, is_Debian, is_Raspbian + if is_Debian() or is_Ubuntu() or is_Raspbian(): diff --git a/xpra.spec b/xpra.spec index ee723f0..2805958 100644 --- a/xpra.spec +++ b/xpra.spec @@ -17,15 +17,11 @@ %define _with_csc_swscale --without-csc_swscale %endif -%if !%{with webp} -%define _with_webp --without-webp -%endif - # Remove private provides from .so files in the python2_sitearch directory %global __provides_exclude_from ^%{python2_sitearch}/.*\\.so$ Name: xpra -Version: 1.0.2 +Version: 2.0.2 Release: 1%{?dist} Summary: Remote display server for applications and desktops @@ -48,10 +44,6 @@ BuildRequires: cups-devel BuildRequires: redhat-lsb-core BuildRequires: systemd -%if %{with webp} -BuildRequires: libwebp-devel -%endif - %if %{with enc_x264} BuildRequires: x264-devel %endif @@ -120,7 +112,6 @@ Provides: bundled(js-aurora) Provides: bundled(js-broadway) Provides: bundled(js-bencode) - %description html5 This package adds websockify support to allow xpra to listen for http connections, and also the xpra html5 client. @@ -140,13 +131,9 @@ connections, and also the xpra html5 client. CFLAGS="%{optflags}" %{__python2} setup.py build \ --verbose \ --with-vpx \ - %{?_with_webp} \ %{?_with_enc_x264} \ %{?_with_dec_avcodec2} \ %{?_with_csc_swscale} \ -%if 0%{?fedora} >= 23 - --with-csc_opencl \ -%endif --with-Xdummy \ --with-Xdummy_wrapper @@ -156,13 +143,9 @@ CFLAGS="%{optflags}" %{__python2} setup.py build \ --root %{buildroot} \ --verbose \ --with-vpx \ - %{?_with_webp} \ %{?_with_enc_x264} \ %{?_with_dec_avcodec2} \ %{?_with_csc_swscale} \ -%if 0%{?fedora} >= 23 - --with-csc_opencl \ -%endif --with-Xdummy \ --with-Xdummy_wrapper @@ -172,6 +155,10 @@ mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps mv %{buildroot}%{_datadir}/icons/xpra.png \ %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ +#Install nvenc.keys file +mkdir -p %{buildroot}%{_sysconfdir}/xpra +install -pm 644 etc/xpra/nvenc.keys %{buildroot}%{_sysconfdir}/xpra + #remove doc stuff from /usr/share rm -f \ %{buildroot}%{_datadir}/xpra/README \ @@ -211,19 +198,22 @@ getent group xpra >/dev/null || groupadd -r xpra %post +%if 0%{?fedora} < 25 /usr/bin/update-desktop-database &> /dev/null || : +%endif /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun +%if 0%{?fedora} < 25 /usr/bin/update-desktop-database &> /dev/null || : +%endif if [ $1 -eq 0 ] ; then /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi - %posttrans /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -258,6 +248,10 @@ fi %{_datadir}/xpra/www %changelog +* Tue May 09 2017 Antonio Trande - 2.0.2-1 +- Update to 2.0.2 +- webp option deprecated + * Mon Feb 6 2017 Orion Poplawski - 1.0.2-1 - Update to 1.0.2 - Drop webp import patch applied upstream From 7e5e1853f0e43988469757e040d97dfaf0094010 Mon Sep 17 00:00:00 2001 From: sagitter Date: Tue, 4 Jul 2017 17:18:49 +0200 Subject: [PATCH 069/267] Update to 2.0.3 --- .gitignore | 1 + sources | 2 +- xpra.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 26bf782..c68cecb 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /xpra-1.0.tar.xz /xpra-1.0.2.tar.xz /xpra-2.0.2.tar.xz +/xpra-2.0.3.tar.xz diff --git a/sources b/sources index 482e196..540292b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-2.0.2.tar.xz) = 4b36cf9cf96f094011412214368bc452ed597f1927f6488d6856ad80b575d7f37273cf49b8682fdbc137cf581d5a88b17a9241d508278e45e48f9451ba628b68 +SHA512 (xpra-2.0.3.tar.xz) = 25d8c5956462bd286c96a70b8f8fa8e9e75cfa27ec65438d72c0f6846b6ba7e5b61c3079ed6c663153d4abab0dddff906d6c22b40f97b77cc81728441798891e diff --git a/xpra.spec b/xpra.spec index 2805958..32a17b4 100644 --- a/xpra.spec +++ b/xpra.spec @@ -21,7 +21,7 @@ %global __provides_exclude_from ^%{python2_sitearch}/.*\\.so$ Name: xpra -Version: 2.0.2 +Version: 2.0.3 Release: 1%{?dist} Summary: Remote display server for applications and desktops @@ -128,7 +128,7 @@ connections, and also the xpra html5 client. %autosetup -p1 %build -CFLAGS="%{optflags}" %{__python2} setup.py build \ +CFLAGS="%{optflags}" %{__python2} setup.py build --executable="%{__python2} -s" \ --verbose \ --with-vpx \ %{?_with_enc_x264} \ @@ -138,7 +138,7 @@ CFLAGS="%{optflags}" %{__python2} setup.py build \ --with-Xdummy_wrapper %install -%{__python2} setup.py install \ +%{__python2} setup.py install -O1 \ --skip-build \ --root %{buildroot} \ --verbose \ @@ -248,6 +248,9 @@ fi %{_datadir}/xpra/www %changelog +* Tue Jul 04 2017 Antonio Trande - 2.0.3-1 +- Update to 2.0.3 + * Tue May 09 2017 Antonio Trande - 2.0.2-1 - Update to 2.0.2 - webp option deprecated From 3f6fb196152759b7bb3052eb55368b33394a4e82 Mon Sep 17 00:00:00 2001 From: sagitter Date: Wed, 26 Jul 2017 18:54:51 +0200 Subject: [PATCH 070/267] Update to 2.1 (bz#1475316) --- .gitignore | 1 + sources | 2 +- xpra-Werror.patch | 12 ------------ xpra.spec | 34 ++++++++++++++++++++-------------- 4 files changed, 22 insertions(+), 27 deletions(-) delete mode 100644 xpra-Werror.patch diff --git a/.gitignore b/.gitignore index c68cecb..ae3084f 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /xpra-1.0.2.tar.xz /xpra-2.0.2.tar.xz /xpra-2.0.3.tar.xz +/xpra-2.1.tar.xz diff --git a/sources b/sources index 540292b..1e1c3e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-2.0.3.tar.xz) = 25d8c5956462bd286c96a70b8f8fa8e9e75cfa27ec65438d72c0f6846b6ba7e5b61c3079ed6c663153d4abab0dddff906d6c22b40f97b77cc81728441798891e +SHA512 (xpra-2.1.tar.xz) = 3d842626e82f6dffb3b959f8a244b0e6e622fe2be6a1acea4bf5fe3bc1f6914cfb6f4aa1b8a0717f6acc5fe55f49f97ccffa9f25e64cdadce64577106db9dd93 diff --git a/xpra-Werror.patch b/xpra-Werror.patch deleted file mode 100644 index 3731b8c..0000000 --- a/xpra-Werror.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up xpra-0.17.6/setup.py.Werror xpra-0.17.6/setup.py ---- xpra-0.17.6/setup.py.Werror 2016-10-09 23:37:10.000000000 -0600 -+++ xpra-0.17.6/setup.py 2016-11-08 16:12:52.322926868 -0700 -@@ -707,7 +707,7 @@ - elif get_gcc_version()>=[4, 4]: - eifd = ["-Werror", - #CentOS 6.x gives us some invalid warnings in nvenc, ignore those: -- #"-Wno-error=uninitialized", -+ "-Wno-error=uninitialized", - ] - from xpra.os_util import is_Ubuntu, is_Debian, is_Raspbian - if is_Debian() or is_Ubuntu() or is_Raspbian(): diff --git a/xpra.spec b/xpra.spec index 32a17b4..6b4fc5e 100644 --- a/xpra.spec +++ b/xpra.spec @@ -21,7 +21,7 @@ %global __provides_exclude_from ^%{python2_sitearch}/.*\\.so$ Name: xpra -Version: 2.0.3 +Version: 2.1 Release: 1%{?dist} Summary: Remote display server for applications and desktops @@ -29,20 +29,18 @@ License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ Source0: https://xpra.org/src/%{name}-%{version}.tar.xz -# Fix build with Werror on rhel (old cython) -# https://www.xpra.org/trac/ticket/1353 -Patch0: xpra-Werror.patch - BuildRequires: python2-devel pygobject2-devel pygtk2-devel -BuildRequires: libXtst-devel +BuildRequires: libXtst-devel, uglify-js, pkgconf BuildRequires: libxkbfile-devel BuildRequires: Cython BuildRequires: desktop-file-utils BuildRequires: libvpx-devel BuildRequires: libappstream-glib +BuildRequires: libXdamage-devel BuildRequires: cups-devel BuildRequires: redhat-lsb-core -BuildRequires: systemd +%{?systemd_requires} +BuildRequires: systemd %if %{with enc_x264} BuildRequires: x264-devel @@ -125,7 +123,7 @@ connections, and also the xpra html5 client. %endif %prep -%autosetup -p1 +%autosetup %build CFLAGS="%{optflags}" %{__python2} setup.py build --executable="%{__python2} -s" \ @@ -189,8 +187,7 @@ sed -i "1 s|^#!/usr/bin/env python\b|#!%{__python}|" %{buildroot}%{cupslibdir}/b %check appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/xpra.appdata.xml -desktop-file-validate %{buildroot}%{_datadir}/applications/xpra.desktop -desktop-file-validate %{buildroot}%{_datadir}/applications/xpra_launcher.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %pre @@ -202,7 +199,10 @@ getent group xpra >/dev/null || groupadd -r xpra /usr/bin/update-desktop-database &> /dev/null || : %endif /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +%systemd_post xpra.service +%preun +%systemd_preun xpra.service %postun %if 0%{?fedora} < 25 @@ -213,6 +213,7 @@ if [ $1 -eq 0 ] ; then /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi +%systemd_postun xpra.service %posttrans /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -226,20 +227,20 @@ fi %config(noreplace) %{_sysconfdir}/xpra/conf.d/*.conf %config(noreplace) %{_sysconfdir}/sysconfig/xpra %{_bindir}/xpra -%{_bindir}/xpra_Xdummy -%{_bindir}/xpra_launcher +%{_bindir}/xpra_* +%{_prefix}/lib/sysusers.d/*.conf %{python2_sitearch}/xpra %{python2_sitearch}/*.egg-info %{_datadir}/applications/xpra*.desktop %{_datadir}/icons/hicolor/48x48/apps/xpra.png %{_mandir}/man1/xpra.1.* -%{_mandir}/man1/xpra_launcher.1.* +%{_mandir}/man1/xpra_*.1.* %{_datadir}/appdata/xpra.appdata.xml %{_datadir}/mime/packages/application-x-xpraconfig.xml %{_datadir}/xpra/icons %{cupslibdir}/backend/xpraforwarder %{_tmpfilesdir}/xpra.conf -%config %{_unitdir}/xpra.service +%{_unitdir}/xpra.service %ghost %dir %{_localstatedir}/run/xpra %doc README NEWS %license COPYING @@ -248,6 +249,11 @@ fi %{_datadir}/xpra/www %changelog +* Wed Jul 26 2017 Antonio Trande - 2.1-1 +- Update to 2.1 (bz#1475316) +- Drop old Werror patch +- Fix systemd files management + * Tue Jul 04 2017 Antonio Trande - 2.0.3-1 - Update to 2.0.3 From 09013e97cc77ba516044fd534a18adde49be159b Mon Sep 17 00:00:00 2001 From: sagitter Date: Wed, 26 Jul 2017 19:50:27 +0200 Subject: [PATCH 071/267] Fix Python2 shebang --- xpra.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xpra.spec b/xpra.spec index 6b4fc5e..acd3fa6 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,7 +22,7 @@ Name: xpra Version: 2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -182,7 +182,7 @@ find %{buildroot}%{_datadir}/xpra/www/js -name '*.js' \ mkdir -p %{buildroot}%{_localstatedir}/run/xpra/ # Remove use of /usr/bin/enx from xpraforwarder script -sed -i "1 s|^#!/usr/bin/env python\b|#!%{__python}|" %{buildroot}%{cupslibdir}/backend/xpraforwarder +sed -i "1 s|^#!/usr/bin/env python\b|#!%{__python2}|" %{buildroot}%{cupslibdir}/backend/xpraforwarder %check appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/xpra.appdata.xml @@ -249,6 +249,9 @@ fi %{_datadir}/xpra/www %changelog +* Wed Jul 26 2017 Antonio Trande - 2.1-2 +- Fix Python2 shebang + * Wed Jul 26 2017 Antonio Trande - 2.1-1 - Update to 2.1 (bz#1475316) - Drop old Werror patch From d4a912206481eddbcc432f3796adb1dece922079 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:57:38 +0000 Subject: [PATCH 072/267] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- xpra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index acd3fa6..02b94d7 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,7 +22,7 @@ Name: xpra Version: 2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -249,6 +249,9 @@ fi %{_datadir}/xpra/www %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Antonio Trande - 2.1-2 - Fix Python2 shebang From 073a05ec73a54321ecdf0be3c8b8b0b19c8a7158 Mon Sep 17 00:00:00 2001 From: sagitter Date: Sat, 19 Aug 2017 10:09:14 +0200 Subject: [PATCH 073/267] Update to 2.1.1 --- .gitignore | 1 + sources | 2 +- xpra.appdata.xml | 39 +++++++++++++++++++++++ xpra.spec | 83 +++++++++++++++++++++++++++++------------------- 4 files changed, 91 insertions(+), 34 deletions(-) create mode 100644 xpra.appdata.xml diff --git a/.gitignore b/.gitignore index ae3084f..df06cfb 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /xpra-2.0.2.tar.xz /xpra-2.0.3.tar.xz /xpra-2.1.tar.xz +/xpra-2.1.1.tar.xz diff --git a/sources b/sources index 1e1c3e6..0981b13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-2.1.tar.xz) = 3d842626e82f6dffb3b959f8a244b0e6e622fe2be6a1acea4bf5fe3bc1f6914cfb6f4aa1b8a0717f6acc5fe55f49f97ccffa9f25e64cdadce64577106db9dd93 +SHA512 (xpra-2.1.1.tar.xz) = 913c6952b12bdc01ef8cbbb62b05cfc9bd564b6d425f7edd2448bc3bfbdd9dc0bf9a890b1c85d3e39c387468b9738de7de4336e80b4e715856746197e1e93b20 diff --git a/xpra.appdata.xml b/xpra.appdata.xml new file mode 100644 index 0000000..1bef834 --- /dev/null +++ b/xpra.appdata.xml @@ -0,0 +1,39 @@ + + + + xpra.desktop + CC0-1.0 + GPL-2.0+ + Xpra + A multi-platform screen and application forwarding system + +

+ Xpra is a multi-platform persistent remote display server and client for + forwarding applications and desktop screens. +

+

+ It gives you remote access to individual applications or full desktops. + On X11, it is also known as 'screen for X11': it allows you to run programs, + usually on a remote host, direct their display to your local machine, and + then to disconnect from these programs and reconnect from the same + or another machine, without losing any state. + It can also be used to forward full desktops, from X11 servers, + MS Windows, or Mac OS X. + Xpra also allows forwarding of sound, clipboard and printing services. +

+

+ With X11 programs, Xpra can be used "rootless" or "seamless": + programs you run under it show up on your desktop as regular programs, + managed by your regular window manager. + Sessions can be accessed over SSH, or password protected over plain + TCP sockets. Xpra is usable over reasonably slow links and does its + best to adapt to changing network bandwidth constraints. +

+ + + https://sagitter.fedorapeople.org/xpra-screenshots/xpra_launcher.png + The session launcher dialog running on Fedora + + http://xpra.org/ + sagitter_at_fedoraproject.org + diff --git a/xpra.spec b/xpra.spec index 02b94d7..77bf2bd 100644 --- a/xpra.spec +++ b/xpra.spec @@ -21,26 +21,27 @@ %global __provides_exclude_from ^%{python2_sitearch}/.*\\.so$ Name: xpra -Version: 2.1 -Release: 3%{?dist} +Version: 2.1.1 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ Source0: https://xpra.org/src/%{name}-%{version}.tar.xz +# Appdata file for Fedora +Source1: %{name}.appdata.xml + BuildRequires: python2-devel pygobject2-devel pygtk2-devel BuildRequires: libXtst-devel, uglify-js, pkgconf BuildRequires: libxkbfile-devel -BuildRequires: Cython +BuildRequires: Cython, ack BuildRequires: desktop-file-utils BuildRequires: libvpx-devel BuildRequires: libappstream-glib BuildRequires: libXdamage-devel BuildRequires: cups-devel BuildRequires: redhat-lsb-core -%{?systemd_requires} -BuildRequires: systemd %if %{with enc_x264} BuildRequires: x264-devel @@ -54,8 +55,8 @@ Requires: python2-pillow Requires: python2-cups Requires: python2-pyopengl %else -Requires: python-pillow -Requires: python-cups +Requires: python2-pillow +Requires: python2-cups Requires: PyOpenGL %endif %if 0%{?fedora} >= 23 @@ -65,9 +66,10 @@ Requires: python2-rencode Suggests: python2-pyopencl %else Requires: pygobject2 -Requires: python-rencode -Requires: python-lz4 +Requires: python2-rencode +Requires: python2-lz4 %endif +Requires: python2-netifaces Requires: dbus-python Requires: dbus-x11 Requires: xorg-x11-server-utils @@ -80,10 +82,13 @@ Requires: gstreamer1-plugins-base gstreamer1-plugins-good Requires: pulseaudio pulseaudio-utils Requires: cups-filesystem Requires: shared-mime-info +Requires: js-jquery # Needed to create the xpra group Requires(pre): shadow-utils +%{?python_provide:%python_provide python2-%{name}} + %description Xpra is "screen for X": it allows you to run X programs, usually on a remote host, direct their display to your local machine, and then to disconnect from @@ -100,8 +105,8 @@ network bandwidth constraints. Summary: html5 server and client support for xpra Requires: %{name} = %{version}-%{release} # websockify is required to allow xpra to listen for an html5 client -Requires: python-websockify -Provides: bundled(js-jquery) = 3.1.1 +Requires: python2-websockify +#Provides: bundled(js-jquery) = 3.1.1 Provides: bundled(js-jquery-ui) = 1.12.1 Provides: bundled(js-lz4) Provides: bundled(js-zlib) @@ -147,11 +152,19 @@ CFLAGS="%{optflags}" %{__python2} setup.py build --executable="%{__python2} -s" --with-Xdummy \ --with-Xdummy_wrapper - #move icon to proper directory mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/64x64/apps + mv %{buildroot}%{_datadir}/icons/xpra.png \ - %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ + %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/ + +rm -f %{buildroot}%{_datadir}/icons/xpra-mdns.png +install -pm 644 xdg/xpra-mdns.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ + +#replace old file with horrible WindowsXP old image +rm -f %{buildroot}%{_datadir}/appdata/xpra.appdata.xml +install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/ #Install nvenc.keys file mkdir -p %{buildroot}%{_sysconfdir}/xpra @@ -162,9 +175,11 @@ rm -f \ %{buildroot}%{_datadir}/xpra/README \ %{buildroot}%{_datadir}/xpra/COPYING -#drop shebangs from python2_sitearch -find %{buildroot}%{python2_sitearch}/xpra -name '*.py' \ - -exec sed -i '1{\@^#!/usr/bin/env python@d}' {} \; +#fix shebangs from python2_sitearch +find %{buildroot}%{python2_sitearch}/xpra -name '*.py' | xargs sed -i '1s|^#!/usr/bin/env python|#!%{__python2}|' +for i in `ack -rl '^#!/.*python' %{buildroot}%{python2_sitearch}/xpra`; do + chmod 0755 $i +done #fix permissions on shared objects find %{buildroot}%{python2_sitearch}/xpra -name '*.so' \ @@ -174,10 +189,12 @@ find %{buildroot}%{python2_sitearch}/xpra -name '*.so' \ # guidelines find %{buildroot}%{_datadir}/xpra -name '*.swf' -exec rm {} \; -# Ensure all .js files are not executeable +# Ensure all .js files are not executable find %{buildroot}%{_datadir}/xpra/www/js -name '*.js' \ -exec chmod 0644 {} \; +ln -sf %{_datadir}/javascript/jquery/3.2.1/jquery.js %{buildroot}%{_datadir}/xpra/www/js/lib/jquery.js + # Create this directory for sharing sockets mkdir -p %{buildroot}%{_localstatedir}/run/xpra/ @@ -185,24 +202,17 @@ mkdir -p %{buildroot}%{_localstatedir}/run/xpra/ sed -i "1 s|^#!/usr/bin/env python\b|#!%{__python2}|" %{buildroot}%{cupslibdir}/backend/xpraforwarder %check -appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/xpra.appdata.xml - +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/xpra.appdata.xml desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop - %pre getent group xpra >/dev/null || groupadd -r xpra - %post %if 0%{?fedora} < 25 /usr/bin/update-desktop-database &> /dev/null || : %endif /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -%systemd_post xpra.service - -%preun -%systemd_preun xpra.service %postun %if 0%{?fedora} < 25 @@ -213,13 +223,13 @@ if [ $1 -eq 0 ] ; then /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi -%systemd_postun xpra.service %posttrans /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - %files +%doc README NEWS +%license COPYING %dir %{_sysconfdir}/xpra %dir %{_sysconfdir}/xpra/conf.d %config(noreplace) %{_sysconfdir}/xpra/*.conf @@ -229,26 +239,33 @@ fi %{_bindir}/xpra %{_bindir}/xpra_* %{_prefix}/lib/sysusers.d/*.conf -%{python2_sitearch}/xpra +%{python2_sitearch}/xpra/ %{python2_sitearch}/*.egg-info %{_datadir}/applications/xpra*.desktop -%{_datadir}/icons/hicolor/48x48/apps/xpra.png +%{_datadir}/icons/hicolor/48x48/apps/xpra-mdns.png +%{_datadir}/icons/hicolor/64x64/apps/xpra.png %{_mandir}/man1/xpra.1.* %{_mandir}/man1/xpra_*.1.* %{_datadir}/appdata/xpra.appdata.xml %{_datadir}/mime/packages/application-x-xpraconfig.xml -%{_datadir}/xpra/icons +%{_datadir}/xpra/ %{cupslibdir}/backend/xpraforwarder %{_tmpfilesdir}/xpra.conf -%{_unitdir}/xpra.service %ghost %dir %{_localstatedir}/run/xpra -%doc README NEWS -%license COPYING + +# Installation of these service files is not permitted on Fedora +# See https://pagure.io/fesco/issue/1759 +%exclude %{_unitdir}/xpra.service +%exclude %{_unitdir}/xpra.socket %files html5 %{_datadir}/xpra/www %changelog +* Fri Aug 18 2017 Antonio Trande - 2.1.1-1 +- Update to 2.1.1 +- Replace appdata file with horrible WindowsXP image + * Thu Aug 03 2017 Fedora Release Engineering - 2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 30cc0a24e7b7c55a3cef337c89086b6e9a316473 Mon Sep 17 00:00:00 2001 From: sagitter Date: Sat, 19 Aug 2017 11:50:34 +0200 Subject: [PATCH 074/267] Fix Requires --- xpra.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/xpra.spec b/xpra.spec index 77bf2bd..8649f28 100644 --- a/xpra.spec +++ b/xpra.spec @@ -22,7 +22,7 @@ Name: xpra Version: 2.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -69,7 +69,7 @@ Requires: pygobject2 Requires: python2-rencode Requires: python2-lz4 %endif -Requires: python2-netifaces +Requires: python-netifaces Requires: dbus-python Requires: dbus-x11 Requires: xorg-x11-server-utils @@ -103,9 +103,9 @@ network bandwidth constraints. %package html5 Summary: html5 server and client support for xpra -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} # websockify is required to allow xpra to listen for an html5 client -Requires: python2-websockify +Requires: python-websockify #Provides: bundled(js-jquery) = 3.1.1 Provides: bundled(js-jquery-ui) = 1.12.1 Provides: bundled(js-lz4) @@ -262,6 +262,9 @@ fi %{_datadir}/xpra/www %changelog +* Fri Aug 18 2017 Antonio Trande - 2.1.1-2 +- Fix Requires + * Fri Aug 18 2017 Antonio Trande - 2.1.1-1 - Update to 2.1.1 - Replace appdata file with horrible WindowsXP image From 803eaef146a461e186d7a74946733c045e772ac4 Mon Sep 17 00:00:00 2001 From: sagitter Date: Mon, 18 Sep 2017 15:24:57 +0200 Subject: [PATCH 075/267] Update to 2.1.2 --- .gitignore | 1 + sources | 2 +- xpra.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index df06cfb..254b74c 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /xpra-2.0.3.tar.xz /xpra-2.1.tar.xz /xpra-2.1.1.tar.xz +/xpra-2.1.2.tar.xz diff --git a/sources b/sources index 0981b13..86e7224 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-2.1.1.tar.xz) = 913c6952b12bdc01ef8cbbb62b05cfc9bd564b6d425f7edd2448bc3bfbdd9dc0bf9a890b1c85d3e39c387468b9738de7de4336e80b4e715856746197e1e93b20 +SHA512 (xpra-2.1.2.tar.xz) = 54a61ff25e19739453b5c30d7861f43c635b23677111549c38428141112be48445c267a56778159b51701c1bad15fd9ea26605807fe7cb67c9057adeb480a08a diff --git a/xpra.spec b/xpra.spec index 8649f28..513f061 100644 --- a/xpra.spec +++ b/xpra.spec @@ -21,8 +21,8 @@ %global __provides_exclude_from ^%{python2_sitearch}/.*\\.so$ Name: xpra -Version: 2.1.1 -Release: 2%{?dist} +Version: 2.1.2 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -262,6 +262,9 @@ fi %{_datadir}/xpra/www %changelog +* Mon Sep 18 2017 Antonio Trande - 2.1.2-1 +- Update to 2.1.2 + * Fri Aug 18 2017 Antonio Trande - 2.1.1-2 - Fix Requires From c7b405fc9900d30e5e6d985adb7aa52fb9abe35b Mon Sep 17 00:00:00 2001 From: sagitter Date: Thu, 26 Oct 2017 12:34:31 +0200 Subject: [PATCH 076/267] Update to 2.1.3 --- .gitignore | 1 + sources | 2 +- xpra.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 254b74c..96bfa63 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /xpra-2.1.tar.xz /xpra-2.1.1.tar.xz /xpra-2.1.2.tar.xz +/xpra-2.1.3.tar.xz diff --git a/sources b/sources index 86e7224..0f754e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-2.1.2.tar.xz) = 54a61ff25e19739453b5c30d7861f43c635b23677111549c38428141112be48445c267a56778159b51701c1bad15fd9ea26605807fe7cb67c9057adeb480a08a +SHA512 (xpra-2.1.3.tar.xz) = aa916953d34477c2c80d99a4d5733586b4122edbc18f2c9952a5d3c9581f7b8e8c55cb1ed4077989876a9a7431faa9c4f7f96f82fc007034f92cacad16429ef8 diff --git a/xpra.spec b/xpra.spec index 513f061..80bb66d 100644 --- a/xpra.spec +++ b/xpra.spec @@ -21,7 +21,7 @@ %global __provides_exclude_from ^%{python2_sitearch}/.*\\.so$ Name: xpra -Version: 2.1.2 +Version: 2.1.3 Release: 1%{?dist} Summary: Remote display server for applications and desktops @@ -262,6 +262,9 @@ fi %{_datadir}/xpra/www %changelog +* Thu Oct 26 2017 Antonio Trande - 2.1.3-1 +- Update to 2.1.3 + * Mon Sep 18 2017 Antonio Trande - 2.1.2-1 - Update to 2.1.2 From aa89e447909b3ae1b148cd1ef71491ddbef5e7e6 Mon Sep 17 00:00:00 2001 From: sagitter Date: Tue, 12 Dec 2017 18:25:06 +0100 Subject: [PATCH 077/267] Update to 2.2 --- .gitignore | 1 + sources | 2 +- xpra.spec | 115 +++++++++++++++++++++++++++-------------------------- 3 files changed, 61 insertions(+), 57 deletions(-) diff --git a/.gitignore b/.gitignore index 96bfa63..660cbc3 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /xpra-2.1.1.tar.xz /xpra-2.1.2.tar.xz /xpra-2.1.3.tar.xz +/xpra-2.2.tar.xz diff --git a/sources b/sources index 0f754e1..3710dee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-2.1.3.tar.xz) = aa916953d34477c2c80d99a4d5733586b4122edbc18f2c9952a5d3c9581f7b8e8c55cb1ed4077989876a9a7431faa9c4f7f96f82fc007034f92cacad16429ef8 +SHA512 (xpra-2.2.tar.xz) = df72444a48fa3fc8fc1b07574db1ba89a508a39c4e152b9c8fd5031a45855cd12afd4793a963a672eb70f27ed7b9050c3b2ea18dcb9937c35cebe6a613d9c625 diff --git a/xpra.spec b/xpra.spec index 80bb66d..843f797 100644 --- a/xpra.spec +++ b/xpra.spec @@ -20,8 +20,16 @@ # Remove private provides from .so files in the python2_sitearch directory %global __provides_exclude_from ^%{python2_sitearch}/.*\\.so$ +# Note: cups-config not in buildroot during srpm build, so we use the +# conditional execution to silence erros during srpm build. +%if 0%{?_cups_serverbin:1} +%global cupslibdir %_cups_serverbin +%else +%global cupslibdir %(cups-config --serverbin 2> /dev/null || echo "/usr/lib/cups") +%endif + Name: xpra -Version: 2.1.3 +Version: 2.2 Release: 1%{?dist} Summary: Remote display server for applications and desktops @@ -50,39 +58,29 @@ BuildRequires: x264-devel %BuildRequires: ffmpeg-devel %endif -%if 0%{?fedora} >= 24 -Requires: python2-pillow -Requires: python2-cups -Requires: python2-pyopengl -%else -Requires: python2-pillow -Requires: python2-cups -Requires: PyOpenGL -%endif -%if 0%{?fedora} >= 23 -Requires: python-gobject -Requires: python2-lz4 -Requires: python2-rencode -Suggests: python2-pyopencl -%else -Requires: pygobject2 -Requires: python2-rencode -Requires: python2-lz4 -%endif -Requires: python-netifaces -Requires: dbus-python -Requires: dbus-x11 -Requires: xorg-x11-server-utils -Requires: xorg-x11-drv-dummy -Requires: xorg-x11-xauth -Requires: pygtkglext -Requires: numpy -Requires: gstreamer1 -Requires: gstreamer1-plugins-base gstreamer1-plugins-good -Requires: pulseaudio pulseaudio-utils -Requires: cups-filesystem -Requires: shared-mime-info -Requires: js-jquery +Requires: python2-pillow%{?_isa} +Requires: python2-cups%{?_isa} +Requires: python2-pyopengl%{?_isa} +Requires: python2-gobject%{?_isa} +Requires: python2-lz4%{?_isa} +Requires: python2-rencode%{?_isa} +Suggests: python2-pyopencl%{?_isa} +Requires: python2-netifaces%{?_isa} +Requires: dbus-python%{?_isa} +Requires: dbus-x11%{?_isa} +Requires: xorg-x11-server-utils%{?_isa} +Requires: xorg-x11-drv-dummy%{?_isa} +Requires: xorg-x11-xauth%{?_isa} +Requires: xorg-x11-server-Xorg%{?_isa} +Requires: pygtkglext%{?_isa} +Requires: python2-numpy%{?_isa} +Requires: gstreamer1%{?_isa} +Requires: gstreamer1-plugins-base%{?_isa} +Requires: gstreamer1-plugins-good%{?_isa} +Requires: pulseaudio pulseaudio-utils%{?_isa} +Requires: cups-filesystem%{?_isa} +Requires: shared-mime-info%{?_isa} +Requires: js-jquery # Needed to create the xpra group Requires(pre): shadow-utils @@ -104,9 +102,10 @@ network bandwidth constraints. %package html5 Summary: html5 server and client support for xpra Requires: %{name}%{?_isa} = %{version}-%{release} + # websockify is required to allow xpra to listen for an html5 client -Requires: python-websockify -#Provides: bundled(js-jquery) = 3.1.1 +Requires: python2-websockify + Provides: bundled(js-jquery-ui) = 1.12.1 Provides: bundled(js-lz4) Provides: bundled(js-zlib) @@ -119,13 +118,13 @@ Provides: bundled(js-bencode) This package adds websockify support to allow xpra to listen for http connections, and also the xpra html5 client. -# Note: cups-config not in buildroot during srpm build, so we use the -# conditional execution to silence erros during srpm build. -%if 0%{?_cups_serverbin:1} -%global cupslibdir %_cups_serverbin -%else -%global cupslibdir %(cups-config --serverbin 2> /dev/null || echo "/usr/lib/cups") -%endif +%package udev +Summary: xpra udev files +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: systemd-udev%{?_isa} + +%description udev +Udev rules of xpra. %prep %autosetup @@ -138,7 +137,8 @@ CFLAGS="%{optflags}" %{__python2} setup.py build --executable="%{__python2} -s" %{?_with_dec_avcodec2} \ %{?_with_csc_swscale} \ --with-Xdummy \ - --with-Xdummy_wrapper + --with-Xdummy_wrapper \ + --with-html5_gzip --without-html5_brotli %install %{__python2} setup.py install -O1 \ @@ -150,7 +150,12 @@ CFLAGS="%{optflags}" %{__python2} setup.py build --executable="%{__python2} -s" %{?_with_dec_avcodec2} \ %{?_with_csc_swscale} \ --with-Xdummy \ - --with-Xdummy_wrapper + --with-Xdummy_wrapper \ + --with-html5_gzip --without-html5_brotli + +# Installation of these service files is not permitted on Fedora +# See https://pagure.io/fesco/issue/1759 +rm -f %{buildroot}/lib/systemd/system/xpra.service #move icon to proper directory mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps @@ -209,16 +214,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop getent group xpra >/dev/null || groupadd -r xpra %post -%if 0%{?fedora} < 25 -/usr/bin/update-desktop-database &> /dev/null || : -%endif /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun -%if 0%{?fedora} < 25 -/usr/bin/update-desktop-database &> /dev/null || : -%endif - if [ $1 -eq 0 ] ; then /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : @@ -235,6 +233,8 @@ fi %config(noreplace) %{_sysconfdir}/xpra/*.conf %config(noreplace) %{_sysconfdir}/xpra/nvenc.keys %config(noreplace) %{_sysconfdir}/xpra/conf.d/*.conf +%config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/90-xpra-virtual.conf +%config(noreplace) %{_sysconfdir}/dbus-1/system.d/xpra.conf %config(noreplace) %{_sysconfdir}/sysconfig/xpra %{_bindir}/xpra %{_bindir}/xpra_* @@ -253,15 +253,18 @@ fi %{_tmpfilesdir}/xpra.conf %ghost %dir %{_localstatedir}/run/xpra -# Installation of these service files is not permitted on Fedora -# See https://pagure.io/fesco/issue/1759 -%exclude %{_unitdir}/xpra.service -%exclude %{_unitdir}/xpra.socket +%files udev +%{_bindir}/udev_product_version +%{_udevrulesdir}/71-xpra-virtual-pointer.rules %files html5 %{_datadir}/xpra/www %changelog +* Tue Dec 12 2017 Antonio Trande - 2.2-1 +- Update to 2.2 +- Split off udev files + * Thu Oct 26 2017 Antonio Trande - 2.1.3-1 - Update to 2.1.3 From dc9c4cf1de93f45b23857f3929a666784ffcc06f Mon Sep 17 00:00:00 2001 From: sagitter Date: Wed, 13 Dec 2017 13:53:54 +0100 Subject: [PATCH 078/267] Fix dependency --- xpra.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xpra.spec b/xpra.spec index 843f797..8be9c73 100644 --- a/xpra.spec +++ b/xpra.spec @@ -30,7 +30,7 @@ Name: xpra Version: 2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -78,7 +78,7 @@ Requires: gstreamer1%{?_isa} Requires: gstreamer1-plugins-base%{?_isa} Requires: gstreamer1-plugins-good%{?_isa} Requires: pulseaudio pulseaudio-utils%{?_isa} -Requires: cups-filesystem%{?_isa} +Requires: cups-filesystem Requires: shared-mime-info%{?_isa} Requires: js-jquery @@ -261,6 +261,9 @@ fi %{_datadir}/xpra/www %changelog +* Wed Dec 13 2017 Antonio Trande - 2.2-2 +- Fix dependency + * Tue Dec 12 2017 Antonio Trande - 2.2-1 - Update to 2.2 - Split off udev files From d02bc46f595c38223ed19185f0ad93286eff7e40 Mon Sep 17 00:00:00 2001 From: sagitter Date: Thu, 21 Dec 2017 16:26:04 +0100 Subject: [PATCH 079/267] Update to 2.2.1 --- .gitignore | 1 + sources | 2 +- xpra.spec | 16 ++++++++++------ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 660cbc3..d8dd2b6 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /xpra-2.1.2.tar.xz /xpra-2.1.3.tar.xz /xpra-2.2.tar.xz +/xpra-2.2.1.tar.xz diff --git a/sources b/sources index 3710dee..09567be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-2.2.tar.xz) = df72444a48fa3fc8fc1b07574db1ba89a508a39c4e152b9c8fd5031a45855cd12afd4793a963a672eb70f27ed7b9050c3b2ea18dcb9937c35cebe6a613d9c625 +SHA512 (xpra-2.2.1.tar.xz) = fca213a72805b6b1d533f91cd5e4186bd881e083663488b697c71c79fb4a3bf312fd1491aef78cf363e429c5841d706e444c9e69c72351b1551ea7fc9395c0c6 diff --git a/xpra.spec b/xpra.spec index 8be9c73..80a69fd 100644 --- a/xpra.spec +++ b/xpra.spec @@ -29,8 +29,8 @@ %endif Name: xpra -Version: 2.2 -Release: 2%{?dist} +Version: 2.2.1 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -168,8 +168,8 @@ rm -f %{buildroot}%{_datadir}/icons/xpra-mdns.png install -pm 644 xdg/xpra-mdns.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ #replace old file with horrible WindowsXP old image -rm -f %{buildroot}%{_datadir}/appdata/xpra.appdata.xml -install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata/ +rm -f %{buildroot}%{_datadir}/metainfo/xpra.appdata.xml +install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/metainfo/ #Install nvenc.keys file mkdir -p %{buildroot}%{_sysconfdir}/xpra @@ -207,7 +207,7 @@ mkdir -p %{buildroot}%{_localstatedir}/run/xpra/ sed -i "1 s|^#!/usr/bin/env python\b|#!%{__python2}|" %{buildroot}%{cupslibdir}/backend/xpraforwarder %check -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/xpra.appdata.xml +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/xpra.appdata.xml desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %pre @@ -246,7 +246,7 @@ fi %{_datadir}/icons/hicolor/64x64/apps/xpra.png %{_mandir}/man1/xpra.1.* %{_mandir}/man1/xpra_*.1.* -%{_datadir}/appdata/xpra.appdata.xml +%{_datadir}/metainfo/xpra.appdata.xml %{_datadir}/mime/packages/application-x-xpraconfig.xml %{_datadir}/xpra/ %{cupslibdir}/backend/xpraforwarder @@ -261,6 +261,10 @@ fi %{_datadir}/xpra/www %changelog +* Thu Dec 21 2017 Antonio Trande - 2.2.1-1 +- Update to 2.2.1 +- Appdata file moved into metainfo data directory + * Wed Dec 13 2017 Antonio Trande - 2.2-2 - Fix dependency From 5a3f0134b005d4fa61765033e4fdc7f46de63b7d Mon Sep 17 00:00:00 2001 From: sagitter Date: Thu, 21 Dec 2017 16:51:17 +0100 Subject: [PATCH 080/267] Remove unused directory --- xpra.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xpra.spec b/xpra.spec index 80a69fd..4aa454d 100644 --- a/xpra.spec +++ b/xpra.spec @@ -30,7 +30,7 @@ Name: xpra Version: 2.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -168,7 +168,8 @@ rm -f %{buildroot}%{_datadir}/icons/xpra-mdns.png install -pm 644 xdg/xpra-mdns.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ #replace old file with horrible WindowsXP old image -rm -f %{buildroot}%{_datadir}/metainfo/xpra.appdata.xml +rm -rf %{buildroot}%{_datadir}/appdata +mkdir -p %{buildroot}%{_datadir}/metainfo install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/metainfo/ #Install nvenc.keys file @@ -261,6 +262,9 @@ fi %{_datadir}/xpra/www %changelog +* Thu Dec 21 2017 Antonio Trande - 2.2.1-2 +- Remove unused directory + * Thu Dec 21 2017 Antonio Trande - 2.2.1-1 - Update to 2.2.1 - Appdata file moved into metainfo data directory From 0b4e5e329942d3ffc490eb48c0c0d395dada26b2 Mon Sep 17 00:00:00 2001 From: sagitter Date: Wed, 17 Jan 2018 10:50:20 +0100 Subject: [PATCH 081/267] Update to 2.2.2 --- .gitignore | 1 + sources | 2 +- xpra.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d8dd2b6..4206266 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /xpra-2.1.3.tar.xz /xpra-2.2.tar.xz /xpra-2.2.1.tar.xz +/xpra-2.2.2.tar.xz diff --git a/sources b/sources index 09567be..a98cd16 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-2.2.1.tar.xz) = fca213a72805b6b1d533f91cd5e4186bd881e083663488b697c71c79fb4a3bf312fd1491aef78cf363e429c5841d706e444c9e69c72351b1551ea7fc9395c0c6 +SHA512 (xpra-2.2.2.tar.xz) = 5c09e29732c9ca7d03557e4e6070517b192484e67944532d5aeca53e518c8617f7d3a5919a2557050fbb9aa4123a0302a53720dd7036823db83588264dd3e6d2 diff --git a/xpra.spec b/xpra.spec index 4aa454d..1de1078 100644 --- a/xpra.spec +++ b/xpra.spec @@ -29,8 +29,8 @@ %endif Name: xpra -Version: 2.2.1 -Release: 2%{?dist} +Version: 2.2.2 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -262,6 +262,9 @@ fi %{_datadir}/xpra/www %changelog +* Wed Jan 17 2018 Antonio Trande - 2.2.2-1 +- Update to 2.2.2 + * Thu Dec 21 2017 Antonio Trande - 2.2.1-2 - Remove unused directory From bac6ec427a0dd14c33c2b6c7caaf61444e5cf3a4 Mon Sep 17 00:00:00 2001 From: sagitter Date: Wed, 17 Jan 2018 12:52:08 +0100 Subject: [PATCH 082/267] Fix python2-gobject as Requires package --- xpra.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xpra.spec b/xpra.spec index 1de1078..12d1fac 100644 --- a/xpra.spec +++ b/xpra.spec @@ -30,7 +30,7 @@ Name: xpra Version: 2.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -61,7 +61,7 @@ BuildRequires: x264-devel Requires: python2-pillow%{?_isa} Requires: python2-cups%{?_isa} Requires: python2-pyopengl%{?_isa} -Requires: python2-gobject%{?_isa} +Requires: python2-gobject Requires: python2-lz4%{?_isa} Requires: python2-rencode%{?_isa} Suggests: python2-pyopencl%{?_isa} @@ -262,6 +262,9 @@ fi %{_datadir}/xpra/www %changelog +* Wed Jan 17 2018 Antonio Trande - 2.2.2-2 +- Fix python2-gobject as Requires package + * Wed Jan 17 2018 Antonio Trande - 2.2.2-1 - Update to 2.2.2 From 05fb93095ce640a25c5c08391fd90953d74cb83f Mon Sep 17 00:00:00 2001 From: sagitter Date: Thu, 18 Jan 2018 14:03:58 +0100 Subject: [PATCH 083/267] Update to 2.2.3 --- .gitignore | 1 + sources | 2 +- xpra.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4206266..b6650f5 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /xpra-2.2.tar.xz /xpra-2.2.1.tar.xz /xpra-2.2.2.tar.xz +/xpra-2.2.3.tar.xz diff --git a/sources b/sources index a98cd16..eee5b2e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-2.2.2.tar.xz) = 5c09e29732c9ca7d03557e4e6070517b192484e67944532d5aeca53e518c8617f7d3a5919a2557050fbb9aa4123a0302a53720dd7036823db83588264dd3e6d2 +SHA512 (xpra-2.2.3.tar.xz) = 7caf61dba48c8a585267538bc4045cbe20e4dcef9a9ddae3587fb140fb9018f049ac0e0feb27917720dbbafa16e4deb76f343159ba928f4dacbefddf951b1f29 diff --git a/xpra.spec b/xpra.spec index 12d1fac..d1d36c8 100644 --- a/xpra.spec +++ b/xpra.spec @@ -29,8 +29,8 @@ %endif Name: xpra -Version: 2.2.2 -Release: 2%{?dist} +Version: 2.2.3 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -262,6 +262,9 @@ fi %{_datadir}/xpra/www %changelog +* Thu Jan 18 2018 Antonio Trande - 2.2.3-1 +- Update to 2.2.3 + * Wed Jan 17 2018 Antonio Trande - 2.2.2-2 - Fix python2-gobject as Requires package From 868631357532952212d6d764ee75715e7c3b277a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 18 Jan 2018 22:54:38 +0100 Subject: [PATCH 084/267] Remove obsolete scriptlets Signed-off-by: Igor Gnatenko --- xpra.spec | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/xpra.spec b/xpra.spec index d1d36c8..474774d 100644 --- a/xpra.spec +++ b/xpra.spec @@ -30,7 +30,7 @@ Name: xpra Version: 2.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -214,18 +214,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %pre getent group xpra >/dev/null || groupadd -r xpra -%post -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - %files %doc README NEWS %license COPYING @@ -262,6 +250,9 @@ fi %{_datadir}/xpra/www %changelog +* Thu Jan 18 2018 Igor Gnatenko - 2.2.3-2 +- Remove obsolete scriptlets + * Thu Jan 18 2018 Antonio Trande - 2.2.3-1 - Update to 2.2.3 From e674ff9f6483b202fb67f31a2ee77c643fcdfb2c Mon Sep 17 00:00:00 2001 From: sagitter Date: Thu, 25 Jan 2018 22:45:14 +0100 Subject: [PATCH 085/267] Still require python-gobject on fedora < 27 --- xpra.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/xpra.spec b/xpra.spec index 474774d..cfa8b0a 100644 --- a/xpra.spec +++ b/xpra.spec @@ -30,7 +30,7 @@ Name: xpra Version: 2.2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -39,6 +39,7 @@ Source0: https://xpra.org/src/%{name}-%{version}.tar.xz # Appdata file for Fedora Source1: %{name}.appdata.xml +%{?python_provide:%python_provide python2-%{name}} BuildRequires: python2-devel pygobject2-devel pygtk2-devel BuildRequires: libXtst-devel, uglify-js, pkgconf @@ -61,7 +62,11 @@ BuildRequires: x264-devel Requires: python2-pillow%{?_isa} Requires: python2-cups%{?_isa} Requires: python2-pyopengl%{?_isa} +%if 0%{?fedora} < 27 +Requires: python-gobject +%else Requires: python2-gobject +%endif Requires: python2-lz4%{?_isa} Requires: python2-rencode%{?_isa} Suggests: python2-pyopencl%{?_isa} @@ -85,8 +90,6 @@ Requires: js-jquery # Needed to create the xpra group Requires(pre): shadow-utils -%{?python_provide:%python_provide python2-%{name}} - %description Xpra is "screen for X": it allows you to run X programs, usually on a remote host, direct their display to your local machine, and then to disconnect from @@ -250,6 +253,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Thu Jan 25 2018 Antonio Trande - 2.2.3-3 +- Still require python-gobject on fedora < 27 + * Thu Jan 18 2018 Igor Gnatenko - 2.2.3-2 - Remove obsolete scriptlets From 82c9e21534001b7960146071501a7e232dc9cf6c Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 26 Jan 2018 22:26:33 -0500 Subject: [PATCH 086/267] rebuild for new libvpx --- xpra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index cfa8b0a..c7d4213 100644 --- a/xpra.spec +++ b/xpra.spec @@ -30,7 +30,7 @@ Name: xpra Version: 2.2.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -253,6 +253,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Fri Jan 26 2018 Tom Callaway - 2.2.3-4 +- rebuild for new libvpx + * Thu Jan 25 2018 Antonio Trande - 2.2.3-3 - Still require python-gobject on fedora < 27 From 1a3fb268710eadc4c57e1755f8aa3cee97c058d8 Mon Sep 17 00:00:00 2001 From: sagitter Date: Sun, 28 Jan 2018 15:22:54 +0100 Subject: [PATCH 087/267] Rebuild for libvpx again --- xpra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index c7d4213..c862ba6 100644 --- a/xpra.spec +++ b/xpra.spec @@ -30,7 +30,7 @@ Name: xpra Version: 2.2.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -253,6 +253,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Sun Jan 28 2018 Antonio Trande - 2.2.3-5 +- Rebuild for libvpx again + * Fri Jan 26 2018 Tom Callaway - 2.2.3-4 - rebuild for new libvpx From fe5a441a71a6b00cf15606d33cab56224e99b2c5 Mon Sep 17 00:00:00 2001 From: sagitter Date: Fri, 9 Feb 2018 22:18:19 +0100 Subject: [PATCH 088/267] Update to 2.2.4 --- .gitignore | 1 + sources | 2 +- xpra.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b6650f5..e6a6015 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ /xpra-2.2.1.tar.xz /xpra-2.2.2.tar.xz /xpra-2.2.3.tar.xz +/xpra-2.2.4.tar.xz diff --git a/sources b/sources index eee5b2e..c325863 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-2.2.3.tar.xz) = 7caf61dba48c8a585267538bc4045cbe20e4dcef9a9ddae3587fb140fb9018f049ac0e0feb27917720dbbafa16e4deb76f343159ba928f4dacbefddf951b1f29 +SHA512 (xpra-2.2.4.tar.xz) = f6fc92ad47dd6f3b0a532bb1561973acf048fbca70fe3f7d6f227d77ced92ca1af37a2e3ff406c4a029ee643da8865b077adb913e1eae9ff8da6fb95ea6e6882 diff --git a/xpra.spec b/xpra.spec index c862ba6..a07287e 100644 --- a/xpra.spec +++ b/xpra.spec @@ -29,8 +29,8 @@ %endif Name: xpra -Version: 2.2.3 -Release: 5%{?dist} +Version: 2.2.4 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -253,6 +253,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Fri Feb 09 2018 Antonio Trande - 2.2.4-1 +- Update to 2.2.4 + * Sun Jan 28 2018 Antonio Trande - 2.2.3-5 - Rebuild for libvpx again From d59aa5c0bfc7e3d8b65ecff76aad279c04c98a60 Mon Sep 17 00:00:00 2001 From: sagitter Date: Thu, 22 Feb 2018 22:18:10 +0100 Subject: [PATCH 089/267] Add gcc BR --- xpra.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xpra.spec b/xpra.spec index a07287e..252bec4 100644 --- a/xpra.spec +++ b/xpra.spec @@ -30,7 +30,7 @@ Name: xpra Version: 2.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -44,13 +44,14 @@ Source1: %{name}.appdata.xml BuildRequires: python2-devel pygobject2-devel pygtk2-devel BuildRequires: libXtst-devel, uglify-js, pkgconf BuildRequires: libxkbfile-devel -BuildRequires: Cython, ack +BuildRequires: python2-Cython, ack BuildRequires: desktop-file-utils BuildRequires: libvpx-devel BuildRequires: libappstream-glib BuildRequires: libXdamage-devel BuildRequires: cups-devel BuildRequires: redhat-lsb-core +BuildRequires: gcc %if %{with enc_x264} BuildRequires: x264-devel @@ -253,6 +254,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Thu Feb 22 2018 Antonio Trande - 2.2.4-2 +- Add gcc BR + * Fri Feb 09 2018 Antonio Trande - 2.2.4-1 - Update to 2.2.4 From a90d87bca80c1dc0e2edf85336a9b09a7e922d3c Mon Sep 17 00:00:00 2001 From: sagitter Date: Wed, 7 Mar 2018 21:00:22 +0100 Subject: [PATCH 090/267] Update to 2.2.5 --- .gitignore | 1 + sources | 2 +- xpra.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e6a6015..a0a7ff7 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /xpra-2.2.2.tar.xz /xpra-2.2.3.tar.xz /xpra-2.2.4.tar.xz +/xpra-2.2.5.tar.xz diff --git a/sources b/sources index c325863..edb73ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-2.2.4.tar.xz) = f6fc92ad47dd6f3b0a532bb1561973acf048fbca70fe3f7d6f227d77ced92ca1af37a2e3ff406c4a029ee643da8865b077adb913e1eae9ff8da6fb95ea6e6882 +SHA512 (xpra-2.2.5.tar.xz) = 84a1926e8d75eaa840faa1389127cd7ec75981c78d65e820f01f628300cf5e51b9e9569892e91c69d32aa9b64e5a4d5f05376cd8155cc29e41e6ef15092fdacf diff --git a/xpra.spec b/xpra.spec index 252bec4..5dd1698 100644 --- a/xpra.spec +++ b/xpra.spec @@ -29,8 +29,8 @@ %endif Name: xpra -Version: 2.2.4 -Release: 2%{?dist} +Version: 2.2.5 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -254,6 +254,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Wed Mar 07 2018 Antonio Trande - 2.2.5-1 +- Update to 2.2.5 + * Thu Feb 22 2018 Antonio Trande - 2.2.4-2 - Add gcc BR From ed5a14238d261e6d05c4d97cc3a4d89b29cf1305 Mon Sep 17 00:00:00 2001 From: sagitter Date: Tue, 3 Apr 2018 12:34:41 +0200 Subject: [PATCH 091/267] Update to 2.2.6 --- .gitignore | 1 + sources | 2 +- xpra.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a0a7ff7..abde5a7 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /xpra-2.2.3.tar.xz /xpra-2.2.4.tar.xz /xpra-2.2.5.tar.xz +/xpra-2.2.6.tar.xz diff --git a/sources b/sources index edb73ed..def7ce0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-2.2.5.tar.xz) = 84a1926e8d75eaa840faa1389127cd7ec75981c78d65e820f01f628300cf5e51b9e9569892e91c69d32aa9b64e5a4d5f05376cd8155cc29e41e6ef15092fdacf +SHA512 (xpra-2.2.6.tar.xz) = f47b7a8b08fc90bdf3cba91e4f7343785cdf6e24a0979f4564e9f6885b0f36c03ff5656e2d7ac5fd21895faca7b00e8839ebd66c82122a2c7cab2b40bd44e745 diff --git a/xpra.spec b/xpra.spec index 5dd1698..abf17b5 100644 --- a/xpra.spec +++ b/xpra.spec @@ -29,7 +29,7 @@ %endif Name: xpra -Version: 2.2.5 +Version: 2.2.6 Release: 1%{?dist} Summary: Remote display server for applications and desktops @@ -254,6 +254,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Tue Apr 03 2018 Antonio Trande - 2.2.6-1 +- Update to 2.2.6 + * Wed Mar 07 2018 Antonio Trande - 2.2.5-1 - Update to 2.2.5 From 160512e2ae038cb2cf29958f7d46165731dcaeac Mon Sep 17 00:00:00 2001 From: sagitter Date: Thu, 10 May 2018 21:57:36 +0200 Subject: [PATCH 092/267] Update to 2.3 --- .gitignore | 1 + sources | 2 +- xpra.spec | 68 +++++++++++++++++++++++++++++------------------------- 3 files changed, 38 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index abde5a7..4ca972b 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ /xpra-2.2.4.tar.xz /xpra-2.2.5.tar.xz /xpra-2.2.6.tar.xz +/xpra-2.3.tar.xz diff --git a/sources b/sources index def7ce0..6a09a62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-2.2.6.tar.xz) = f47b7a8b08fc90bdf3cba91e4f7343785cdf6e24a0979f4564e9f6885b0f36c03ff5656e2d7ac5fd21895faca7b00e8839ebd66c82122a2c7cab2b40bd44e745 +SHA512 (xpra-2.3.tar.xz) = 0d8077336f58359b1052e04d5b936d86d96b684166746540a0f7f0795aa22bec1769cdabfc8db46c645de56ee3df83c53ab5c2e7f9486358406aaeff7ba32b78 diff --git a/xpra.spec b/xpra.spec index abf17b5..4a85931 100644 --- a/xpra.spec +++ b/xpra.spec @@ -17,8 +17,8 @@ %define _with_csc_swscale --without-csc_swscale %endif -# Remove private provides from .so files in the python2_sitearch directory -%global __provides_exclude_from ^%{python2_sitearch}/.*\\.so$ +# Remove private provides from .so files in the python3_sitearch directory +%global __provides_exclude_from ^%{python3_sitearch}/.*\\.so$ # Note: cups-config not in buildroot during srpm build, so we use the # conditional execution to silence erros during srpm build. @@ -29,7 +29,7 @@ %endif Name: xpra -Version: 2.2.6 +Version: 2.3 Release: 1%{?dist} Summary: Remote display server for applications and desktops @@ -39,12 +39,13 @@ Source0: https://xpra.org/src/%{name}-%{version}.tar.xz # Appdata file for Fedora Source1: %{name}.appdata.xml -%{?python_provide:%python_provide python2-%{name}} +%{?python_provide:%python_provide python3-%{name}} -BuildRequires: python2-devel pygobject2-devel pygtk2-devel +BuildRequires: python3-devel pygobject3-devel pygtk2-devel +BuildRequires: gtk3-devel BuildRequires: libXtst-devel, uglify-js, pkgconf BuildRequires: libxkbfile-devel -BuildRequires: python2-Cython, ack +BuildRequires: python3-Cython, ack BuildRequires: desktop-file-utils BuildRequires: libvpx-devel BuildRequires: libappstream-glib @@ -60,26 +61,22 @@ BuildRequires: x264-devel %BuildRequires: ffmpeg-devel %endif -Requires: python2-pillow%{?_isa} -Requires: python2-cups%{?_isa} -Requires: python2-pyopengl%{?_isa} -%if 0%{?fedora} < 27 -Requires: python-gobject -%else -Requires: python2-gobject -%endif -Requires: python2-lz4%{?_isa} -Requires: python2-rencode%{?_isa} -Suggests: python2-pyopencl%{?_isa} -Requires: python2-netifaces%{?_isa} -Requires: dbus-python%{?_isa} +Requires: python3-pillow%{?_isa} +Requires: python3-cups%{?_isa} +Requires: python3-pyopengl%{?_isa} +Requires: python3-gobject +Requires: python3-lz4%{?_isa} +Requires: python3-rencode%{?_isa} +Suggests: python3-pyopencl%{?_isa} +Requires: python3-netifaces%{?_isa} +Requires: python3-dbus%{?_isa} Requires: dbus-x11%{?_isa} Requires: xorg-x11-server-utils%{?_isa} Requires: xorg-x11-drv-dummy%{?_isa} Requires: xorg-x11-xauth%{?_isa} Requires: xorg-x11-server-Xorg%{?_isa} Requires: pygtkglext%{?_isa} -Requires: python2-numpy%{?_isa} +Requires: python3-numpy%{?_isa} Requires: gstreamer1%{?_isa} Requires: gstreamer1-plugins-base%{?_isa} Requires: gstreamer1-plugins-good%{?_isa} @@ -108,7 +105,7 @@ Summary: html5 server and client support for xpra Requires: %{name}%{?_isa} = %{version}-%{release} # websockify is required to allow xpra to listen for an html5 client -Requires: python2-websockify +Requires: python3-websockify Provides: bundled(js-jquery-ui) = 1.12.1 Provides: bundled(js-lz4) @@ -134,7 +131,7 @@ Udev rules of xpra. %autosetup %build -CFLAGS="%{optflags}" %{__python2} setup.py build --executable="%{__python2} -s" \ +CFLAGS="%{optflags}" %{__python3} setup.py build --executable="%{__python3} -s" \ --verbose \ --with-vpx \ %{?_with_enc_x264} \ @@ -145,7 +142,7 @@ CFLAGS="%{optflags}" %{__python2} setup.py build --executable="%{__python2} -s" --with-html5_gzip --without-html5_brotli %install -%{__python2} setup.py install -O1 \ +%{__python3} setup.py install -O1 \ --skip-build \ --root %{buildroot} \ --verbose \ @@ -185,14 +182,14 @@ rm -f \ %{buildroot}%{_datadir}/xpra/README \ %{buildroot}%{_datadir}/xpra/COPYING -#fix shebangs from python2_sitearch -find %{buildroot}%{python2_sitearch}/xpra -name '*.py' | xargs sed -i '1s|^#!/usr/bin/env python|#!%{__python2}|' -for i in `ack -rl '^#!/.*python' %{buildroot}%{python2_sitearch}/xpra`; do +#fix shebangs from python3_sitearch +find %{buildroot}%{python3_sitearch}/xpra -name '*.py' | xargs sed -i '1s|^#!/usr/bin/env python|#!%{__python3}|' +for i in `ack -rl '^#!/.*python' %{buildroot}%{python3_sitearch}/xpra`; do chmod 0755 $i done #fix permissions on shared objects -find %{buildroot}%{python2_sitearch}/xpra -name '*.so' \ +find %{buildroot}%{python3_sitearch}/xpra -name '*.so' \ -exec chmod 0755 {} \; # delete any bundled SWFs - binary content forbidden by packaging @@ -208,8 +205,10 @@ ln -sf %{_datadir}/javascript/jquery/3.2.1/jquery.js %{buildroot}%{_datadir}/xpr # Create this directory for sharing sockets mkdir -p %{buildroot}%{_localstatedir}/run/xpra/ -# Remove use of /usr/bin/enx from xpraforwarder script -sed -i "1 s|^#!/usr/bin/env python\b|#!%{__python2}|" %{buildroot}%{cupslibdir}/backend/xpraforwarder +# Remove use of /usr/bin/enx on scripts +sed -i "1 s|^#!/usr/bin/env python\b|#!%{__python3}|" %{buildroot}%{cupslibdir}/backend/xpraforwarder +sed -i "1 s|^#!/usr/bin/env python\b|#!%{__python3}|" %{buildroot}%{_libexecdir}/xpra/auth_dialog +sed -i "1 s|^#!/usr/bin/env python\b|#!%{__python3}|" %{buildroot}%{_libexecdir}/xpra/xdg-open %check appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/xpra.appdata.xml @@ -229,11 +228,12 @@ getent group xpra >/dev/null || groupadd -r xpra %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/90-xpra-virtual.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/xpra.conf %config(noreplace) %{_sysconfdir}/sysconfig/xpra +%{_libexecdir}/xpra/ %{_bindir}/xpra %{_bindir}/xpra_* %{_prefix}/lib/sysusers.d/*.conf -%{python2_sitearch}/xpra/ -%{python2_sitearch}/*.egg-info +%{python3_sitearch}/xpra/ +%{python3_sitearch}/*.egg-info %{_datadir}/applications/xpra*.desktop %{_datadir}/icons/hicolor/48x48/apps/xpra-mdns.png %{_datadir}/icons/hicolor/64x64/apps/xpra.png @@ -247,13 +247,17 @@ getent group xpra >/dev/null || groupadd -r xpra %ghost %dir %{_localstatedir}/run/xpra %files udev -%{_bindir}/udev_product_version +%{_bindir}/xpra_udev_product_version %{_udevrulesdir}/71-xpra-virtual-pointer.rules %files html5 %{_datadir}/xpra/www %changelog +* Thu May 10 2018 Antonio Trande - 2.3-1 +- Update to 2.3 +- Switch to Python3 + * Tue Apr 03 2018 Antonio Trande - 2.2.6-1 - Update to 2.2.6 From 177961fd2542e4d268009a15c934de8a7387dd69 Mon Sep 17 00:00:00 2001 From: sagitter Date: Wed, 30 May 2018 19:15:33 +0200 Subject: [PATCH 093/267] Update to 2.3.1 --- .gitignore | 1 + sources | 2 +- xpra.appdata.xml | 3 +-- xpra.spec | 6 +++++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4ca972b..ca560c1 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ /xpra-2.2.5.tar.xz /xpra-2.2.6.tar.xz /xpra-2.3.tar.xz +/xpra-2.3.1.tar.xz diff --git a/sources b/sources index 6a09a62..f0734a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-2.3.tar.xz) = 0d8077336f58359b1052e04d5b936d86d96b684166746540a0f7f0795aa22bec1769cdabfc8db46c645de56ee3df83c53ab5c2e7f9486358406aaeff7ba32b78 +SHA512 (xpra-2.3.1.tar.xz) = 20b18cdf39216dc93debaf1d208f83e2da08d784c71d940ef89b7b480f09c198b85b28825e09e835280dd2ec0561b0261a1ee3109f596378e7b27b043e85780e diff --git a/xpra.appdata.xml b/xpra.appdata.xml index 1bef834..3530caa 100644 --- a/xpra.appdata.xml +++ b/xpra.appdata.xml @@ -1,9 +1,8 @@ - xpra.desktop CC0-1.0 - GPL-2.0+ + GPL-2.0+ and BSD and LGPL-3.0+ and MIT Xpra A multi-platform screen and application forwarding system diff --git a/xpra.spec b/xpra.spec index 4a85931..23965b5 100644 --- a/xpra.spec +++ b/xpra.spec @@ -29,7 +29,7 @@ %endif Name: xpra -Version: 2.3 +Version: 2.3.1 Release: 1%{?dist} Summary: Remote display server for applications and desktops @@ -66,6 +66,7 @@ Requires: python3-cups%{?_isa} Requires: python3-pyopengl%{?_isa} Requires: python3-gobject Requires: python3-lz4%{?_isa} +Requires: python3-ldap3 Requires: python3-rencode%{?_isa} Suggests: python3-pyopencl%{?_isa} Requires: python3-netifaces%{?_isa} @@ -254,6 +255,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Wed May 30 2018 Antonio Trande - 2.3.1-1 +- Update to 2.3.1 + * Thu May 10 2018 Antonio Trande - 2.3-1 - Update to 2.3 - Switch to Python3 From 22d2b1573dfcaa42452df8eeb0e526af00530960 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 19 Jun 2018 11:30:47 +0200 Subject: [PATCH 094/267] Rebuilt for Python 3.7 --- xpra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 23965b5..4346aa9 100644 --- a/xpra.spec +++ b/xpra.spec @@ -30,7 +30,7 @@ Name: xpra Version: 2.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -255,6 +255,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Tue Jun 19 2018 Miro Hrončok - 2.3.1-2 +- Rebuilt for Python 3.7 + * Wed May 30 2018 Antonio Trande - 2.3.1-1 - Update to 2.3.1 From fa3048c93593427dfd05e693f90ec316ca23da99 Mon Sep 17 00:00:00 2001 From: sagitter Date: Sat, 23 Jun 2018 13:02:23 +0200 Subject: [PATCH 095/267] Use --without-strict option --- xpra.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xpra.spec b/xpra.spec index 4346aa9..dd46908 100644 --- a/xpra.spec +++ b/xpra.spec @@ -140,7 +140,7 @@ CFLAGS="%{optflags}" %{__python3} setup.py build --executable="%{__python3} -s" %{?_with_csc_swscale} \ --with-Xdummy \ --with-Xdummy_wrapper \ - --with-html5_gzip --without-html5_brotli + --with-html5_gzip --without-html5_brotli --without-strict %install %{__python3} setup.py install -O1 \ @@ -153,7 +153,7 @@ CFLAGS="%{optflags}" %{__python3} setup.py build --executable="%{__python3} -s" %{?_with_csc_swscale} \ --with-Xdummy \ --with-Xdummy_wrapper \ - --with-html5_gzip --without-html5_brotli + --with-html5_gzip --without-html5_brotli --without-strict # Installation of these service files is not permitted on Fedora # See https://pagure.io/fesco/issue/1759 @@ -255,8 +255,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog -* Tue Jun 19 2018 Miro Hrončok - 2.3.1-2 +* Sat Jun 23 2018 Antonio Trande - 2.3.1-2 - Rebuilt for Python 3.7 +- Use --without-strict option * Wed May 30 2018 Antonio Trande - 2.3.1-1 - Update to 2.3.1 From bee28ccb765b95c76fb347f4566df126be56ad8f Mon Sep 17 00:00:00 2001 From: sagitter Date: Mon, 25 Jun 2018 18:26:15 +0200 Subject: [PATCH 096/267] Switch back to Python2 (see xpra.org/trac/ticket/1885) (bz#1583319) --- xpra.spec | 92 +++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 62 insertions(+), 30 deletions(-) diff --git a/xpra.spec b/xpra.spec index dd46908..1d80cc9 100644 --- a/xpra.spec +++ b/xpra.spec @@ -2,6 +2,24 @@ %bcond_with dec_avcodec2 %bcond_with csc_swscale +# xpra does not work with Python3 yet +# Probably starting from Fedora 33, Python 2 will be no longer supported +%if %{?fedora} < 33 +%global py_prefix 2 +%define pythonx_sitearch %python2_sitearch +%else +%global py_prefix 3 +%define pythonx_sitearch %python3_sitearch +%endif +# + +# For debugging only +%bcond_with debug +%if !%{without debug} +%define _with_debug --with-debug +%endif +# + # These are nececessary as the _with_foo is *not* defined if the # --with flag isn't specifed, and we need to have the --without # specified option in that case. @@ -18,7 +36,7 @@ %endif # Remove private provides from .so files in the python3_sitearch directory -%global __provides_exclude_from ^%{python3_sitearch}/.*\\.so$ +%global __provides_exclude_from ^%{pythonx_sitearch}/.*\\.so$ # Note: cups-config not in buildroot during srpm build, so we use the # conditional execution to silence erros during srpm build. @@ -30,7 +48,7 @@ Name: xpra Version: 2.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -39,13 +57,13 @@ Source0: https://xpra.org/src/%{name}-%{version}.tar.xz # Appdata file for Fedora Source1: %{name}.appdata.xml -%{?python_provide:%python_provide python3-%{name}} +%{?python_provide:%python_provide python%py_prefix-%{name}} -BuildRequires: python3-devel pygobject3-devel pygtk2-devel +BuildRequires: python%py_prefix-devel pygobject%py_prefix-devel pygtk2-devel BuildRequires: gtk3-devel BuildRequires: libXtst-devel, uglify-js, pkgconf BuildRequires: libxkbfile-devel -BuildRequires: python3-Cython, ack +BuildRequires: python%py_prefix-Cython, ack BuildRequires: desktop-file-utils BuildRequires: libvpx-devel BuildRequires: libappstream-glib @@ -53,6 +71,9 @@ BuildRequires: libXdamage-devel BuildRequires: cups-devel BuildRequires: redhat-lsb-core BuildRequires: gcc +%if %{with debug} +BuildRequires: libasan +%endif %if %{with enc_x264} BuildRequires: x264-devel @@ -61,23 +82,24 @@ BuildRequires: x264-devel %BuildRequires: ffmpeg-devel %endif -Requires: python3-pillow%{?_isa} -Requires: python3-cups%{?_isa} -Requires: python3-pyopengl%{?_isa} -Requires: python3-gobject -Requires: python3-lz4%{?_isa} -Requires: python3-ldap3 -Requires: python3-rencode%{?_isa} -Suggests: python3-pyopencl%{?_isa} -Requires: python3-netifaces%{?_isa} -Requires: python3-dbus%{?_isa} +Requires: python%py_prefix-pillow%{?_isa} +Requires: python%py_prefix-cups%{?_isa} +Requires: python%py_prefix-pyopengl%{?_isa} +Requires: python%py_prefix-gobject +Requires: python%py_prefix-lz4%{?_isa} +Requires: python%py_prefix-ldap3 +Requires: python%py_prefix-opencv%{?_isa} +Requires: python%py_prefix-rencode%{?_isa} +Suggests: python%py_prefix-pyopencl%{?_isa} +Requires: python%py_prefix-netifaces%{?_isa} +Requires: python%py_prefix-dbus%{?_isa} Requires: dbus-x11%{?_isa} Requires: xorg-x11-server-utils%{?_isa} Requires: xorg-x11-drv-dummy%{?_isa} Requires: xorg-x11-xauth%{?_isa} Requires: xorg-x11-server-Xorg%{?_isa} Requires: pygtkglext%{?_isa} -Requires: python3-numpy%{?_isa} +Requires: python%py_prefix-numpy%{?_isa} Requires: gstreamer1%{?_isa} Requires: gstreamer1-plugins-base%{?_isa} Requires: gstreamer1-plugins-good%{?_isa} @@ -106,7 +128,7 @@ Summary: html5 server and client support for xpra Requires: %{name}%{?_isa} = %{version}-%{release} # websockify is required to allow xpra to listen for an html5 client -Requires: python3-websockify +Requires: python%py_prefix-websockify Provides: bundled(js-jquery-ui) = 1.12.1 Provides: bundled(js-lz4) @@ -132,25 +154,27 @@ Udev rules of xpra. %autosetup %build -CFLAGS="%{optflags}" %{__python3} setup.py build --executable="%{__python3} -s" \ - --verbose \ +CFLAGS="%{optflags}" %{_bindir}/python%py_prefix setup.py build --executable="%{_bindir}/python%py_prefix -s" \ + --with-verbose \ --with-vpx \ %{?_with_enc_x264} \ %{?_with_dec_avcodec2} \ %{?_with_csc_swscale} \ + %{?_with_debug} \ --with-Xdummy \ --with-Xdummy_wrapper \ --with-html5_gzip --without-html5_brotli --without-strict %install -%{__python3} setup.py install -O1 \ +%{_bindir}/python%py_prefix setup.py install -O1 \ --skip-build \ --root %{buildroot} \ - --verbose \ + --with-verbose \ --with-vpx \ %{?_with_enc_x264} \ %{?_with_dec_avcodec2} \ %{?_with_csc_swscale} \ + %{?_with_debug} \ --with-Xdummy \ --with-Xdummy_wrapper \ --with-html5_gzip --without-html5_brotli --without-strict @@ -183,15 +207,19 @@ rm -f \ %{buildroot}%{_datadir}/xpra/README \ %{buildroot}%{_datadir}/xpra/COPYING -#fix shebangs from python3_sitearch -find %{buildroot}%{python3_sitearch}/xpra -name '*.py' | xargs sed -i '1s|^#!/usr/bin/env python|#!%{__python3}|' -for i in `ack -rl '^#!/.*python' %{buildroot}%{python3_sitearch}/xpra`; do +#fix shebangs from pythonx_sitearch +pushd %{buildroot}%{pythonx_sitearch}/xpra +find . -name '*.py' | xargs sed -i '1s|^#!/usr/bin/env python|#!%{_bindir}/python%py_prefix|' +for i in `ack -rl '^#!/.*python' %{buildroot}%{pythonx_sitearch}/xpra`; do chmod 0755 $i done +popd #fix permissions on shared objects -find %{buildroot}%{python3_sitearch}/xpra -name '*.so' \ +pushd %{buildroot}%{pythonx_sitearch}/xpra +find . -name '*.so' \ -exec chmod 0755 {} \; +popd # delete any bundled SWFs - binary content forbidden by packaging # guidelines @@ -207,9 +235,9 @@ ln -sf %{_datadir}/javascript/jquery/3.2.1/jquery.js %{buildroot}%{_datadir}/xpr mkdir -p %{buildroot}%{_localstatedir}/run/xpra/ # Remove use of /usr/bin/enx on scripts -sed -i "1 s|^#!/usr/bin/env python\b|#!%{__python3}|" %{buildroot}%{cupslibdir}/backend/xpraforwarder -sed -i "1 s|^#!/usr/bin/env python\b|#!%{__python3}|" %{buildroot}%{_libexecdir}/xpra/auth_dialog -sed -i "1 s|^#!/usr/bin/env python\b|#!%{__python3}|" %{buildroot}%{_libexecdir}/xpra/xdg-open +sed -i "1 s|^#!/usr/bin/env python\b|#!%{_bindir}/python%py_prefix|" %{buildroot}%{cupslibdir}/backend/xpraforwarder +sed -i "1 s|^#!/usr/bin/env python\b|#!%{_bindir}/python%py_prefix|" %{buildroot}%{_libexecdir}/xpra/auth_dialog +sed -i "1 s|^#!/usr/bin/env python\b|#!%{_bindir}/python%py_prefix|" %{buildroot}%{_libexecdir}/xpra/xdg-open %check appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/xpra.appdata.xml @@ -233,8 +261,8 @@ getent group xpra >/dev/null || groupadd -r xpra %{_bindir}/xpra %{_bindir}/xpra_* %{_prefix}/lib/sysusers.d/*.conf -%{python3_sitearch}/xpra/ -%{python3_sitearch}/*.egg-info +%{pythonx_sitearch}/xpra/ +%{pythonx_sitearch}/*.egg-info %{_datadir}/applications/xpra*.desktop %{_datadir}/icons/hicolor/48x48/apps/xpra-mdns.png %{_datadir}/icons/hicolor/64x64/apps/xpra.png @@ -255,6 +283,10 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Sun Jun 24 2018 Antonio Trande - 2.3.1-3 +- Define build conditions for debugging +- Switch back to Python2 (see xpra.org/trac/ticket/1885) (bz#1583319) + * Sat Jun 23 2018 Antonio Trande - 2.3.1-2 - Rebuilt for Python 3.7 - Use --without-strict option From 46378118de9a95410d98e02ec9f53f4ef6f60132 Mon Sep 17 00:00:00 2001 From: sagitter Date: Wed, 27 Jun 2018 12:58:50 +0200 Subject: [PATCH 097/267] Update to 2.3.2 --- .gitignore | 1 + sources | 2 +- xpra.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ca560c1..32482c7 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /xpra-2.2.6.tar.xz /xpra-2.3.tar.xz /xpra-2.3.1.tar.xz +/xpra-2.3.2.tar.xz diff --git a/sources b/sources index f0734a7..58405b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-2.3.1.tar.xz) = 20b18cdf39216dc93debaf1d208f83e2da08d784c71d940ef89b7b480f09c198b85b28825e09e835280dd2ec0561b0261a1ee3109f596378e7b27b043e85780e +SHA512 (xpra-2.3.2.tar.xz) = 18ef29ab9069ed3bd80aaeda9e8e7bb6479124e18086e47c15b8aff36751e16cf06043c13294d7b0afaea0cc6adfbcb02d6e1a35831e37988cdfbf1274fe3a85 diff --git a/xpra.spec b/xpra.spec index 1d80cc9..5559564 100644 --- a/xpra.spec +++ b/xpra.spec @@ -47,8 +47,8 @@ %endif Name: xpra -Version: 2.3.1 -Release: 3%{?dist} +Version: 2.3.2 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -283,6 +283,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Wed Jun 27 2018 Antonio Trande - 2.3.2-1 +- Update to 2.3.2 + * Sun Jun 24 2018 Antonio Trande - 2.3.1-3 - Define build conditions for debugging - Switch back to Python2 (see xpra.org/trac/ticket/1885) (bz#1583319) From c3140d6e201651ac8a93d389d9dcd516f542e7e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 2 Jul 2018 18:24:29 +0200 Subject: [PATCH 098/267] Rebuilt for Python 3.7 --- xpra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 5559564..83b8db9 100644 --- a/xpra.spec +++ b/xpra.spec @@ -48,7 +48,7 @@ Name: xpra Version: 2.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -283,6 +283,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Mon Jul 02 2018 Miro Hrončok - 2.3.2-2 +- Rebuilt for Python 3.7 + * Wed Jun 27 2018 Antonio Trande - 2.3.2-1 - Update to 2.3.2 From 34db276ff887e19a6836204adce88a0b13edcebb Mon Sep 17 00:00:00 2001 From: sagitter Date: Fri, 6 Jul 2018 12:25:59 +0200 Subject: [PATCH 099/267] SPEC file modified for EPEL7 --- xpra.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/xpra.spec b/xpra.spec index 83b8db9..a85eb30 100644 --- a/xpra.spec +++ b/xpra.spec @@ -4,7 +4,7 @@ # xpra does not work with Python3 yet # Probably starting from Fedora 33, Python 2 will be no longer supported -%if %{?fedora} < 33 +%if 0%{?fedora} < 33 || 0%{?rhel} < 8 %global py_prefix 2 %define pythonx_sitearch %python2_sitearch %else @@ -48,7 +48,7 @@ Name: xpra Version: 2.3.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -61,7 +61,12 @@ Source1: %{name}.appdata.xml BuildRequires: python%py_prefix-devel pygobject%py_prefix-devel pygtk2-devel BuildRequires: gtk3-devel -BuildRequires: libXtst-devel, uglify-js, pkgconf +BuildRequires: libXtst-devel, uglify-js +%if 0%{?fedora} +BuildRequires: pkgconf +%else +BuildRequires: pkgconfig +%endif BuildRequires: libxkbfile-devel BuildRequires: python%py_prefix-Cython, ack BuildRequires: desktop-file-utils @@ -90,7 +95,6 @@ Requires: python%py_prefix-lz4%{?_isa} Requires: python%py_prefix-ldap3 Requires: python%py_prefix-opencv%{?_isa} Requires: python%py_prefix-rencode%{?_isa} -Suggests: python%py_prefix-pyopencl%{?_isa} Requires: python%py_prefix-netifaces%{?_isa} Requires: python%py_prefix-dbus%{?_isa} Requires: dbus-x11%{?_isa} @@ -283,6 +287,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Thu Jul 05 2018 Antonio Trande - 2.3.2-3 +- SPEC file modified for EPEL7 + * Mon Jul 02 2018 Miro Hrončok - 2.3.2-2 - Rebuilt for Python 3.7 From 0b2ded6680b21639c0f7a59704f42eaa7289d2c4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:33:49 +0000 Subject: [PATCH 100/267] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index a85eb30..7d445bc 100644 --- a/xpra.spec +++ b/xpra.spec @@ -48,7 +48,7 @@ Name: xpra Version: 2.3.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -287,6 +287,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 2.3.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Jul 05 2018 Antonio Trande - 2.3.2-3 - SPEC file modified for EPEL7 From 271c3d157372ae189f1930dcd2c0b3fa39ca6785 Mon Sep 17 00:00:00 2001 From: sagitter Date: Mon, 20 Aug 2018 11:29:45 +0200 Subject: [PATCH 101/267] Update to 2.3.3 --- .gitignore | 1 + sources | 2 +- xpra.spec | 15 +++++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 32482c7..74ddb67 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /xpra-2.3.tar.xz /xpra-2.3.1.tar.xz /xpra-2.3.2.tar.xz +/xpra-2.3.3.tar.xz diff --git a/sources b/sources index 58405b7..ffdb71e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-2.3.2.tar.xz) = 18ef29ab9069ed3bd80aaeda9e8e7bb6479124e18086e47c15b8aff36751e16cf06043c13294d7b0afaea0cc6adfbcb02d6e1a35831e37988cdfbf1274fe3a85 +SHA512 (xpra-2.3.3.tar.xz) = 7fb82714e8e837c926dcd12468949018f1527dac502640e3e9b90a928debd013cbd238331c5c547cc4564480d558bc599e8e1c6435652133a16f71b07c147b97 diff --git a/xpra.spec b/xpra.spec index 7d445bc..c89f0b2 100644 --- a/xpra.spec +++ b/xpra.spec @@ -47,8 +47,8 @@ %endif Name: xpra -Version: 2.3.2 -Release: 4%{?dist} +Version: 2.3.3 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -199,8 +199,8 @@ install -pm 644 xdg/xpra-mdns.png %{buildroot}%{_datadir}/icons/hicolor/48x48/ap #replace old file with horrible WindowsXP old image rm -rf %{buildroot}%{_datadir}/appdata -mkdir -p %{buildroot}%{_datadir}/metainfo -install -pm 644 %{SOURCE1} %{buildroot}%{_datadir}/metainfo/ +mkdir -p %{buildroot}%{_metainfodir} +install -pm 644 %{SOURCE1} %{buildroot}%{_metainfodir}/ #Install nvenc.keys file mkdir -p %{buildroot}%{_sysconfdir}/xpra @@ -244,7 +244,7 @@ sed -i "1 s|^#!/usr/bin/env python\b|#!%{_bindir}/python%py_prefix|" %{buildroot sed -i "1 s|^#!/usr/bin/env python\b|#!%{_bindir}/python%py_prefix|" %{buildroot}%{_libexecdir}/xpra/xdg-open %check -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/xpra.appdata.xml +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/xpra.appdata.xml desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %pre @@ -272,7 +272,7 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/icons/hicolor/64x64/apps/xpra.png %{_mandir}/man1/xpra.1.* %{_mandir}/man1/xpra_*.1.* -%{_datadir}/metainfo/xpra.appdata.xml +%{_metainfodir}/xpra.appdata.xml %{_datadir}/mime/packages/application-x-xpraconfig.xml %{_datadir}/xpra/ %{cupslibdir}/backend/xpraforwarder @@ -287,6 +287,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Sun Aug 19 2018 Antonio Trande - 2.3.3-1 +- Update to 2.3.3 + * Sat Jul 14 2018 Fedora Release Engineering - 2.3.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From c95989d28096dfe18cf359bccced1b535ff2e93e Mon Sep 17 00:00:00 2001 From: sagitter Date: Tue, 25 Sep 2018 18:26:06 +0200 Subject: [PATCH 102/267] Update to 2.3.4 --- .gitignore | 1 + sources | 2 +- xpra.spec | 12 +++++++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 74ddb67..6a7b35a 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /xpra-2.3.1.tar.xz /xpra-2.3.2.tar.xz /xpra-2.3.3.tar.xz +/xpra-2.3.4.tar.xz diff --git a/sources b/sources index ffdb71e..ed5fcd6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-2.3.3.tar.xz) = 7fb82714e8e837c926dcd12468949018f1527dac502640e3e9b90a928debd013cbd238331c5c547cc4564480d558bc599e8e1c6435652133a16f71b07c147b97 +SHA512 (xpra-2.3.4.tar.xz) = affdaa73f85762b25e08cd351829fed118da6b55b3f6569f73cdc093c908eced2882ce06e33cdf05405c398c772c88464f4a275a3f6d788b21f2bf5e741b2ca1 diff --git a/xpra.spec b/xpra.spec index c89f0b2..e236be1 100644 --- a/xpra.spec +++ b/xpra.spec @@ -2,9 +2,9 @@ %bcond_with dec_avcodec2 %bcond_with csc_swscale -# xpra does not work with Python3 yet -# Probably starting from Fedora 33, Python 2 will be no longer supported -%if 0%{?fedora} < 33 || 0%{?rhel} < 8 +# xpra does not correctly work with Python3 yet +# Starting from Fedora 31, Python 2 will be no longer supported +%if 0%{?fedora} < 30 %global py_prefix 2 %define pythonx_sitearch %python2_sitearch %else @@ -47,10 +47,9 @@ %endif Name: xpra -Version: 2.3.3 +Version: 2.3.4 Release: 1%{?dist} Summary: Remote display server for applications and desktops - License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ Source0: https://xpra.org/src/%{name}-%{version}.tar.xz @@ -287,6 +286,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Sun Sep 23 2018 Antonio Trande - 2.3.4-1 +- Update to 2.3.4 + * Sun Aug 19 2018 Antonio Trande - 2.3.3-1 - Update to 2.3.3 From cdd56304819c58e79fcb0e7f32adeac1c9324c1a Mon Sep 17 00:00:00 2001 From: sagitter Date: Tue, 16 Oct 2018 12:19:51 +0200 Subject: [PATCH 103/267] Update to 2.4 --- .gitignore | 1 + sources | 2 +- xpra.spec | 9 ++++++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6a7b35a..66b8c23 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /xpra-2.3.2.tar.xz /xpra-2.3.3.tar.xz /xpra-2.3.4.tar.xz +/xpra-2.4.tar.xz diff --git a/sources b/sources index ed5fcd6..9fa6962 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-2.3.4.tar.xz) = affdaa73f85762b25e08cd351829fed118da6b55b3f6569f73cdc093c908eced2882ce06e33cdf05405c398c772c88464f4a275a3f6d788b21f2bf5e741b2ca1 +SHA512 (xpra-2.4.tar.xz) = e2ca44d3cc13d491153457deb1801d3cc734bf5f04012536c0af9c9f5e48f3e38954e1dd20480bfd3c8e4cb4499abd205a3fa3842a55612768374bf4e9db7d93 diff --git a/xpra.spec b/xpra.spec index e236be1..37670f3 100644 --- a/xpra.spec +++ b/xpra.spec @@ -47,7 +47,7 @@ %endif Name: xpra -Version: 2.3.4 +Version: 2.4 Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -196,6 +196,9 @@ mv %{buildroot}%{_datadir}/icons/xpra.png \ rm -f %{buildroot}%{_datadir}/icons/xpra-mdns.png install -pm 644 xdg/xpra-mdns.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ +rm -f %{buildroot}%{_datadir}/icons/xpra-shadow.png +install -pm 644 xdg/xpra-shadow.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ + #replace old file with horrible WindowsXP old image rm -rf %{buildroot}%{_datadir}/appdata mkdir -p %{buildroot}%{_metainfodir} @@ -268,6 +271,7 @@ getent group xpra >/dev/null || groupadd -r xpra %{pythonx_sitearch}/*.egg-info %{_datadir}/applications/xpra*.desktop %{_datadir}/icons/hicolor/48x48/apps/xpra-mdns.png +%{_datadir}/icons/hicolor/48x48/apps/xpra-shadow.png %{_datadir}/icons/hicolor/64x64/apps/xpra.png %{_mandir}/man1/xpra.1.* %{_mandir}/man1/xpra_*.1.* @@ -286,6 +290,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Mon Oct 15 2018 Antonio Trande - 2.4-1 +- Update to 2.4 + * Sun Sep 23 2018 Antonio Trande - 2.3.4-1 - Update to 2.3.4 From aca2b8af5afb6ef9d0099f6bfe7dc3015e48c200 Mon Sep 17 00:00:00 2001 From: sagitter Date: Wed, 31 Oct 2018 21:29:08 +0100 Subject: [PATCH 104/267] Update to 2.4.1 --- .gitignore | 1 + sources | 2 +- xpra.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 66b8c23..1a234de 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /xpra-2.3.3.tar.xz /xpra-2.3.4.tar.xz /xpra-2.4.tar.xz +/xpra-2.4.1.tar.xz diff --git a/sources b/sources index 9fa6962..104c9df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-2.4.tar.xz) = e2ca44d3cc13d491153457deb1801d3cc734bf5f04012536c0af9c9f5e48f3e38954e1dd20480bfd3c8e4cb4499abd205a3fa3842a55612768374bf4e9db7d93 +SHA512 (xpra-2.4.1.tar.xz) = c8dc76b8db55eb2e2f9eb38c21330397c813be3f33485f625c6f0d03fe840239ce25b6e6e0f2bc7ad60373571148be268ff544114b6bf60de9331269a398232b diff --git a/xpra.spec b/xpra.spec index 37670f3..e13b73c 100644 --- a/xpra.spec +++ b/xpra.spec @@ -47,7 +47,7 @@ %endif Name: xpra -Version: 2.4 +Version: 2.4.1 Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -290,6 +290,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Wed Oct 31 2018 Antonio Trande - 2.4.1-1 +- Update to 2.4.1 + * Mon Oct 15 2018 Antonio Trande - 2.4-1 - Update to 2.4 From 6ac3559b5ab9fda5f3acc29809e648c9c2962c67 Mon Sep 17 00:00:00 2001 From: sagitter Date: Wed, 31 Oct 2018 21:41:21 +0100 Subject: [PATCH 105/267] Add Python Cairo library BR --- xpra.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xpra.spec b/xpra.spec index e13b73c..9564777 100644 --- a/xpra.spec +++ b/xpra.spec @@ -68,6 +68,7 @@ BuildRequires: pkgconfig %endif BuildRequires: libxkbfile-devel BuildRequires: python%py_prefix-Cython, ack +BuildRequires: python%py_prefix-cairo-devel BuildRequires: desktop-file-utils BuildRequires: libvpx-devel BuildRequires: libappstream-glib @@ -292,6 +293,7 @@ getent group xpra >/dev/null || groupadd -r xpra %changelog * Wed Oct 31 2018 Antonio Trande - 2.4.1-1 - Update to 2.4.1 +- Add Python Cairo library BR * Mon Oct 15 2018 Antonio Trande - 2.4-1 - Update to 2.4 From a1b3e58b78a91113a7b033741a7e48576702fe5f Mon Sep 17 00:00:00 2001 From: sagitter Date: Sat, 24 Nov 2018 15:48:28 +0100 Subject: [PATCH 106/267] Release 2.4.2 --- .gitignore | 1 + sources | 2 +- xpra.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1a234de..c287212 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /xpra-2.3.4.tar.xz /xpra-2.4.tar.xz /xpra-2.4.1.tar.xz +/xpra-2.4.2.tar.xz diff --git a/sources b/sources index 104c9df..c03e03b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-2.4.1.tar.xz) = c8dc76b8db55eb2e2f9eb38c21330397c813be3f33485f625c6f0d03fe840239ce25b6e6e0f2bc7ad60373571148be268ff544114b6bf60de9331269a398232b +SHA512 (xpra-2.4.2.tar.xz) = a450691c21dbe58e7a8ac3b1ba6bb91021d9b1659180e97a18fa02f1f1af8d89b4b13cdfcadc95d922fa301416107d4b0883b0db76967ad8c464d183c60d6a24 diff --git a/xpra.spec b/xpra.spec index 9564777..4c06914 100644 --- a/xpra.spec +++ b/xpra.spec @@ -47,7 +47,7 @@ %endif Name: xpra -Version: 2.4.1 +Version: 2.4.2 Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -71,7 +71,7 @@ BuildRequires: python%py_prefix-Cython, ack BuildRequires: python%py_prefix-cairo-devel BuildRequires: desktop-file-utils BuildRequires: libvpx-devel -BuildRequires: libappstream-glib +%{?fedora:BuildRequires: libappstream-glib} BuildRequires: libXdamage-devel BuildRequires: cups-devel BuildRequires: redhat-lsb-core @@ -84,7 +84,7 @@ BuildRequires: libasan BuildRequires: x264-devel %endif %if %{with dec_avcodec2} || %{with csc_swscale} -%BuildRequires: ffmpeg-devel +BuildRequires: ffmpeg-devel %endif Requires: python%py_prefix-pillow%{?_isa} @@ -247,7 +247,7 @@ sed -i "1 s|^#!/usr/bin/env python\b|#!%{_bindir}/python%py_prefix|" %{buildroot sed -i "1 s|^#!/usr/bin/env python\b|#!%{_bindir}/python%py_prefix|" %{buildroot}%{_libexecdir}/xpra/xdg-open %check -appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/xpra.appdata.xml +%{?fedora:appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/xpra.appdata.xml} desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %pre @@ -291,6 +291,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Fri Nov 23 2018 Antonio Trande - 2.4.2-1 +- Update to 2.4.2 + * Wed Oct 31 2018 Antonio Trande - 2.4.1-1 - Update to 2.4.1 - Add Python Cairo library BR From c972dadd7e5461020883c9fcf6bf10129f3199b7 Mon Sep 17 00:00:00 2001 From: sagitter Date: Mon, 26 Nov 2018 12:19:31 +0100 Subject: [PATCH 107/267] Add inotify dependency (rhbz#1653096) --- xpra.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 4c06914..9e2dda9 100644 --- a/xpra.spec +++ b/xpra.spec @@ -48,7 +48,7 @@ Name: xpra Version: 2.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -91,6 +91,7 @@ Requires: python%py_prefix-pillow%{?_isa} Requires: python%py_prefix-cups%{?_isa} Requires: python%py_prefix-pyopengl%{?_isa} Requires: python%py_prefix-gobject +Requires: python%py_prefix-inotify Requires: python%py_prefix-lz4%{?_isa} Requires: python%py_prefix-ldap3 Requires: python%py_prefix-opencv%{?_isa} @@ -291,6 +292,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Mon Nov 26 2018 Antonio Trande - 2.4.2-2 +- Add inotify dependency (rhbz#1653096) + * Fri Nov 23 2018 Antonio Trande - 2.4.2-1 - Update to 2.4.2 From e0fecc93d1be84b193bda361804f7c64c396af77 Mon Sep 17 00:00:00 2001 From: sagitter Date: Thu, 17 Jan 2019 17:32:28 +0100 Subject: [PATCH 108/267] Update to 2.4.3 --- .gitignore | 1 + sources | 2 +- xpra.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c287212..0163eb5 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /xpra-2.4.tar.xz /xpra-2.4.1.tar.xz /xpra-2.4.2.tar.xz +/xpra-2.4.3.tar.xz diff --git a/sources b/sources index c03e03b..00b4552 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-2.4.2.tar.xz) = a450691c21dbe58e7a8ac3b1ba6bb91021d9b1659180e97a18fa02f1f1af8d89b4b13cdfcadc95d922fa301416107d4b0883b0db76967ad8c464d183c60d6a24 +SHA512 (xpra-2.4.3.tar.xz) = 5174f7852571eaeb6c2fb629aa2686e19bff7251622ff08903af188989f132b73e4509c98edfac9cddd0f582e63d0ffae94442111a7bfcef8013b3fc87dffd54 diff --git a/xpra.spec b/xpra.spec index 9e2dda9..e9f59c8 100644 --- a/xpra.spec +++ b/xpra.spec @@ -47,8 +47,8 @@ %endif Name: xpra -Version: 2.4.2 -Release: 2%{?dist} +Version: 2.4.3 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -292,6 +292,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Thu Jan 17 2019 Antonio Trande - 2.4.3-1 +- Update to 2.4.3 + * Mon Nov 26 2018 Antonio Trande - 2.4.2-2 - Add inotify dependency (rhbz#1653096) From 4f33fa50b429aaba8998456c03a42af242e96042 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:47:32 +0000 Subject: [PATCH 109/267] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index e9f59c8..51c3ea0 100644 --- a/xpra.spec +++ b/xpra.spec @@ -48,7 +48,7 @@ Name: xpra Version: 2.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -292,6 +292,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 2.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jan 17 2019 Antonio Trande - 2.4.3-1 - Update to 2.4.3 From 060ec026eaec2d6aa238691df000dd7b220a7124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 5 Feb 2019 15:05:17 +0100 Subject: [PATCH 110/267] rebuilt (libvpx) --- xpra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 51c3ea0..d1642ea 100644 --- a/xpra.spec +++ b/xpra.spec @@ -48,7 +48,7 @@ Name: xpra Version: 2.4.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -292,6 +292,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Tue Feb 05 2019 Björn Esser - 2.4.3-3 +- rebuilt (libvpx) + * Sun Feb 03 2019 Fedora Release Engineering - 2.4.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 406c0af80b4a19eabb7512f786fb8ab35d5da7b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 13 Feb 2019 01:11:00 +0100 Subject: [PATCH 111/267] https://fedoraproject.org/wiki/Changes/Python_Extension_Flags --- xpra.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index d1642ea..400bbd9 100644 --- a/xpra.spec +++ b/xpra.spec @@ -159,7 +159,8 @@ Udev rules of xpra. %autosetup %build -CFLAGS="%{optflags}" %{_bindir}/python%py_prefix setup.py build --executable="%{_bindir}/python%py_prefix -s" \ +%set_build_flags +%{_bindir}/python%py_prefix setup.py build --executable="%{_bindir}/python%py_prefix -s" \ --with-verbose \ --with-vpx \ %{?_with_enc_x264} \ From 4627313204d77835bdbf20c8d1018d2fd9d0fda0 Mon Sep 17 00:00:00 2001 From: sagitter Date: Wed, 20 Mar 2019 17:14:37 +0100 Subject: [PATCH 112/267] Release to 2.5.0 --- .gitignore | 1 + sources | 2 +- xpra.spec | 15 ++++++++++----- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 0163eb5..9087a9a 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /xpra-2.4.1.tar.xz /xpra-2.4.2.tar.xz /xpra-2.4.3.tar.xz +/xpra-2.5.tar.xz diff --git a/sources b/sources index 00b4552..e44f02b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-2.4.3.tar.xz) = 5174f7852571eaeb6c2fb629aa2686e19bff7251622ff08903af188989f132b73e4509c98edfac9cddd0f582e63d0ffae94442111a7bfcef8013b3fc87dffd54 +SHA512 (xpra-2.5.tar.xz) = 408f149b74f0a2f16a6c545a165b6e819e8a79392ae16c0d2db2a6c3e908dc82e7d9cbc125c191ca804fcc19b72b8c91a0b7534243af3421ecac4c76bcbda855 diff --git a/xpra.spec b/xpra.spec index 400bbd9..dbceceb 100644 --- a/xpra.spec +++ b/xpra.spec @@ -4,7 +4,7 @@ # xpra does not correctly work with Python3 yet # Starting from Fedora 31, Python 2 will be no longer supported -%if 0%{?fedora} < 30 +%if 0%{?fedora} < 29 %global py_prefix 2 %define pythonx_sitearch %python2_sitearch %else @@ -47,12 +47,12 @@ %endif Name: xpra -Version: 2.4.3 -Release: 3%{?dist} +Version: 2.5.0 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ -Source0: https://xpra.org/src/%{name}-%{version}.tar.xz +Source0: https://xpra.org/src/%{name}-2.5.tar.xz # Appdata file for Fedora Source1: %{name}.appdata.xml @@ -156,7 +156,7 @@ Requires: systemd-udev%{?_isa} Udev rules of xpra. %prep -%autosetup +%autosetup -n %{name}-2.5 %build %set_build_flags @@ -188,6 +188,7 @@ Udev rules of xpra. # Installation of these service files is not permitted on Fedora # See https://pagure.io/fesco/issue/1759 rm -f %{buildroot}/lib/systemd/system/xpra.service +rm -f %{buildroot}/lib/systemd/system/xpra.socket #move icon to proper directory mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps @@ -293,6 +294,10 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Wed Mar 20 2019 Antonio Trande - 2.5.0-1 +- Release to 2.5.0 +- Switch to Python3 on Fedora 29+ + * Tue Feb 05 2019 Björn Esser - 2.4.3-3 - rebuilt (libvpx) From 1a475508b287e7e7d6191a194568ac199dc119ae Mon Sep 17 00:00:00 2001 From: sagitter Date: Thu, 18 Apr 2019 18:12:07 +0200 Subject: [PATCH 113/267] Release to 2.5.1 --- .gitignore | 1 + sources | 2 +- xpra.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9087a9a..80a2f53 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /xpra-2.4.2.tar.xz /xpra-2.4.3.tar.xz /xpra-2.5.tar.xz +/xpra-2.5.1.tar.xz diff --git a/sources b/sources index e44f02b..d2d59c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-2.5.tar.xz) = 408f149b74f0a2f16a6c545a165b6e819e8a79392ae16c0d2db2a6c3e908dc82e7d9cbc125c191ca804fcc19b72b8c91a0b7534243af3421ecac4c76bcbda855 +SHA512 (xpra-2.5.1.tar.xz) = 05ea7ca1c81225db19f285ee95df8fe53240b9ddec67eb005ffae833a80f45d4ecd7a4d444dfb3cff144bc60441017d378db69b7a589d58a9a63f4e6d201bad1 diff --git a/xpra.spec b/xpra.spec index dbceceb..5d0c357 100644 --- a/xpra.spec +++ b/xpra.spec @@ -47,12 +47,12 @@ %endif Name: xpra -Version: 2.5.0 +Version: 2.5.1 Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ -Source0: https://xpra.org/src/%{name}-2.5.tar.xz +Source0: https://xpra.org/src/%{name}-%{version}.tar.xz # Appdata file for Fedora Source1: %{name}.appdata.xml @@ -294,6 +294,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Thu Apr 18 2019 Antonio Trande - 2.5.1-1 +- Release to 2.5.1 + * Wed Mar 20 2019 Antonio Trande - 2.5.0-1 - Release to 2.5.0 - Switch to Python3 on Fedora 29+ From 296a02cf6115be558b472aed7274551d101dfcbf Mon Sep 17 00:00:00 2001 From: sagitter Date: Thu, 18 Apr 2019 18:13:32 +0200 Subject: [PATCH 114/267] Fix source directory --- xpra.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 5d0c357..e5726aa 100644 --- a/xpra.spec +++ b/xpra.spec @@ -156,7 +156,7 @@ Requires: systemd-udev%{?_isa} Udev rules of xpra. %prep -%autosetup -n %{name}-2.5 +%autosetup -n %{name}-%{version} %build %set_build_flags From 7499f07b69db1a5a0bcef6073dd0f3e62af62f26 Mon Sep 17 00:00:00 2001 From: sagitter Date: Sat, 8 Jun 2019 12:04:20 +0200 Subject: [PATCH 115/267] Release to 2.5.2 --- .gitignore | 1 + sources | 2 +- xpra.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 80a2f53..ca708f5 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /xpra-2.4.3.tar.xz /xpra-2.5.tar.xz /xpra-2.5.1.tar.xz +/xpra-2.5.2.tar.xz diff --git a/sources b/sources index d2d59c5..02aa5e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-2.5.1.tar.xz) = 05ea7ca1c81225db19f285ee95df8fe53240b9ddec67eb005ffae833a80f45d4ecd7a4d444dfb3cff144bc60441017d378db69b7a589d58a9a63f4e6d201bad1 +SHA512 (xpra-2.5.2.tar.xz) = d332231defec6a94e1822d7ad9e842d50f1b231876e8fe76745b6597d68d67e981bf77c56e65945a50c31c6d9d7f249aaf2d6fca7cf2b15d2fd7ce7272a1138d diff --git a/xpra.spec b/xpra.spec index e5726aa..657ec26 100644 --- a/xpra.spec +++ b/xpra.spec @@ -47,7 +47,7 @@ %endif Name: xpra -Version: 2.5.1 +Version: 2.5.2 Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -294,6 +294,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Sat Jun 08 2019 Antonio Trande - 2.5.2-1 +- Release to 2.5.2 + * Thu Apr 18 2019 Antonio Trande - 2.5.1-1 - Release to 2.5.1 From fec68cf4b6d32060da6abfd89fb441518bd024ae Mon Sep 17 00:00:00 2001 From: sagitter Date: Thu, 25 Jul 2019 11:58:26 +0200 Subject: [PATCH 116/267] Release to 2.5.3| Switch to Python3 definitively --- .gitignore | 1 + sources | 2 +- xpra.spec | 77 +++++++++++++++++++++++++----------------------------- 3 files changed, 37 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index ca708f5..1605731 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ /xpra-2.5.tar.xz /xpra-2.5.1.tar.xz /xpra-2.5.2.tar.xz +/xpra-2.5.3.tar.xz diff --git a/sources b/sources index 02aa5e8..49ca9a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-2.5.2.tar.xz) = d332231defec6a94e1822d7ad9e842d50f1b231876e8fe76745b6597d68d67e981bf77c56e65945a50c31c6d9d7f249aaf2d6fca7cf2b15d2fd7ce7272a1138d +SHA512 (xpra-2.5.3.tar.xz) = 1079d3b80fecfa454d25cc0f616f0abf8263723c4b59ed4aa584973c5975686fd8bc02bf08f13ce035e5756dc795048581e9c3cec565a008d9127d8eb81139c1 diff --git a/xpra.spec b/xpra.spec index 657ec26..6a5c814 100644 --- a/xpra.spec +++ b/xpra.spec @@ -2,17 +2,6 @@ %bcond_with dec_avcodec2 %bcond_with csc_swscale -# xpra does not correctly work with Python3 yet -# Starting from Fedora 31, Python 2 will be no longer supported -%if 0%{?fedora} < 29 -%global py_prefix 2 -%define pythonx_sitearch %python2_sitearch -%else -%global py_prefix 3 -%define pythonx_sitearch %python3_sitearch -%endif -# - # For debugging only %bcond_with debug %if !%{without debug} @@ -36,7 +25,7 @@ %endif # Remove private provides from .so files in the python3_sitearch directory -%global __provides_exclude_from ^%{pythonx_sitearch}/.*\\.so$ +%global __provides_exclude_from ^%{python3_sitearch}/.*\\.so$ # Note: cups-config not in buildroot during srpm build, so we use the # conditional execution to silence erros during srpm build. @@ -47,7 +36,7 @@ %endif Name: xpra -Version: 2.5.2 +Version: 2.5.3 Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -56,9 +45,9 @@ Source0: https://xpra.org/src/%{name}-%{version}.tar.xz # Appdata file for Fedora Source1: %{name}.appdata.xml -%{?python_provide:%python_provide python%py_prefix-%{name}} +%{?python_provide:%python_provide python3-%{name}} -BuildRequires: python%py_prefix-devel pygobject%py_prefix-devel pygtk2-devel +BuildRequires: python3-devel pygobject3-devel pygtk2-devel BuildRequires: gtk3-devel BuildRequires: libXtst-devel, uglify-js %if 0%{?fedora} @@ -67,8 +56,8 @@ BuildRequires: pkgconf BuildRequires: pkgconfig %endif BuildRequires: libxkbfile-devel -BuildRequires: python%py_prefix-Cython, ack -BuildRequires: python%py_prefix-cairo-devel +BuildRequires: python3-Cython, ack +BuildRequires: python3-cairo-devel BuildRequires: desktop-file-utils BuildRequires: libvpx-devel %{?fedora:BuildRequires: libappstream-glib} @@ -87,24 +76,24 @@ BuildRequires: x264-devel BuildRequires: ffmpeg-devel %endif -Requires: python%py_prefix-pillow%{?_isa} -Requires: python%py_prefix-cups%{?_isa} -Requires: python%py_prefix-pyopengl%{?_isa} -Requires: python%py_prefix-gobject -Requires: python%py_prefix-inotify -Requires: python%py_prefix-lz4%{?_isa} -Requires: python%py_prefix-ldap3 -Requires: python%py_prefix-opencv%{?_isa} -Requires: python%py_prefix-rencode%{?_isa} -Requires: python%py_prefix-netifaces%{?_isa} -Requires: python%py_prefix-dbus%{?_isa} +Requires: python3-pillow%{?_isa} +Requires: python3-cups%{?_isa} +Requires: python3-pyopengl%{?_isa} +Requires: python3-gobject +Requires: python3-inotify +Requires: python3-lz4%{?_isa} +Requires: python3-ldap3 +Requires: python3-opencv%{?_isa} +Requires: python3-rencode%{?_isa} +Requires: python3-netifaces%{?_isa} +Requires: python3-dbus%{?_isa} Requires: dbus-x11%{?_isa} Requires: xorg-x11-server-utils%{?_isa} Requires: xorg-x11-drv-dummy%{?_isa} Requires: xorg-x11-xauth%{?_isa} Requires: xorg-x11-server-Xorg%{?_isa} Requires: pygtkglext%{?_isa} -Requires: python%py_prefix-numpy%{?_isa} +Requires: python3-numpy%{?_isa} Requires: gstreamer1%{?_isa} Requires: gstreamer1-plugins-base%{?_isa} Requires: gstreamer1-plugins-good%{?_isa} @@ -133,7 +122,7 @@ Summary: html5 server and client support for xpra Requires: %{name}%{?_isa} = %{version}-%{release} # websockify is required to allow xpra to listen for an html5 client -Requires: python%py_prefix-websockify +Requires: python3-websockify Provides: bundled(js-jquery-ui) = 1.12.1 Provides: bundled(js-lz4) @@ -160,7 +149,7 @@ Udev rules of xpra. %build %set_build_flags -%{_bindir}/python%py_prefix setup.py build --executable="%{_bindir}/python%py_prefix -s" \ +%{__python3} setup.py build --executable="%{__python3} -s" \ --with-verbose \ --with-vpx \ %{?_with_enc_x264} \ @@ -172,7 +161,7 @@ Udev rules of xpra. --with-html5_gzip --without-html5_brotli --without-strict %install -%{_bindir}/python%py_prefix setup.py install -O1 \ +%{__python3} setup.py install -O1 \ --skip-build \ --root %{buildroot} \ --with-verbose \ @@ -217,16 +206,16 @@ rm -f \ %{buildroot}%{_datadir}/xpra/README \ %{buildroot}%{_datadir}/xpra/COPYING -#fix shebangs from pythonx_sitearch -pushd %{buildroot}%{pythonx_sitearch}/xpra -find . -name '*.py' | xargs sed -i '1s|^#!/usr/bin/env python|#!%{_bindir}/python%py_prefix|' -for i in `ack -rl '^#!/.*python' %{buildroot}%{pythonx_sitearch}/xpra`; do +#fix shebangs from python3_sitearch +pushd %{buildroot}%{python3_sitearch}/xpra +find . -name '*.py' | xargs sed -i '1s|^#!/usr/bin/env python|#!%{__python3}|' +for i in `ack -rl '^#!/.*python' %{buildroot}%{python3_sitearch}/xpra`; do chmod 0755 $i done popd #fix permissions on shared objects -pushd %{buildroot}%{pythonx_sitearch}/xpra +pushd %{buildroot}%{python3_sitearch}/xpra find . -name '*.so' \ -exec chmod 0755 {} \; popd @@ -245,9 +234,9 @@ ln -sf %{_datadir}/javascript/jquery/3.2.1/jquery.js %{buildroot}%{_datadir}/xpr mkdir -p %{buildroot}%{_localstatedir}/run/xpra/ # Remove use of /usr/bin/enx on scripts -sed -i "1 s|^#!/usr/bin/env python\b|#!%{_bindir}/python%py_prefix|" %{buildroot}%{cupslibdir}/backend/xpraforwarder -sed -i "1 s|^#!/usr/bin/env python\b|#!%{_bindir}/python%py_prefix|" %{buildroot}%{_libexecdir}/xpra/auth_dialog -sed -i "1 s|^#!/usr/bin/env python\b|#!%{_bindir}/python%py_prefix|" %{buildroot}%{_libexecdir}/xpra/xdg-open +sed -i "1 s|^#!/usr/bin/env python\b|#!%{__python3}|" %{buildroot}%{cupslibdir}/backend/xpraforwarder +sed -i "1 s|^#!/usr/bin/env python\b|#!%{__python3}|" %{buildroot}%{_libexecdir}/xpra/auth_dialog +sed -i "1 s|^#!/usr/bin/env python\b|#!%{__python3}|" %{buildroot}%{_libexecdir}/xpra/xdg-open %check %{?fedora:appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/xpra.appdata.xml} @@ -271,8 +260,8 @@ getent group xpra >/dev/null || groupadd -r xpra %{_bindir}/xpra %{_bindir}/xpra_* %{_prefix}/lib/sysusers.d/*.conf -%{pythonx_sitearch}/xpra/ -%{pythonx_sitearch}/*.egg-info +%{python3_sitearch}/xpra/ +%{python3_sitearch}/*.egg-info %{_datadir}/applications/xpra*.desktop %{_datadir}/icons/hicolor/48x48/apps/xpra-mdns.png %{_datadir}/icons/hicolor/48x48/apps/xpra-shadow.png @@ -294,6 +283,10 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Thu Jul 25 2019 Antonio Trande - 2.5.3-1 +- Release to 2.5.3 +- Switch to Python3 definitively + * Sat Jun 08 2019 Antonio Trande - 2.5.2-1 - Release to 2.5.2 From 1ed7716d07460531e08e4f709d548c5285ada104 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 19 Aug 2019 11:09:50 +0200 Subject: [PATCH 117/267] Rebuilt for Python 3.8 --- xpra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 6a5c814..da056d2 100644 --- a/xpra.spec +++ b/xpra.spec @@ -37,7 +37,7 @@ Name: xpra Version: 2.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -283,6 +283,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Mon Aug 19 2019 Miro Hrončok - 2.5.3-2 +- Rebuilt for Python 3.8 + * Thu Jul 25 2019 Antonio Trande - 2.5.3-1 - Release to 2.5.3 - Switch to Python3 definitively From a2effeb847b872616e3ee663221d51848f5b9569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 6 Sep 2019 01:46:48 +0100 Subject: [PATCH 118/267] Remove BR: pygtk2-devel and Requires: pygtkglext (#1738465) --- xpra.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xpra.spec b/xpra.spec index da056d2..dcf87a6 100644 --- a/xpra.spec +++ b/xpra.spec @@ -37,7 +37,7 @@ Name: xpra Version: 2.5.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -47,7 +47,8 @@ Source0: https://xpra.org/src/%{name}-%{version}.tar.xz Source1: %{name}.appdata.xml %{?python_provide:%python_provide python3-%{name}} -BuildRequires: python3-devel pygobject3-devel pygtk2-devel +BuildRequires: python3-devel +BuildRequires: pygobject3-devel BuildRequires: gtk3-devel BuildRequires: libXtst-devel, uglify-js %if 0%{?fedora} @@ -92,7 +93,6 @@ Requires: xorg-x11-server-utils%{?_isa} Requires: xorg-x11-drv-dummy%{?_isa} Requires: xorg-x11-xauth%{?_isa} Requires: xorg-x11-server-Xorg%{?_isa} -Requires: pygtkglext%{?_isa} Requires: python3-numpy%{?_isa} Requires: gstreamer1%{?_isa} Requires: gstreamer1-plugins-base%{?_isa} @@ -283,6 +283,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Thu Sep 05 2019 Sérgio Basto - 2.5.3-3 +- Remove BR: pygtk2-devel and Requires: pygtkglext (#1738465) + * Mon Aug 19 2019 Miro Hrončok - 2.5.3-2 - Rebuilt for Python 3.8 From dac08bf476e709fc69ce3dd5462ef28965ab72ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Tue, 24 Sep 2019 04:22:26 +0100 Subject: [PATCH 119/267] BR: the new python3-gobject-devel instead pygobject3-devel (#1749589) --- xpra.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/xpra.spec b/xpra.spec index dcf87a6..1c73f07 100644 --- a/xpra.spec +++ b/xpra.spec @@ -37,7 +37,7 @@ Name: xpra Version: 2.5.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -48,7 +48,7 @@ Source1: %{name}.appdata.xml %{?python_provide:%python_provide python3-%{name}} BuildRequires: python3-devel -BuildRequires: pygobject3-devel +BuildRequires: python3-gobject-devel BuildRequires: gtk3-devel BuildRequires: libXtst-devel, uglify-js %if 0%{?fedora} @@ -57,7 +57,8 @@ BuildRequires: pkgconf BuildRequires: pkgconfig %endif BuildRequires: libxkbfile-devel -BuildRequires: python3-Cython, ack +BuildRequires: python3-Cython +BuildRequires: ack BuildRequires: python3-cairo-devel BuildRequires: desktop-file-utils BuildRequires: libvpx-devel @@ -283,6 +284,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Tue Sep 24 2019 Sérgio Basto - 2.5.3-4 +- BR: the new python3-gobject-devel instead pygobject3-devel (#1749589) + * Thu Sep 05 2019 Sérgio Basto - 2.5.3-3 - Remove BR: pygtk2-devel and Requires: pygtkglext (#1738465) From 3199e62768d7f8af52dc07f00d8fb3a0fde65a58 Mon Sep 17 00:00:00 2001 From: sagitter Date: Wed, 2 Oct 2019 11:55:03 +0200 Subject: [PATCH 120/267] Release 3.0 --- .gitignore | 1 + sources | 2 +- xpra.spec | 13 ++++++++++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1605731..d0779ff 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ /xpra-2.5.1.tar.xz /xpra-2.5.2.tar.xz /xpra-2.5.3.tar.xz +/xpra-3.0.tar.xz diff --git a/sources b/sources index 49ca9a9..1e50d69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-2.5.3.tar.xz) = 1079d3b80fecfa454d25cc0f616f0abf8263723c4b59ed4aa584973c5975686fd8bc02bf08f13ce035e5756dc795048581e9c3cec565a008d9127d8eb81139c1 +SHA512 (xpra-3.0.tar.xz) = b261ee119c93e80e7bbdfbd8042e625039def69f197f4214db556fd898c31d2d3beeebfa6b011c729d56a3815e09b1f7e57896fe7b86290202fc1949cd2b09a5 diff --git a/xpra.spec b/xpra.spec index 1c73f07..a421dd7 100644 --- a/xpra.spec +++ b/xpra.spec @@ -36,8 +36,8 @@ %endif Name: xpra -Version: 2.5.3 -Release: 4%{?dist} +Version: 3.0 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -48,7 +48,11 @@ Source1: %{name}.appdata.xml %{?python_provide:%python_provide python3-%{name}} BuildRequires: python3-devel +%if 0%{?fedora} > 30 BuildRequires: python3-gobject-devel +%else +BuildRequires: pygobject3-devel +%endif BuildRequires: gtk3-devel BuildRequires: libXtst-devel, uglify-js %if 0%{?fedora} @@ -284,6 +288,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Wed Oct 02 2019 Antonio Trande - 3.0-1 +- Release 3.0 + * Tue Sep 24 2019 Sérgio Basto - 2.5.3-4 - BR: the new python3-gobject-devel instead pygobject3-devel (#1749589) @@ -308,7 +315,7 @@ getent group xpra >/dev/null || groupadd -r xpra - Switch to Python3 on Fedora 29+ * Tue Feb 05 2019 Björn Esser - 2.4.3-3 -- rebuilt (libvpx) +- Rebuilt (libvpx) * Sun Feb 03 2019 Fedora Release Engineering - 2.4.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From d7664812525ea698e444011917b75679e76365b9 Mon Sep 17 00:00:00 2001 From: sagitter Date: Wed, 2 Oct 2019 12:02:06 +0200 Subject: [PATCH 121/267] Modify appdata file --- xpra.appdata.xml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/xpra.appdata.xml b/xpra.appdata.xml index 3530caa..badc8d5 100644 --- a/xpra.appdata.xml +++ b/xpra.appdata.xml @@ -29,10 +29,12 @@ best to adapt to changing network bandwidth constraints.

- - https://sagitter.fedorapeople.org/xpra-screenshots/xpra_launcher.png - The session launcher dialog running on Fedora - + ​ + + https://sagitter.fedorapeople.org/xpra-screenshots/xpra_launcher.png + The session launcher dialog running on Fedora + +​ http://xpra.org/ sagitter_at_fedoraproject.org From ebfa11cb3d76215437f0f8da22637265c42831d8 Mon Sep 17 00:00:00 2001 From: sagitter Date: Mon, 28 Oct 2019 18:24:18 +0100 Subject: [PATCH 122/267] Release 3.0.1 --- .gitignore | 1 + sources | 2 +- xpra.appdata.xml | 10 ++++------ xpra.spec | 5 ++++- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index d0779ff..db00c72 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ /xpra-2.5.2.tar.xz /xpra-2.5.3.tar.xz /xpra-3.0.tar.xz +/xpra-3.0.1.tar.xz diff --git a/sources b/sources index 1e50d69..3f908e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-3.0.tar.xz) = b261ee119c93e80e7bbdfbd8042e625039def69f197f4214db556fd898c31d2d3beeebfa6b011c729d56a3815e09b1f7e57896fe7b86290202fc1949cd2b09a5 +SHA512 (xpra-3.0.1.tar.xz) = 2fd04afe416c9b26c5404f0114c8abbe8367a6cb3e745ffaecedcbb864b1ada4575f7289807a152f6d01834e1f1fc4d6ac780335537f69ec393ef3d16928f4e2 diff --git a/xpra.appdata.xml b/xpra.appdata.xml index badc8d5..3530caa 100644 --- a/xpra.appdata.xml +++ b/xpra.appdata.xml @@ -29,12 +29,10 @@ best to adapt to changing network bandwidth constraints.

- ​ - - https://sagitter.fedorapeople.org/xpra-screenshots/xpra_launcher.png - The session launcher dialog running on Fedora - -​ + + https://sagitter.fedorapeople.org/xpra-screenshots/xpra_launcher.png + The session launcher dialog running on Fedora + http://xpra.org/ sagitter_at_fedoraproject.org diff --git a/xpra.spec b/xpra.spec index a421dd7..9f28bcb 100644 --- a/xpra.spec +++ b/xpra.spec @@ -36,7 +36,7 @@ %endif Name: xpra -Version: 3.0 +Version: 3.0.1 Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -288,6 +288,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Mon Oct 28 2019 Antonio Trande - 3.0.1-1 +- Release 3.0.1 + * Wed Oct 02 2019 Antonio Trande - 3.0-1 - Release 3.0 From e1ff874bf9b306899b926bbdc2c31040ddff1807 Mon Sep 17 00:00:00 2001 From: sagitter Date: Mon, 28 Oct 2019 18:29:37 +0100 Subject: [PATCH 123/267] Push appdata file again --- xpra.appdata.xml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/xpra.appdata.xml b/xpra.appdata.xml index 3530caa..badc8d5 100644 --- a/xpra.appdata.xml +++ b/xpra.appdata.xml @@ -29,10 +29,12 @@ best to adapt to changing network bandwidth constraints.

- - https://sagitter.fedorapeople.org/xpra-screenshots/xpra_launcher.png - The session launcher dialog running on Fedora - + ​ + + https://sagitter.fedorapeople.org/xpra-screenshots/xpra_launcher.png + The session launcher dialog running on Fedora + +​ http://xpra.org/ sagitter_at_fedoraproject.org From fae89d159c037f1f0598aa9570048fbf232aa511 Mon Sep 17 00:00:00 2001 From: sagitter Date: Fri, 1 Nov 2019 22:41:34 +0100 Subject: [PATCH 124/267] Create /run/xpra (rhbz#1381005) --- xpra.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xpra.spec b/xpra.spec index 9f28bcb..46cea16 100644 --- a/xpra.spec +++ b/xpra.spec @@ -37,7 +37,7 @@ Name: xpra Version: 3.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -236,7 +236,7 @@ find %{buildroot}%{_datadir}/xpra/www/js -name '*.js' \ ln -sf %{_datadir}/javascript/jquery/3.2.1/jquery.js %{buildroot}%{_datadir}/xpra/www/js/lib/jquery.js # Create this directory for sharing sockets -mkdir -p %{buildroot}%{_localstatedir}/run/xpra/ +mkdir -p %{buildroot}%{_rundir}/xpra # Remove use of /usr/bin/enx on scripts sed -i "1 s|^#!/usr/bin/env python\b|#!%{__python3}|" %{buildroot}%{cupslibdir}/backend/xpraforwarder @@ -278,7 +278,7 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/ %{cupslibdir}/backend/xpraforwarder %{_tmpfilesdir}/xpra.conf -%ghost %dir %{_localstatedir}/run/xpra +%dir %{_rundir}/xpra %files udev %{_bindir}/xpra_udev_product_version @@ -288,6 +288,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Fri Nov 01 2019 Antonio Trande - 3.0.1-2 +- Create /run/xpra (rhbz#1381005) + * Mon Oct 28 2019 Antonio Trande - 3.0.1-1 - Release 3.0.1 From cc83a5e5148b78bb41d89cfe8563f166600da6e5 Mon Sep 17 00:00:00 2001 From: sagitter Date: Fri, 1 Nov 2019 22:42:53 +0100 Subject: [PATCH 125/267] Add xpra.rpmlintrc --- xpra.rpmlintrc | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 xpra.rpmlintrc diff --git a/xpra.rpmlintrc b/xpra.rpmlintrc new file mode 100644 index 0000000..ca2da9b --- /dev/null +++ b/xpra.rpmlintrc @@ -0,0 +1,18 @@ +# Edited by sagitter (sagitter AT fedoraproject dot org) + +# KNOWN BUGS: +# + +# TESTS: +##### SRPMs ##### + +addFilter(r'(hardcoded-library-path) %{_prefix}/lib/sysusers.d/*.conf') + +# ERRORS: +##### RPMs ##### + +# Required by upstream +addFilter(r'(non-readable) /usr/lib/cups/backend/xpraforwarder') +addFilter(r'(non-standard-executable-perm) /usr/lib/cups/backend/xpraforwarder') + + From 3fa0249493dc893bf4de6002508de6cbd2bc4835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 2 Nov 2019 05:30:29 +0000 Subject: [PATCH 126/267] Use %{_sysusersdir} to fix rpmlint E: hardcoded-library-path --- xpra.rpmlintrc | 2 -- xpra.spec | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/xpra.rpmlintrc b/xpra.rpmlintrc index ca2da9b..838e43d 100644 --- a/xpra.rpmlintrc +++ b/xpra.rpmlintrc @@ -6,8 +6,6 @@ # TESTS: ##### SRPMs ##### -addFilter(r'(hardcoded-library-path) %{_prefix}/lib/sysusers.d/*.conf') - # ERRORS: ##### RPMs ##### diff --git a/xpra.spec b/xpra.spec index 46cea16..e799eec 100644 --- a/xpra.spec +++ b/xpra.spec @@ -37,7 +37,7 @@ Name: xpra Version: 3.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -264,7 +264,7 @@ getent group xpra >/dev/null || groupadd -r xpra %{_libexecdir}/xpra/ %{_bindir}/xpra %{_bindir}/xpra_* -%{_prefix}/lib/sysusers.d/*.conf +%{_sysusersdir}/*.conf %{python3_sitearch}/xpra/ %{python3_sitearch}/*.egg-info %{_datadir}/applications/xpra*.desktop @@ -288,6 +288,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Sat Nov 02 2019 Sérgio Basto - 3.0.1-3 +- Use %%{_sysusersdir} to fix rpmlint E: hardcoded-library-path + * Fri Nov 01 2019 Antonio Trande - 3.0.1-2 - Create /run/xpra (rhbz#1381005) From 95536d7b0751c66045078c8d54be8f6d3cbe1e3a Mon Sep 17 00:00:00 2001 From: sagitter Date: Tue, 5 Nov 2019 18:42:12 +0100 Subject: [PATCH 127/267] Release 3.0.2 --- .gitignore | 1 + sources | 2 +- xpra.rpmlintrc | 16 ---------------- xpra.spec | 7 +++++-- 4 files changed, 7 insertions(+), 19 deletions(-) delete mode 100644 xpra.rpmlintrc diff --git a/.gitignore b/.gitignore index db00c72..13bf9c8 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ /xpra-2.5.3.tar.xz /xpra-3.0.tar.xz /xpra-3.0.1.tar.xz +/xpra-3.0.2.tar.xz diff --git a/sources b/sources index 3f908e1..a547288 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-3.0.1.tar.xz) = 2fd04afe416c9b26c5404f0114c8abbe8367a6cb3e745ffaecedcbb864b1ada4575f7289807a152f6d01834e1f1fc4d6ac780335537f69ec393ef3d16928f4e2 +SHA512 (xpra-3.0.2.tar.xz) = 115f606ff5886d99a906f318cb1a7a4a86e80ebf23e4336e67938267d92ef624de577cc8fc06c6ce541b7c44a0cef58d930b5928f32e24dfc67c72127c7b623c diff --git a/xpra.rpmlintrc b/xpra.rpmlintrc deleted file mode 100644 index 838e43d..0000000 --- a/xpra.rpmlintrc +++ /dev/null @@ -1,16 +0,0 @@ -# Edited by sagitter (sagitter AT fedoraproject dot org) - -# KNOWN BUGS: -# - -# TESTS: -##### SRPMs ##### - -# ERRORS: -##### RPMs ##### - -# Required by upstream -addFilter(r'(non-readable) /usr/lib/cups/backend/xpraforwarder') -addFilter(r'(non-standard-executable-perm) /usr/lib/cups/backend/xpraforwarder') - - diff --git a/xpra.spec b/xpra.spec index e799eec..aa707e8 100644 --- a/xpra.spec +++ b/xpra.spec @@ -36,8 +36,8 @@ %endif Name: xpra -Version: 3.0.1 -Release: 3%{?dist} +Version: 3.0.2 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -288,6 +288,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Tue Nov 05 2019 Antonio Trande - 3.0.2-1 +- Release 3.0.2 + * Sat Nov 02 2019 Sérgio Basto - 3.0.1-3 - Use %%{_sysusersdir} to fix rpmlint E: hardcoded-library-path From feab1a9852b237c5c1b70732090f94d81fc8cc6c Mon Sep 17 00:00:00 2001 From: sagitter Date: Tue, 5 Nov 2019 18:43:44 +0100 Subject: [PATCH 128/267] Add xpra.rpmlintrc --- xpra.rpmlintrc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 xpra.rpmlintrc diff --git a/xpra.rpmlintrc b/xpra.rpmlintrc new file mode 100644 index 0000000..838e43d --- /dev/null +++ b/xpra.rpmlintrc @@ -0,0 +1,16 @@ +# Edited by sagitter (sagitter AT fedoraproject dot org) + +# KNOWN BUGS: +# + +# TESTS: +##### SRPMs ##### + +# ERRORS: +##### RPMs ##### + +# Required by upstream +addFilter(r'(non-readable) /usr/lib/cups/backend/xpraforwarder') +addFilter(r'(non-standard-executable-perm) /usr/lib/cups/backend/xpraforwarder') + + From 0d36cab7860656b7f96706ce3a86477c6570702f Mon Sep 17 00:00:00 2001 From: sagitter Date: Tue, 5 Nov 2019 20:13:31 +0100 Subject: [PATCH 129/267] Remove unrecognized compiler flag on ARM --- xpra.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xpra.spec b/xpra.spec index aa707e8..4b6009f 100644 --- a/xpra.spec +++ b/xpra.spec @@ -152,6 +152,11 @@ Udev rules of xpra. %prep %autosetup -n %{name}-%{version} +# cc1: error: unrecognized command line option ‘-mfpmath=387’ +%ifarch %{arm} +sed -i 's|-mfpmath=387|-mfloat-abi=hard|' setup.py +%endif + %build %set_build_flags %{__python3} setup.py build --executable="%{__python3} -s" \ From 0060178571c4d1740b93da5455d9b69da934f4d4 Mon Sep 17 00:00:00 2001 From: sagitter Date: Thu, 12 Dec 2019 19:53:23 +0100 Subject: [PATCH 130/267] Release 3.0.3 --- .gitignore | 1 + sources | 2 +- xpra.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 13bf9c8..ec73a8f 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ /xpra-3.0.tar.xz /xpra-3.0.1.tar.xz /xpra-3.0.2.tar.xz +/xpra-3.0.3.tar.xz diff --git a/sources b/sources index a547288..9d55ecd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-3.0.2.tar.xz) = 115f606ff5886d99a906f318cb1a7a4a86e80ebf23e4336e67938267d92ef624de577cc8fc06c6ce541b7c44a0cef58d930b5928f32e24dfc67c72127c7b623c +SHA512 (xpra-3.0.3.tar.xz) = 0d13a2685b22e0c90450c0dddeef0663255c6d9e15e347e960c9ac7857cd2081b15d1fdc29b816b5cfdf1f000375be34510fe25be23af3f3b63a8a25d1b31003 diff --git a/xpra.spec b/xpra.spec index 4b6009f..268dea1 100644 --- a/xpra.spec +++ b/xpra.spec @@ -36,7 +36,7 @@ %endif Name: xpra -Version: 3.0.2 +Version: 3.0.3 Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -293,6 +293,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Thu Dec 12 2019 Antonio Trande - 3.0.3-1 +- Release 3.0.3 + * Tue Nov 05 2019 Antonio Trande - 3.0.2-1 - Release 3.0.2 From 65dfea3fe3c9133cb4760e343772443d470579a1 Mon Sep 17 00:00:00 2001 From: sagitter Date: Fri, 10 Jan 2020 15:16:32 +0100 Subject: [PATCH 131/267] Release 3.0.5 --- .gitignore | 1 + sources | 2 +- xpra.spec | 14 ++++++-------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index ec73a8f..6f66c42 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ /xpra-3.0.1.tar.xz /xpra-3.0.2.tar.xz /xpra-3.0.3.tar.xz +/xpra-3.0.5.tar.xz diff --git a/sources b/sources index 9d55ecd..f6d5780 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-3.0.3.tar.xz) = 0d13a2685b22e0c90450c0dddeef0663255c6d9e15e347e960c9ac7857cd2081b15d1fdc29b816b5cfdf1f000375be34510fe25be23af3f3b63a8a25d1b31003 +SHA512 (xpra-3.0.5.tar.xz) = 3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681 diff --git a/xpra.spec b/xpra.spec index 268dea1..d02e9d3 100644 --- a/xpra.spec +++ b/xpra.spec @@ -36,7 +36,7 @@ %endif Name: xpra -Version: 3.0.3 +Version: 3.0.5 Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -158,9 +158,7 @@ sed -i 's|-mfpmath=387|-mfloat-abi=hard|' setup.py %endif %build -%set_build_flags -%{__python3} setup.py build --executable="%{__python3} -s" \ - --with-verbose \ +%py3_build -- --with-verbose \ --with-vpx \ %{?_with_enc_x264} \ %{?_with_dec_avcodec2} \ @@ -171,10 +169,7 @@ sed -i 's|-mfpmath=387|-mfloat-abi=hard|' setup.py --with-html5_gzip --without-html5_brotli --without-strict %install -%{__python3} setup.py install -O1 \ - --skip-build \ - --root %{buildroot} \ - --with-verbose \ +%py3_install -- --with-verbose \ --with-vpx \ %{?_with_enc_x264} \ %{?_with_dec_avcodec2} \ @@ -293,6 +288,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Fri Jan 10 2020 Antonio Trande - 3.0.5-1 +- Release 3.0.5 + * Thu Dec 12 2019 Antonio Trande - 3.0.3-1 - Release 3.0.3 From c0930da940c58ff4a5b3d0aada99e2cca54992fb Mon Sep 17 00:00:00 2001 From: sagitter Date: Fri, 10 Jan 2020 15:28:00 +0100 Subject: [PATCH 132/267] Re-organize build options --- xpra.spec | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/xpra.spec b/xpra.spec index d02e9d3..2603b34 100644 --- a/xpra.spec +++ b/xpra.spec @@ -158,26 +158,20 @@ sed -i 's|-mfpmath=387|-mfloat-abi=hard|' setup.py %endif %build -%py3_build -- --with-verbose \ - --with-vpx \ - %{?_with_enc_x264} \ - %{?_with_dec_avcodec2} \ - %{?_with_csc_swscale} \ - %{?_with_debug} \ - --with-Xdummy \ - --with-Xdummy_wrapper \ - --with-html5_gzip --without-html5_brotli --without-strict +%py3_build -- --with-verbose --with-vpx \ + %{?_with_enc_x264} \ + %{?_with_dec_avcodec2} \ + %{?_with_csc_swscale} \ + %{?_with_debug} \ + --with-Xdummy --with-Xdummy_wrapper --with-html5_gzip --without-html5_brotli --without-strict %install -%py3_install -- --with-verbose \ - --with-vpx \ - %{?_with_enc_x264} \ - %{?_with_dec_avcodec2} \ - %{?_with_csc_swscale} \ - %{?_with_debug} \ - --with-Xdummy \ - --with-Xdummy_wrapper \ - --with-html5_gzip --without-html5_brotli --without-strict +%py3_install -- --with-verbose --with-vpx \ + %{?_with_enc_x264} \ + %{?_with_dec_avcodec2} \ + %{?_with_csc_swscale} \ + %{?_with_debug} \ + --with-Xdummy --with-Xdummy_wrapper --with-html5_gzip --without-html5_brotli --without-strict # Installation of these service files is not permitted on Fedora # See https://pagure.io/fesco/issue/1759 From 984010977a8ab923b84da16d362f101e0fd8ff4f Mon Sep 17 00:00:00 2001 From: sagitter Date: Fri, 10 Jan 2020 17:16:38 +0100 Subject: [PATCH 133/267] Modify macros --- xpra.spec | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/xpra.spec b/xpra.spec index 2603b34..3c74771 100644 --- a/xpra.spec +++ b/xpra.spec @@ -5,7 +5,7 @@ # For debugging only %bcond_with debug %if !%{without debug} -%define _with_debug --with-debug +%global _with_debug --with-debug %endif # @@ -13,15 +13,15 @@ # --with flag isn't specifed, and we need to have the --without # specified option in that case. %if !%{with enc_x264} -%define _with_enc_x264 --without-enc_x264 +%global with_enc_x264 --without-enc_x264 %endif %if !%{with dec_avcodec2} -%define _with_dec_avcodec2 --without-dec_avcodec2 +%global with_dec_avcodec2 --without-dec_avcodec2 %endif %if !%{with csc_swscale} -%define _with_csc_swscale --without-csc_swscale +%global with_csc_swscale --without-csc_swscale %endif # Remove private provides from .so files in the python3_sitearch directory @@ -159,20 +159,21 @@ sed -i 's|-mfpmath=387|-mfloat-abi=hard|' setup.py %build %py3_build -- --with-verbose --with-vpx \ - %{?_with_enc_x264} \ - %{?_with_dec_avcodec2} \ - %{?_with_csc_swscale} \ - %{?_with_debug} \ + %{with_enc_x264} \ + %{with_dec_avcodec2} \ + %{with_csc_swscale} \ + %{with_debug} \ --with-Xdummy --with-Xdummy_wrapper --with-html5_gzip --without-html5_brotli --without-strict %install %py3_install -- --with-verbose --with-vpx \ - %{?_with_enc_x264} \ - %{?_with_dec_avcodec2} \ - %{?_with_csc_swscale} \ - %{?_with_debug} \ + %{with_enc_x264} \ + %{with_dec_avcodec2} \ + %{with_csc_swscale} \ + %{with_debug} \ --with-Xdummy --with-Xdummy_wrapper --with-html5_gzip --without-html5_brotli --without-strict + # Installation of these service files is not permitted on Fedora # See https://pagure.io/fesco/issue/1759 rm -f %{buildroot}/lib/systemd/system/xpra.service From 15ed227345ee1be48c3c8cc9b7e5638a82326457 Mon Sep 17 00:00:00 2001 From: sagitter Date: Fri, 10 Jan 2020 17:42:46 +0100 Subject: [PATCH 134/267] Use %%global --- xpra.spec | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/xpra.spec b/xpra.spec index 3c74771..ded5e40 100644 --- a/xpra.spec +++ b/xpra.spec @@ -13,15 +13,15 @@ # --with flag isn't specifed, and we need to have the --without # specified option in that case. %if !%{with enc_x264} -%global with_enc_x264 --without-enc_x264 +%global _with_enc_x264 --without-enc_x264 %endif %if !%{with dec_avcodec2} -%global with_dec_avcodec2 --without-dec_avcodec2 +%global _with_dec_avcodec2 --without-dec_avcodec2 %endif %if !%{with csc_swscale} -%global with_csc_swscale --without-csc_swscale +%global _with_csc_swscale --without-csc_swscale %endif # Remove private provides from .so files in the python3_sitearch directory @@ -158,20 +158,31 @@ sed -i 's|-mfpmath=387|-mfloat-abi=hard|' setup.py %endif %build -%py3_build -- --with-verbose --with-vpx \ - %{with_enc_x264} \ - %{with_dec_avcodec2} \ - %{with_csc_swscale} \ - %{with_debug} \ - --with-Xdummy --with-Xdummy_wrapper --with-html5_gzip --without-html5_brotli --without-strict +%set_build_flags +%{__python3} setup.py build --executable="%{__python3} -s" \ + --with-verbose \ + --with-vpx \ + %{?_with_enc_x264} \ + %{?_with_dec_avcodec2} \ + %{?_with_csc_swscale} \ + %{?_with_debug} \ + --with-Xdummy \ + --with-Xdummy_wrapper \ + --with-html5_gzip --without-html5_brotli --without-strict %install -%py3_install -- --with-verbose --with-vpx \ - %{with_enc_x264} \ - %{with_dec_avcodec2} \ - %{with_csc_swscale} \ - %{with_debug} \ - --with-Xdummy --with-Xdummy_wrapper --with-html5_gzip --without-html5_brotli --without-strict +%{__python3} setup.py install -O1 \ + --skip-build \ + --root %{buildroot} \ + --with-verbose \ + --with-vpx \ + %{?_with_enc_x264} \ + %{?_with_dec_avcodec2} \ + %{?_with_csc_swscale} \ + %{?_with_debug} \ + --with-Xdummy \ + --with-Xdummy_wrapper \ + --with-html5_gzip --without-html5_brotli --without-strict # Installation of these service files is not permitted on Fedora From 5ab3ee284e446bc8d77538c1815cace57481e14b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:52:47 +0000 Subject: [PATCH 135/267] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index ded5e40..251364f 100644 --- a/xpra.spec +++ b/xpra.spec @@ -37,7 +37,7 @@ Name: xpra Version: 3.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -294,6 +294,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 3.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jan 10 2020 Antonio Trande - 3.0.5-1 - Release 3.0.5 From e6ba437c5c427ed09c1be5cd8d3042d5e530b6e5 Mon Sep 17 00:00:00 2001 From: sagitter Date: Sat, 8 Feb 2020 19:01:43 +0100 Subject: [PATCH 136/267] Release 3.0.6 --- .gitignore | 1 + sources | 2 +- xpra.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6f66c42..fcb02e2 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ /xpra-3.0.2.tar.xz /xpra-3.0.3.tar.xz /xpra-3.0.5.tar.xz +/xpra-3.0.6.tar.xz diff --git a/sources b/sources index f6d5780..81b0cde 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-3.0.5.tar.xz) = 3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681 +SHA512 (xpra-3.0.6.tar.xz) = e3bd7a3e32e3f974494b10cc3607a6284c3d7f25ec384a1910d40bbf5adbcf6c0c129e6f877b2fbd37460fa0fd916ad011c3b49d59aa8e03b97447269407f062 diff --git a/xpra.spec b/xpra.spec index 251364f..822eb1e 100644 --- a/xpra.spec +++ b/xpra.spec @@ -36,8 +36,8 @@ %endif Name: xpra -Version: 3.0.5 -Release: 2%{?dist} +Version: 3.0.6 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -294,6 +294,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Sat Feb 08 2020 Antonio Trande - 3.0.6-1 +- Release 3.0.6 + * Fri Jan 31 2020 Fedora Release Engineering - 3.0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From cae7f9d651eddaaa48f860e7e448f468b4ce3403 Mon Sep 17 00:00:00 2001 From: sagitter Date: Wed, 12 Feb 2020 12:37:26 +0100 Subject: [PATCH 137/267] Fix symlinks to js-jquery (rhbz#1801878) --- xpra.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xpra.spec b/xpra.spec index 822eb1e..3c3eea4 100644 --- a/xpra.spec +++ b/xpra.spec @@ -9,6 +9,8 @@ %endif # +%global __js_jquery_latest %{_datadir}/javascript/jquery/latest/ + # These are nececessary as the _with_foo is *not* defined if the # --with flag isn't specifed, and we need to have the --without # specified option in that case. @@ -37,7 +39,7 @@ Name: xpra Version: 3.0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -239,7 +241,7 @@ find %{buildroot}%{_datadir}/xpra -name '*.swf' -exec rm {} \; find %{buildroot}%{_datadir}/xpra/www/js -name '*.js' \ -exec chmod 0644 {} \; -ln -sf %{_datadir}/javascript/jquery/3.2.1/jquery.js %{buildroot}%{_datadir}/xpra/www/js/lib/jquery.js +ln -sf %{__js_jquery_latest}jquery.js %{buildroot}%{_datadir}/xpra/www/js/lib/jquery.js # Create this directory for sharing sockets mkdir -p %{buildroot}%{_rundir}/xpra @@ -294,6 +296,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Wed Feb 12 2020 Antonio Trande - 3.0.6-2 +- Fix symlinks to js-jquery (rhbz#1801878) + * Sat Feb 08 2020 Antonio Trande - 3.0.6-1 - Release 3.0.6 From 1577618ba7dfc7318b50b4c6b1f3405c1f696dff Mon Sep 17 00:00:00 2001 From: sagitter Date: Sat, 14 Mar 2020 11:53:15 +0100 Subject: [PATCH 138/267] Release 3.0.7 --- .gitignore | 1 + sources | 2 +- xpra.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fcb02e2..08b516d 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ /xpra-3.0.3.tar.xz /xpra-3.0.5.tar.xz /xpra-3.0.6.tar.xz +/xpra-3.0.7.tar.xz diff --git a/sources b/sources index 81b0cde..0c67d2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-3.0.6.tar.xz) = e3bd7a3e32e3f974494b10cc3607a6284c3d7f25ec384a1910d40bbf5adbcf6c0c129e6f877b2fbd37460fa0fd916ad011c3b49d59aa8e03b97447269407f062 +SHA512 (xpra-3.0.7.tar.xz) = c5913479639e72c93e2feb91eb090f4523f10c996f3c993493e39e71a7077c3d7d2ae79b50ebbc15a854006551c0ef99e63f9877413637b2cf23ebc3a0c33639 diff --git a/xpra.spec b/xpra.spec index 3c3eea4..e0e39f3 100644 --- a/xpra.spec +++ b/xpra.spec @@ -38,8 +38,8 @@ %endif Name: xpra -Version: 3.0.6 -Release: 2%{?dist} +Version: 3.0.7 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -296,6 +296,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Sat Mar 14 2020 Antonio Trande - 3.0.7-1 +- Release 3.0.7 + * Wed Feb 12 2020 Antonio Trande - 3.0.6-2 - Fix symlinks to js-jquery (rhbz#1801878) From 823f8d056535ed29e55badd912a4b934d8cfc27d Mon Sep 17 00:00:00 2001 From: sagitter Date: Sat, 14 Mar 2020 12:56:26 +0100 Subject: [PATCH 139/267] Add PAM support (rhbz#1812903) --- xpra.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index e0e39f3..4dc0575 100644 --- a/xpra.spec +++ b/xpra.spec @@ -39,7 +39,7 @@ Name: xpra Version: 3.0.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -73,6 +73,7 @@ BuildRequires: libXdamage-devel BuildRequires: cups-devel BuildRequires: redhat-lsb-core BuildRequires: gcc +BuildRequires: pam-devel %if %{with debug} BuildRequires: libasan %endif @@ -269,6 +270,7 @@ getent group xpra >/dev/null || groupadd -r xpra %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/90-xpra-virtual.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/xpra.conf %config(noreplace) %{_sysconfdir}/sysconfig/xpra +%config(noreplace) %{_sysconfdir}/pam.d/xpra %{_libexecdir}/xpra/ %{_bindir}/xpra %{_bindir}/xpra_* @@ -296,6 +298,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Sat Mar 14 2020 Antonio Trande - 3.0.7-2 +- Add PAM support (rhbz#1812903) + * Sat Mar 14 2020 Antonio Trande - 3.0.7-1 - Release 3.0.7 From 810af5187dd6ddb43134b4a771284dbfc224386e Mon Sep 17 00:00:00 2001 From: sagitter Date: Thu, 2 Apr 2020 22:07:32 +0200 Subject: [PATCH 140/267] Release 3.0.8 --- .gitignore | 1 + sources | 2 +- xpra.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 08b516d..d74755c 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ /xpra-3.0.5.tar.xz /xpra-3.0.6.tar.xz /xpra-3.0.7.tar.xz +/xpra-3.0.8.tar.xz diff --git a/sources b/sources index 0c67d2c..0c2b569 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-3.0.7.tar.xz) = c5913479639e72c93e2feb91eb090f4523f10c996f3c993493e39e71a7077c3d7d2ae79b50ebbc15a854006551c0ef99e63f9877413637b2cf23ebc3a0c33639 +SHA512 (xpra-3.0.8.tar.xz) = a78cbcc69f09d6d0ad0cbae908baf5ea739a226fe40fa659d2306fdf6ea874e74762ee9a7c17d01844c780e5adcae0dab3006e0c793da72592ed0cd1c621e606 diff --git a/xpra.spec b/xpra.spec index 4dc0575..21e9219 100644 --- a/xpra.spec +++ b/xpra.spec @@ -38,8 +38,8 @@ %endif Name: xpra -Version: 3.0.7 -Release: 2%{?dist} +Version: 3.0.8 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -298,6 +298,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Thu Apr 02 2020 Antonio Trande - 3.0.8-1 +- Release 3.0.8 + * Sat Mar 14 2020 Antonio Trande - 3.0.7-2 - Add PAM support (rhbz#1812903) From 8e87f78d773b50b2eb2fa703e94e6ebd04238f5e Mon Sep 17 00:00:00 2001 From: sagitter Date: Tue, 14 Apr 2020 19:18:39 +0200 Subject: [PATCH 141/267] Release 3.0.9 --- .gitignore | 1 + sources | 2 +- xpra.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d74755c..fe14e87 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ /xpra-3.0.6.tar.xz /xpra-3.0.7.tar.xz /xpra-3.0.8.tar.xz +/xpra-3.0.9.tar.xz diff --git a/sources b/sources index 0c2b569..59a2dc1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-3.0.8.tar.xz) = a78cbcc69f09d6d0ad0cbae908baf5ea739a226fe40fa659d2306fdf6ea874e74762ee9a7c17d01844c780e5adcae0dab3006e0c793da72592ed0cd1c621e606 +SHA512 (xpra-3.0.9.tar.xz) = e94782ceb1ad28aec797f8573e12ddb1ef7652d50222365a85bbfdda0d348b7a71c38d72600d5c1702edb167efabf60f890d1aee21a8f95f29d49e21b1c7aa98 diff --git a/xpra.spec b/xpra.spec index 21e9219..e60a096 100644 --- a/xpra.spec +++ b/xpra.spec @@ -38,7 +38,7 @@ %endif Name: xpra -Version: 3.0.8 +Version: 3.0.9 Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -298,6 +298,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Tue Apr 14 2020 Antonio Trande - 3.0.9-1 +- Release 3.0.9 + * Thu Apr 02 2020 Antonio Trande - 3.0.8-1 - Release 3.0.8 From aa4a07599bb34abd26d4f114692eef411589eeba Mon Sep 17 00:00:00 2001 From: sagitter Date: Sun, 10 May 2020 20:50:30 +0200 Subject: [PATCH 142/267] Release 4.0 --- .gitignore | 1 + sources | 2 +- xpra.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fe14e87..05ce0b6 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ /xpra-3.0.7.tar.xz /xpra-3.0.8.tar.xz /xpra-3.0.9.tar.xz +/xpra-4.0.tar.xz diff --git a/sources b/sources index 59a2dc1..70213a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-3.0.9.tar.xz) = e94782ceb1ad28aec797f8573e12ddb1ef7652d50222365a85bbfdda0d348b7a71c38d72600d5c1702edb167efabf60f890d1aee21a8f95f29d49e21b1c7aa98 +SHA512 (xpra-4.0.tar.xz) = 1774e26c43531f3736f115711b5d46e79de0df7a7703bc5f59690963959f4e69f2b1aae4e66613c42da19a3a8794699903608cb7eba5992526291831e21663a7 diff --git a/xpra.spec b/xpra.spec index e60a096..11433e6 100644 --- a/xpra.spec +++ b/xpra.spec @@ -38,7 +38,7 @@ %endif Name: xpra -Version: 3.0.9 +Version: 4.0 Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -222,7 +222,7 @@ rm -f \ #fix shebangs from python3_sitearch pushd %{buildroot}%{python3_sitearch}/xpra -find . -name '*.py' | xargs sed -i '1s|^#!/usr/bin/env python|#!%{__python3}|' +find . -name '*.py' | xargs pathfix.py -pn -i "%{__python3}" for i in `ack -rl '^#!/.*python' %{buildroot}%{python3_sitearch}/xpra`; do chmod 0755 $i done @@ -298,6 +298,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Sun May 10 2020 Antonio Trande - 4.0-1 +- Release 4.0 + * Tue Apr 14 2020 Antonio Trande - 3.0.9-1 - Release 3.0.9 From 42bdc8a2b25b878f4f8e51deb681b49871ee7bfa Mon Sep 17 00:00:00 2001 From: sagitter Date: Fri, 15 May 2020 15:00:20 +0200 Subject: [PATCH 143/267] Remove uglify-js --- xpra.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xpra.spec b/xpra.spec index 11433e6..21314af 100644 --- a/xpra.spec +++ b/xpra.spec @@ -39,7 +39,7 @@ Name: xpra Version: 4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -56,7 +56,7 @@ BuildRequires: python3-gobject-devel BuildRequires: pygobject3-devel %endif BuildRequires: gtk3-devel -BuildRequires: libXtst-devel, uglify-js +BuildRequires: libXtst-devel %if 0%{?fedora} BuildRequires: pkgconf %else @@ -298,6 +298,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Fri May 15 2020 Antonio Trande - 4.0-2 +- Remove uglify-js + * Sun May 10 2020 Antonio Trande - 4.0-1 - Release 4.0 From 04b40d98c7b20194d450e46c33cfbf7979926cbb Mon Sep 17 00:00:00 2001 From: sagitter Date: Sun, 17 May 2020 19:12:34 +0200 Subject: [PATCH 144/267] Release 4.0.1 --- .gitignore | 1 + sources | 2 +- xpra.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 05ce0b6..af935c7 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ /xpra-3.0.8.tar.xz /xpra-3.0.9.tar.xz /xpra-4.0.tar.xz +/xpra-4.0.1.tar.xz diff --git a/sources b/sources index 70213a0..cf4a35a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-4.0.tar.xz) = 1774e26c43531f3736f115711b5d46e79de0df7a7703bc5f59690963959f4e69f2b1aae4e66613c42da19a3a8794699903608cb7eba5992526291831e21663a7 +SHA512 (xpra-4.0.1.tar.xz) = 4981f04bbb1418b8dc0dd0f0a7c3d02e7588a7987f1a624d35891f93cad290651f90de505d01247fac8653891c37c241c65f4bc9d88d36a37e3543e4590c81e9 diff --git a/xpra.spec b/xpra.spec index 21314af..02a4116 100644 --- a/xpra.spec +++ b/xpra.spec @@ -38,8 +38,8 @@ %endif Name: xpra -Version: 4.0 -Release: 2%{?dist} +Version: 4.0.1 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -298,6 +298,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Sun May 17 2020 Antonio Trande - 4.0.1-1 +- Release 4.0.1 + * Fri May 15 2020 Antonio Trande - 4.0-2 - Remove uglify-js From 65500d250c4c641153ca4913e671189feca7d7d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 03:55:28 +0200 Subject: [PATCH 145/267] Rebuilt for Python 3.9 --- xpra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 02a4116..be5ff5c 100644 --- a/xpra.spec +++ b/xpra.spec @@ -39,7 +39,7 @@ Name: xpra Version: 4.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -298,6 +298,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Tue May 26 2020 Miro Hrončok - 4.0.1-2 +- Rebuilt for Python 3.9 + * Sun May 17 2020 Antonio Trande - 4.0.1-1 - Release 4.0.1 From c3f2ebb4f935398d06a93079e51a43bc5e120653 Mon Sep 17 00:00:00 2001 From: sagitter Date: Fri, 5 Jun 2020 22:34:20 +0200 Subject: [PATCH 146/267] Release 4.0.2 --- .gitignore | 1 + sources | 2 +- xpra.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index af935c7..46e8ebb 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ /xpra-3.0.9.tar.xz /xpra-4.0.tar.xz /xpra-4.0.1.tar.xz +/xpra-4.0.2.tar.xz diff --git a/sources b/sources index cf4a35a..6061d82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-4.0.1.tar.xz) = 4981f04bbb1418b8dc0dd0f0a7c3d02e7588a7987f1a624d35891f93cad290651f90de505d01247fac8653891c37c241c65f4bc9d88d36a37e3543e4590c81e9 +SHA512 (xpra-4.0.2.tar.xz) = 462ff9c6efd865ed3acf967c04c677119bb4c7aa75b057c5e7e4ab05e4c7718ece1c3db34cacf0c608bb38604342479265e4f0f9ea8d2cbf2119b1b4a3fe1ec0 diff --git a/xpra.spec b/xpra.spec index be5ff5c..b0cb41c 100644 --- a/xpra.spec +++ b/xpra.spec @@ -38,8 +38,8 @@ %endif Name: xpra -Version: 4.0.1 -Release: 2%{?dist} +Version: 4.0.2 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -298,6 +298,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Fri Jun 05 2020 Antonio Trande - 4.0.2-1 +- Release 4.0.2 + * Tue May 26 2020 Miro Hrončok - 4.0.1-2 - Rebuilt for Python 3.9 From dd55e4ddeb77c46d7c4b83a7e5732631a96ebfbb Mon Sep 17 00:00:00 2001 From: sagitter Date: Thu, 16 Jul 2020 14:02:05 +0200 Subject: [PATCH 147/267] Built on EPEL8| Drop (obsolete) python-websockify dependency --- xpra-find_py3cairo.patch | 22 +++++++++++++++ xpra-force_always_libexec.patch | 11 ++++++++ xpra.spec | 49 +++++++++++++++++++++++---------- 3 files changed, 67 insertions(+), 15 deletions(-) create mode 100644 xpra-find_py3cairo.patch create mode 100644 xpra-force_always_libexec.patch diff --git a/xpra-find_py3cairo.patch b/xpra-find_py3cairo.patch new file mode 100644 index 0000000..c916e72 --- /dev/null +++ b/xpra-find_py3cairo.patch @@ -0,0 +1,22 @@ +--- a/setup.orig.py 2020-06-05 11:40:10.000000000 +0200 ++++ b/setup.py 2020-07-15 11:07:19.084531962 +0200 +@@ -1815,7 +1815,7 @@ + #cairo workaround: + cython_add(Extension("xpra.client.gtk3.cairo_workaround", + ["xpra/client/gtk3/cairo_workaround.pyx"], +- **pkgconfig("py3cairo") ++ ["@@python3_sitearch@@"] + )) + + if client_ENABLED or server_ENABLED: +--- a/xpra/client/gtk3/cairo_workaround.orig.pyx 2020-05-10 19:00:53.000000000 +0200 ++++ b/xpra/client/gtk3/cairo_workaround.pyx 2020-07-15 11:17:57.586807490 +0200 +@@ -61,7 +61,7 @@ + void cairo_surface_flush (cairo_surface_t *surface) + void cairo_surface_mark_dirty (cairo_surface_t *surface) + +-cdef extern from "pycairo/py3cairo.h": ++cdef extern from "cairo/include/py3cairo.h": + ctypedef struct Pycairo_CAPI_t: + pass + ctypedef struct PycairoSurface: diff --git a/xpra-force_always_libexec.patch b/xpra-force_always_libexec.patch new file mode 100644 index 0000000..929a567 --- /dev/null +++ b/xpra-force_always_libexec.patch @@ -0,0 +1,11 @@ +--- a/setup.orig.py 2020-07-15 17:54:25.805747151 +0200 ++++ b/setup.py 2020-07-15 17:53:15.841073182 +0200 +@@ -1460,7 +1460,7 @@ + if is_Fedora() or is_CentOS() or is_RedHat() or FREEBSD: + libexec = "libexec" + else: +- libexec = "lib" ++ libexec = "libexec" + if LINUX: + if scripts_ENABLED: + scripts += ["scripts/xpra_udev_product_version", "scripts/xpra_signal_listener"] diff --git a/xpra.spec b/xpra.spec index b0cb41c..d8a84b3 100644 --- a/xpra.spec +++ b/xpra.spec @@ -39,7 +39,7 @@ Name: xpra Version: 4.0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -49,6 +49,12 @@ Source0: https://xpra.org/src/%{name}-%{version}.tar.xz Source1: %{name}.appdata.xml %{?python_provide:%python_provide python3-%{name}} +# Horrible fix to find py3cairo.h in python3-cairo-1.16.3 +Patch0: %{name}-find_py3cairo.patch + +# Install into /usr/libexec always. +Patch1: %{name}-force_always_libexec.patch + BuildRequires: python3-devel %if 0%{?fedora} > 30 BuildRequires: python3-gobject-devel @@ -65,12 +71,14 @@ BuildRequires: pkgconfig BuildRequires: libxkbfile-devel BuildRequires: python3-Cython BuildRequires: ack -BuildRequires: python3-cairo-devel +%{?fedora:BuildRequires: python3-cairo-devel} +%{?fedora:BuildRequires: libappstream-glib} +%{?el8:BuildRequires: python3-cairo} +%{?el8:BuildRequires: cairo-devel} BuildRequires: desktop-file-utils BuildRequires: libvpx-devel -%{?fedora:BuildRequires: libappstream-glib} BuildRequires: libXdamage-devel -BuildRequires: cups-devel +BuildRequires: cups-devel, cups BuildRequires: redhat-lsb-core BuildRequires: gcc BuildRequires: pam-devel @@ -92,7 +100,6 @@ Requires: python3-gobject Requires: python3-inotify Requires: python3-lz4%{?_isa} Requires: python3-ldap3 -Requires: python3-opencv%{?_isa} Requires: python3-rencode%{?_isa} Requires: python3-netifaces%{?_isa} Requires: python3-dbus%{?_isa} @@ -110,6 +117,10 @@ Requires: cups-filesystem Requires: shared-mime-info%{?_isa} Requires: js-jquery +# python3-opencv is required for webcam forwarding support, client-side only. +# Available on Fedora only. +%{?fedora:Requires: python3-opencv%{?_isa}} + # Needed to create the xpra group Requires(pre): shadow-utils @@ -126,12 +137,9 @@ Xpra is usable over reasonably slow links and does its best to adapt to changing network bandwidth constraints. %package html5 -Summary: html5 server and client support for xpra +Summary: HTML5 server and client support for xpra Requires: %{name}%{?_isa} = %{version}-%{release} -# websockify is required to allow xpra to listen for an html5 client -Requires: python3-websockify - Provides: bundled(js-jquery-ui) = 1.12.1 Provides: bundled(js-lz4) Provides: bundled(js-zlib) @@ -141,8 +149,7 @@ Provides: bundled(js-broadway) Provides: bundled(js-bencode) %description html5 -This package adds websockify support to allow xpra to listen for http -connections, and also the xpra html5 client. +HTML5 server and client support for xpra. %package udev Summary: xpra udev files @@ -153,7 +160,12 @@ Requires: systemd-udev%{?_isa} Udev rules of xpra. %prep -%autosetup -n %{name}-%{version} +%autosetup -n %{name}-%{version} -N + +%if 0%{?el8} +%autopatch -p1 +sed -i 's|@@python3_sitearch@@|%{python3_sitearch}|' setup.py +%endif # cc1: error: unrecognized command line option ‘-mfpmath=387’ %ifarch %{arm} @@ -162,6 +174,9 @@ sed -i 's|-mfpmath=387|-mfloat-abi=hard|' setup.py %build %set_build_flags +%if 0%{?el8} +export CFLAGS="%{build_cflags} -I%{_includedir}/cairo" +%endif %{__python3} setup.py build --executable="%{__python3} -s" \ --with-verbose \ --with-vpx \ @@ -248,9 +263,9 @@ ln -sf %{__js_jquery_latest}jquery.js %{buildroot}%{_datadir}/xpra/www/js/lib/jq mkdir -p %{buildroot}%{_rundir}/xpra # Remove use of /usr/bin/enx on scripts -sed -i "1 s|^#!/usr/bin/env python\b|#!%{__python3}|" %{buildroot}%{cupslibdir}/backend/xpraforwarder -sed -i "1 s|^#!/usr/bin/env python\b|#!%{__python3}|" %{buildroot}%{_libexecdir}/xpra/auth_dialog -sed -i "1 s|^#!/usr/bin/env python\b|#!%{__python3}|" %{buildroot}%{_libexecdir}/xpra/xdg-open +pathfix.py -pn -i "%{__python3}" %{buildroot}%{cupslibdir}/backend/xpraforwarder +pathfix.py -pn -i "%{__python3}" %{buildroot}%{_libexecdir}/xpra/auth_dialog +pathfix.py -pn -i "%{__python3}" %{buildroot}%{_libexecdir}/xpra/xdg-open %check %{?fedora:appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/xpra.appdata.xml} @@ -298,6 +313,10 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Thu Jul 16 2020 Antonio Trande - 4.0.2-2 +- Built on EPEL8 +- Drop (obsolete) python-websockify dependency + * Fri Jun 05 2020 Antonio Trande - 4.0.2-1 - Release 4.0.2 From 068dd610e306693fdc91062e73e450c7010ecc1f Mon Sep 17 00:00:00 2001 From: sagitter Date: Thu, 16 Jul 2020 14:09:35 +0200 Subject: [PATCH 148/267] Add MPLv2.0 LICENSE file for HTML5 version --- xpra.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xpra.spec b/xpra.spec index d8a84b3..4580e38 100644 --- a/xpra.spec +++ b/xpra.spec @@ -138,6 +138,7 @@ network bandwidth constraints. %package html5 Summary: HTML5 server and client support for xpra +License: MPLv2.0 Requires: %{name}%{?_isa} = %{version}-%{release} Provides: bundled(js-jquery-ui) = 1.12.1 @@ -310,12 +311,14 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %files html5 +%license html5/LICENSE %{_datadir}/xpra/www %changelog * Thu Jul 16 2020 Antonio Trande - 4.0.2-2 - Built on EPEL8 - Drop (obsolete) python-websockify dependency +- Add MPLv2.0 LICENSE file for HTML5 version * Fri Jun 05 2020 Antonio Trande - 4.0.2-1 - Release 4.0.2 From 35ed181e4c0fcdbadf59ad0d7bedf61f81674817 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 16 Jul 2020 08:32:33 -0500 Subject: [PATCH 149/267] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From 644378a5e7fe5fd6eb0b1b99ce4fbdd41ffc3cac Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 28 Jul 2020 14:28:51 -0400 Subject: [PATCH 150/267] Requires xmodmap xrandr, not xorg-x11-server-utils --- xpra.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xpra.spec b/xpra.spec index 4580e38..825567e 100644 --- a/xpra.spec +++ b/xpra.spec @@ -39,7 +39,7 @@ Name: xpra Version: 4.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -104,7 +104,8 @@ Requires: python3-rencode%{?_isa} Requires: python3-netifaces%{?_isa} Requires: python3-dbus%{?_isa} Requires: dbus-x11%{?_isa} -Requires: xorg-x11-server-utils%{?_isa} +Requires: xmodmap%{?_isa} +Requires: xrandr%{?_isa} Requires: xorg-x11-drv-dummy%{?_isa} Requires: xorg-x11-xauth%{?_isa} Requires: xorg-x11-server-Xorg%{?_isa} @@ -315,6 +316,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Tue Jul 28 2020 Adam Jackson - 4.0.2-3 +- Requires xmodmap xrandr, not xorg-x11-server-utils + * Thu Jul 16 2020 Antonio Trande - 4.0.2-2 - Built on EPEL8 - Drop (obsolete) python-websockify dependency From 3f0ae89ba48ee94ebac504e25ce120ee009361d5 Mon Sep 17 00:00:00 2001 From: sagitter Date: Wed, 5 Aug 2020 19:39:42 +0200 Subject: [PATCH 151/267] Requires xmodmap xrandr without %%?_isa wrapper (rhbz#1864529) --- xpra.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xpra.spec b/xpra.spec index 825567e..e1a7e04 100644 --- a/xpra.spec +++ b/xpra.spec @@ -39,7 +39,7 @@ Name: xpra Version: 4.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -104,8 +104,8 @@ Requires: python3-rencode%{?_isa} Requires: python3-netifaces%{?_isa} Requires: python3-dbus%{?_isa} Requires: dbus-x11%{?_isa} -Requires: xmodmap%{?_isa} -Requires: xrandr%{?_isa} +Requires: xmodmap +Requires: xrandr Requires: xorg-x11-drv-dummy%{?_isa} Requires: xorg-x11-xauth%{?_isa} Requires: xorg-x11-server-Xorg%{?_isa} @@ -316,6 +316,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Wed Aug 05 2020 Antonio Trande - 4.0.2-4 +- Requires xmodmap xrandr without %%?_isa wrapper (rhbz#1864529) + * Tue Jul 28 2020 Adam Jackson - 4.0.2-3 - Requires xmodmap xrandr, not xorg-x11-server-utils From 0cf15bf0ade2099e9963caf635ae12ff186d681d Mon Sep 17 00:00:00 2001 From: sagitter Date: Sat, 8 Aug 2020 15:48:43 +0200 Subject: [PATCH 152/267] Release 4.0.3 --- .gitignore | 1 + sources | 2 +- xpra.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 46e8ebb..435ee54 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ /xpra-4.0.tar.xz /xpra-4.0.1.tar.xz /xpra-4.0.2.tar.xz +/xpra-4.0.3.tar.xz diff --git a/sources b/sources index 6061d82..2ac5534 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-4.0.2.tar.xz) = 462ff9c6efd865ed3acf967c04c677119bb4c7aa75b057c5e7e4ab05e4c7718ece1c3db34cacf0c608bb38604342479265e4f0f9ea8d2cbf2119b1b4a3fe1ec0 +SHA512 (xpra-4.0.3.tar.xz) = 73d19c68594d322b57b210039b1ef70b8fac76a793f05814014796e0f42bb8864a174677b8ceea6dfd02ad162343e78760787593ca2cea8ecc156c5b32ec0269 diff --git a/xpra.spec b/xpra.spec index e1a7e04..f12f8f0 100644 --- a/xpra.spec +++ b/xpra.spec @@ -38,8 +38,8 @@ %endif Name: xpra -Version: 4.0.2 -Release: 4%{?dist} +Version: 4.0.3 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -316,6 +316,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Sat Aug 08 2020 Antonio Trande - 4.0.3-1 +- Release 4.0.3 + * Wed Aug 05 2020 Antonio Trande - 4.0.2-4 - Requires xmodmap xrandr without %%?_isa wrapper (rhbz#1864529) From 71e0995f47b5cb1cfb5be6b0880d4892b70b9e3f Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 16:08:27 +0000 Subject: [PATCH 153/267] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From cfbe0fa5c8f50898270421816a086fcbefb7553d Mon Sep 17 00:00:00 2001 From: sagitter Date: Mon, 28 Sep 2020 18:43:31 +0200 Subject: [PATCH 154/267] Release 4.0.4 --- .gitignore | 1 + sources | 2 +- xpra.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 435ee54..f26c2af 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ /xpra-4.0.1.tar.xz /xpra-4.0.2.tar.xz /xpra-4.0.3.tar.xz +/xpra-4.0.4.tar.xz diff --git a/sources b/sources index 2ac5534..6a6cf10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-4.0.3.tar.xz) = 73d19c68594d322b57b210039b1ef70b8fac76a793f05814014796e0f42bb8864a174677b8ceea6dfd02ad162343e78760787593ca2cea8ecc156c5b32ec0269 +SHA512 (xpra-4.0.4.tar.xz) = 91a90cdab775ec2501ef1601188b97ca4aa741e541f8d941add8d509767790a144b67f094177dda7539eff305710f2c834b90a93e9441437dac615677963094c diff --git a/xpra.spec b/xpra.spec index f12f8f0..1245103 100644 --- a/xpra.spec +++ b/xpra.spec @@ -38,7 +38,7 @@ %endif Name: xpra -Version: 4.0.3 +Version: 4.0.4 Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -316,6 +316,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Mon Sep 28 2020 Antonio Trande - 4.0.4-1 +- Release 4.0.4 + * Sat Aug 08 2020 Antonio Trande - 4.0.3-1 - Release 4.0.3 From 43d919c3e406683a39756c62bc010a826a263f13 Mon Sep 17 00:00:00 2001 From: Antonio T Date: Wed, 18 Nov 2020 14:28:21 +0100 Subject: [PATCH 155/267] Release 4.0.5 --- .gitignore | 1 + sources | 2 +- xpra.spec | 9 ++++----- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f26c2af..12f9bed 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ /xpra-4.0.2.tar.xz /xpra-4.0.3.tar.xz /xpra-4.0.4.tar.xz +/xpra-4.0.5.tar.xz diff --git a/sources b/sources index 6a6cf10..6ee20d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-4.0.4.tar.xz) = 91a90cdab775ec2501ef1601188b97ca4aa741e541f8d941add8d509767790a144b67f094177dda7539eff305710f2c834b90a93e9441437dac615677963094c +SHA512 (xpra-4.0.5.tar.xz) = d2aa2b70b6ec702bca5b0c2b06378107d45c4cad79f83ee2a1ed27fd5f66474e2d8e1d28d5111e60417ed089f91bab0b1566b0c9b3dcf6f0cb5e204ff5c42c92 diff --git a/xpra.spec b/xpra.spec index 1245103..09d983b 100644 --- a/xpra.spec +++ b/xpra.spec @@ -38,7 +38,7 @@ %endif Name: xpra -Version: 4.0.4 +Version: 4.0.5 Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -56,11 +56,7 @@ Patch0: %{name}-find_py3cairo.patch Patch1: %{name}-force_always_libexec.patch BuildRequires: python3-devel -%if 0%{?fedora} > 30 BuildRequires: python3-gobject-devel -%else -BuildRequires: pygobject3-devel -%endif BuildRequires: gtk3-devel BuildRequires: libXtst-devel %if 0%{?fedora} @@ -316,6 +312,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Wed Nov 18 2020 Antonio Trande - 4.0.5-1 +- Release 4.0.5 + * Mon Sep 28 2020 Antonio Trande - 4.0.4-1 - Release 4.0.4 From 298962228679abcd18df100fc9bd7c878c562403 Mon Sep 17 00:00:00 2001 From: Antonio T Date: Wed, 18 Nov 2020 19:07:34 +0100 Subject: [PATCH 156/267] Fix BR packages for epel8 --- xpra.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xpra.spec b/xpra.spec index 09d983b..5992f1a 100644 --- a/xpra.spec +++ b/xpra.spec @@ -39,7 +39,7 @@ Name: xpra Version: 4.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -56,7 +56,8 @@ Patch0: %{name}-find_py3cairo.patch Patch1: %{name}-force_always_libexec.patch BuildRequires: python3-devel -BuildRequires: python3-gobject-devel +%{?fedora:BuildRequires: python3-gobject-devel} +%{?el8:BuildRequires: pygobject3-devel} BuildRequires: gtk3-devel BuildRequires: libXtst-devel %if 0%{?fedora} @@ -312,6 +313,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Wed Nov 18 2020 Antonio Trande - 4.0.5-2 +- Fix BR packages for epel8 + * Wed Nov 18 2020 Antonio Trande - 4.0.5-1 - Release 4.0.5 From b4466bf345987bdcf24f250dabdeec682d735569 Mon Sep 17 00:00:00 2001 From: Antonio T Date: Thu, 31 Dec 2020 15:32:59 +0100 Subject: [PATCH 157/267] Release 4.0.6 --- xpra.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xpra.spec b/xpra.spec index 5992f1a..a6a0fc3 100644 --- a/xpra.spec +++ b/xpra.spec @@ -38,8 +38,8 @@ %endif Name: xpra -Version: 4.0.5 -Release: 2%{?dist} +Version: 4.0.6 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -313,6 +313,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Thu Dec 31 2020 Antonio Trande - 4.0.6-1 +- Release 4.0.6 + * Wed Nov 18 2020 Antonio Trande - 4.0.5-2 - Fix BR packages for epel8 From 7d493bed9d30a3aabc989ca854edad1f2b16eade Mon Sep 17 00:00:00 2001 From: Antonio T Date: Thu, 31 Dec 2020 15:50:31 +0100 Subject: [PATCH 158/267] Release 4.0.6| Load source code archive --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 12f9bed..6d44f4e 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ /xpra-4.0.3.tar.xz /xpra-4.0.4.tar.xz /xpra-4.0.5.tar.xz +/xpra-4.0.6.tar.xz diff --git a/sources b/sources index 6ee20d5..3d45319 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-4.0.5.tar.xz) = d2aa2b70b6ec702bca5b0c2b06378107d45c4cad79f83ee2a1ed27fd5f66474e2d8e1d28d5111e60417ed089f91bab0b1566b0c9b3dcf6f0cb5e204ff5c42c92 +SHA512 (xpra-4.0.6.tar.xz) = e3dc66040898ed40ef12b8cdb89e5f42c2f36edc071afb435334389e727f376ddc116dbee47018468bff24f2cdd7be35750b58bc108ba73c5558bd9eccbd04ea From d59997c7893caf8071345ff8d8a85f740363b19e Mon Sep 17 00:00:00 2001 From: Antonio T Date: Thu, 14 Jan 2021 14:31:19 +0100 Subject: [PATCH 159/267] Fix rhbz#1916026 --- xpra.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index a6a0fc3..af1c5fa 100644 --- a/xpra.spec +++ b/xpra.spec @@ -39,7 +39,7 @@ Name: xpra Version: 4.0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -266,6 +266,10 @@ pathfix.py -pn -i "%{__python3}" %{buildroot}%{cupslibdir}/backend/xpraforwarder pathfix.py -pn -i "%{__python3}" %{buildroot}%{_libexecdir}/xpra/auth_dialog pathfix.py -pn -i "%{__python3}" %{buildroot}%{_libexecdir}/xpra/xdg-open +for i in `find %{buildroot}%{_bindir} -perm /644 -type f \( -name "*" \)`; do + chmod 0755 $i +done + %check %{?fedora:appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/xpra.appdata.xml} desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop @@ -313,6 +317,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Thu Jan 14 2021 Antonio Trande - 4.0.6-2 +- Fix rhbz#1916026 + * Thu Dec 31 2020 Antonio Trande - 4.0.6-1 - Release 4.0.6 From 00f4141c8dfd520942106e22835fc6e83cf687b5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:21:57 +0000 Subject: [PATCH 160/267] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index af1c5fa..b53d2f7 100644 --- a/xpra.spec +++ b/xpra.spec @@ -39,7 +39,7 @@ Name: xpra Version: 4.0.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -317,6 +317,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/xpra/www %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 4.0.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Thu Jan 14 2021 Antonio Trande - 4.0.6-2 - Fix rhbz#1916026 From f48d6ac3d9b86ace9e01693b0bf8cfc24608f401 Mon Sep 17 00:00:00 2001 From: Antonio Trande <3974791-anto.trande@users.noreply.gitlab.com> Date: Tue, 2 Mar 2021 10:43:49 +0100 Subject: [PATCH 161/267] Release 4.1 --- .gitignore | 1 + sources | 2 +- xpra.spec | 75 ++++++++++++++++++++++++++---------------------------- 3 files changed, 38 insertions(+), 40 deletions(-) diff --git a/.gitignore b/.gitignore index 6d44f4e..4f42867 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ /xpra-4.0.4.tar.xz /xpra-4.0.5.tar.xz /xpra-4.0.6.tar.xz +/xpra-4.1.tar.gz diff --git a/sources b/sources index 3d45319..48bd59b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-4.0.6.tar.xz) = e3dc66040898ed40ef12b8cdb89e5f42c2f36edc071afb435334389e727f376ddc116dbee47018468bff24f2cdd7be35750b58bc108ba73c5558bd9eccbd04ea +SHA512 (xpra-4.1.tar.gz) = 9f7fb17bf05aa265976f4815279368993057a59fc58bb8cf74843419affaae429f6cedfe692c6daaa5a085f3aada2ce3f145667bef0b277faa610895ec26a5bf diff --git a/xpra.spec b/xpra.spec index b53d2f7..055a9df 100644 --- a/xpra.spec +++ b/xpra.spec @@ -38,12 +38,12 @@ %endif Name: xpra -Version: 4.0.6 -Release: 3%{?dist} +Version: 4.1 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ -Source0: https://xpra.org/src/%{name}-%{version}.tar.xz +Source0: https://github.com/Xpra-org/xpra/archive/v%{version}/%{name}-%{version}.tar.gz # Appdata file for Fedora Source1: %{name}.appdata.xml @@ -79,6 +79,11 @@ BuildRequires: cups-devel, cups BuildRequires: redhat-lsb-core BuildRequires: gcc BuildRequires: pam-devel +BuildRequires: pandoc +BuildRequires: xorg-x11-server-Xorg +BuildRequires: xorg-x11-drv-dummy +BuildRequires: xorg-x11-xauth +BuildRequires: xkbcomp, setxkbmap %if %{with debug} BuildRequires: libasan %endif @@ -122,6 +127,9 @@ Requires: js-jquery # Needed to create the xpra group Requires(pre): shadow-utils +# xpra-html5 is now separately provided +Obsoletes: xpra-html5 < 0:4.1-1 + %description Xpra is "screen for X": it allows you to run X programs, usually on a remote host, direct their display to your local machine, and then to disconnect from @@ -134,22 +142,6 @@ Sessions can be accessed over SSH, or password protected over plain TCP sockets. Xpra is usable over reasonably slow links and does its best to adapt to changing network bandwidth constraints. -%package html5 -Summary: HTML5 server and client support for xpra -License: MPLv2.0 -Requires: %{name}%{?_isa} = %{version}-%{release} - -Provides: bundled(js-jquery-ui) = 1.12.1 -Provides: bundled(js-lz4) -Provides: bundled(js-zlib) -Provides: bundled(js-forge) -Provides: bundled(js-aurora) -Provides: bundled(js-broadway) -Provides: bundled(js-bencode) - -%description html5 -HTML5 server and client support for xpra. - %package udev Summary: xpra udev files Requires: %{name}%{?_isa} = %{version}-%{release} @@ -185,7 +177,7 @@ export CFLAGS="%{build_cflags} -I%{_includedir}/cairo" %{?_with_debug} \ --with-Xdummy \ --with-Xdummy_wrapper \ - --with-html5_gzip --without-html5_brotli --without-strict + --without-strict %install %{__python3} setup.py install -O1 \ @@ -199,8 +191,7 @@ export CFLAGS="%{build_cflags} -I%{_includedir}/cairo" %{?_with_debug} \ --with-Xdummy \ --with-Xdummy_wrapper \ - --with-html5_gzip --without-html5_brotli --without-strict - + --without-strict # Installation of these service files is not permitted on Fedora # See https://pagure.io/fesco/issue/1759 @@ -215,10 +206,10 @@ mv %{buildroot}%{_datadir}/icons/xpra.png \ %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/ rm -f %{buildroot}%{_datadir}/icons/xpra-mdns.png -install -pm 644 xdg/xpra-mdns.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ +install -pm 644 fs/share/icons/xpra-mdns.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ rm -f %{buildroot}%{_datadir}/icons/xpra-shadow.png -install -pm 644 xdg/xpra-shadow.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ +install -pm 644 fs/share/icons/xpra-shadow.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/ #replace old file with horrible WindowsXP old image rm -rf %{buildroot}%{_datadir}/appdata @@ -227,7 +218,7 @@ install -pm 644 %{SOURCE1} %{buildroot}%{_metainfodir}/ #Install nvenc.keys file mkdir -p %{buildroot}%{_sysconfdir}/xpra -install -pm 644 etc/xpra/nvenc.keys %{buildroot}%{_sysconfdir}/xpra +install -pm 644 fs/etc/xpra/nvenc.keys %{buildroot}%{_sysconfdir}/xpra #remove doc stuff from /usr/share rm -f \ @@ -235,12 +226,11 @@ rm -f \ %{buildroot}%{_datadir}/xpra/COPYING #fix shebangs from python3_sitearch -pushd %{buildroot}%{python3_sitearch}/xpra -find . -name '*.py' | xargs pathfix.py -pn -i "%{__python3}" +find %{buildroot}%{python3_sitearch}/xpra -name '*.py' | xargs pathfix.py -pn -i "%{__python3}" +find %{buildroot}%{python3_sitearch}/xpra -name '*.py' | xargs chmod 0755 for i in `ack -rl '^#!/.*python' %{buildroot}%{python3_sitearch}/xpra`; do chmod 0755 $i done -popd #fix permissions on shared objects pushd %{buildroot}%{python3_sitearch}/xpra @@ -252,12 +242,6 @@ popd # guidelines find %{buildroot}%{_datadir}/xpra -name '*.swf' -exec rm {} \; -# Ensure all .js files are not executable -find %{buildroot}%{_datadir}/xpra/www/js -name '*.js' \ - -exec chmod 0644 {} \; - -ln -sf %{__js_jquery_latest}jquery.js %{buildroot}%{_datadir}/xpra/www/js/lib/jquery.js - # Create this directory for sharing sockets mkdir -p %{buildroot}%{_rundir}/xpra @@ -270,6 +254,11 @@ for i in `find %{buildroot}%{_bindir} -perm /644 -type f \( -name "*" \)`; do chmod 0755 $i done +# Remove Build documentation +rm -rf %{buildroot}%{_docdir}/xpra/Build + +install -pm 644 README.md %{buildroot}%{_docdir}/xpra/ + %check %{?fedora:appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/xpra.appdata.xml} desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop @@ -278,7 +267,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop getent group xpra >/dev/null || groupadd -r xpra %files -%doc README NEWS %license COPYING %dir %{_sysconfdir}/xpra %dir %{_sysconfdir}/xpra/conf.d @@ -289,9 +277,17 @@ getent group xpra >/dev/null || groupadd -r xpra %config(noreplace) %{_sysconfdir}/dbus-1/system.d/xpra.conf %config(noreplace) %{_sysconfdir}/sysconfig/xpra %config(noreplace) %{_sysconfdir}/pam.d/xpra +%config(noreplace) %{_sysconfdir}/xpra/content-categories/10_default.conf +%config(noreplace) %{_sysconfdir}/xpra/content-type/10_role.conf +%config(noreplace) %{_sysconfdir}/xpra/content-type/30_title.conf +%config(noreplace) %{_sysconfdir}/xpra/content-type/50_class.conf +%config(noreplace) %{_sysconfdir}/xpra/content-type/70_commands.conf +%config(noreplace) %{_sysconfdir}/xpra/http-headers/00_nocache.txt +%config(noreplace) %{_sysconfdir}/xpra/http-headers/10_content_security_policy.txt %{_libexecdir}/xpra/ %{_bindir}/xpra %{_bindir}/xpra_* +%{_bindir}/run_scaled %{_sysusersdir}/*.conf %{python3_sitearch}/xpra/ %{python3_sitearch}/*.egg-info @@ -301,22 +297,23 @@ getent group xpra >/dev/null || groupadd -r xpra %{_datadir}/icons/hicolor/64x64/apps/xpra.png %{_mandir}/man1/xpra.1.* %{_mandir}/man1/xpra_*.1.* +%{_mandir}/man1/run_scaled.1.* %{_metainfodir}/xpra.appdata.xml %{_datadir}/mime/packages/application-x-xpraconfig.xml %{_datadir}/xpra/ %{cupslibdir}/backend/xpraforwarder %{_tmpfilesdir}/xpra.conf %dir %{_rundir}/xpra +%{_pkgdocdir}/ %files udev %{_bindir}/xpra_udev_product_version %{_udevrulesdir}/71-xpra-virtual-pointer.rules -%files html5 -%license html5/LICENSE -%{_datadir}/xpra/www - %changelog +* Mon Mar 01 2021 Antonio Trande - 4.1-1 +- Release 4.1 + * Thu Jan 28 2021 Fedora Release Engineering - 4.0.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 0fab12f7b8079a43fe6d433d01cc978b3179fb7f Mon Sep 17 00:00:00 2001 From: Antonio Trande <3974791-anto.trande@users.noreply.gitlab.com> Date: Wed, 3 Mar 2021 21:48:00 +0100 Subject: [PATCH 162/267] Fix epel8 builds --- xpra-force_always_libexec.patch | 6 +++--- xpra.spec | 28 +++++++++++++++------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/xpra-force_always_libexec.patch b/xpra-force_always_libexec.patch index 929a567..577570a 100644 --- a/xpra-force_always_libexec.patch +++ b/xpra-force_always_libexec.patch @@ -1,11 +1,11 @@ --- a/setup.orig.py 2020-07-15 17:54:25.805747151 +0200 +++ b/setup.py 2020-07-15 17:53:15.841073182 +0200 -@@ -1460,7 +1460,7 @@ +@@ -1510,7 +1510,7 @@ if is_Fedora() or is_CentOS() or is_RedHat() or FREEBSD: libexec = "libexec" else: - libexec = "lib" + libexec = "libexec" - if LINUX: + if LINUX or FREEBSD: if scripts_ENABLED: - scripts += ["scripts/xpra_udev_product_version", "scripts/xpra_signal_listener"] + scripts += ["fs/bin/xpra_udev_product_version", "fs/bin/xpra_signal_listener"] diff --git a/xpra.spec b/xpra.spec index 055a9df..3d72a3a 100644 --- a/xpra.spec +++ b/xpra.spec @@ -39,7 +39,7 @@ Name: xpra Version: 4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -52,26 +52,15 @@ Source1: %{name}.appdata.xml # Horrible fix to find py3cairo.h in python3-cairo-1.16.3 Patch0: %{name}-find_py3cairo.patch -# Install into /usr/libexec always. +# Install into /usr/libexec always Patch1: %{name}-force_always_libexec.patch BuildRequires: python3-devel -%{?fedora:BuildRequires: python3-gobject-devel} -%{?el8:BuildRequires: pygobject3-devel} BuildRequires: gtk3-devel BuildRequires: libXtst-devel -%if 0%{?fedora} -BuildRequires: pkgconf -%else -BuildRequires: pkgconfig -%endif BuildRequires: libxkbfile-devel BuildRequires: python3-Cython BuildRequires: ack -%{?fedora:BuildRequires: python3-cairo-devel} -%{?fedora:BuildRequires: libappstream-glib} -%{?el8:BuildRequires: python3-cairo} -%{?el8:BuildRequires: cairo-devel} BuildRequires: desktop-file-utils BuildRequires: libvpx-devel BuildRequires: libXdamage-devel @@ -80,10 +69,20 @@ BuildRequires: redhat-lsb-core BuildRequires: gcc BuildRequires: pam-devel BuildRequires: pandoc +%if 0%{?el8} +BuildRequires: xorg-x11-server-Xvfb +BuildRequires: python3-cairo +BuildRequires: cairo-devel +BuildRequires: pygobject3-devel +%else +BuildRequires: python3-gobject-devel +BuildRequires: libappstream-glib +BuildRequires: python3-cairo-devel BuildRequires: xorg-x11-server-Xorg BuildRequires: xorg-x11-drv-dummy BuildRequires: xorg-x11-xauth BuildRequires: xkbcomp, setxkbmap +%endif %if %{with debug} BuildRequires: libasan %endif @@ -311,6 +310,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Wed Mar 03 2021 Antonio Trande - 4.1-2 +- Fix epel8 builds + * Mon Mar 01 2021 Antonio Trande - 4.1-1 - Release 4.1 From 4f822f739c8ba053cff4b7d04fe70bc804677f43 Mon Sep 17 00:00:00 2001 From: Antonio Trande <3974791-anto.trande@users.noreply.gitlab.com> Date: Sun, 7 Mar 2021 18:47:18 +0100 Subject: [PATCH 163/267] Release 4.1.1 --- .gitignore | 1 + sources | 2 +- xpra.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4f42867..ba81411 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ /xpra-4.0.5.tar.xz /xpra-4.0.6.tar.xz /xpra-4.1.tar.gz +/xpra-4.1.1.tar.gz diff --git a/sources b/sources index 48bd59b..0123a87 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-4.1.tar.gz) = 9f7fb17bf05aa265976f4815279368993057a59fc58bb8cf74843419affaae429f6cedfe692c6daaa5a085f3aada2ce3f145667bef0b277faa610895ec26a5bf +SHA512 (xpra-4.1.1.tar.gz) = 804ea59314559bc6a870461b14eb031db5a2db65ea2e6c7d41dc3f52921d74bb88b0ac9f06d09c671c050e5aaf79da546d6a50dd226fe01b0078c5157875d6fb diff --git a/xpra.spec b/xpra.spec index 3d72a3a..5074740 100644 --- a/xpra.spec +++ b/xpra.spec @@ -38,8 +38,8 @@ %endif Name: xpra -Version: 4.1 -Release: 2%{?dist} +Version: 4.1.1 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -310,6 +310,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Sun Mar 07 2021 Antonio Trande - 4.1.1-1 +- Release 4.1.1 + * Wed Mar 03 2021 Antonio Trande - 4.1-2 - Fix epel8 builds From d4de40a497d51212244f1e5adfce01c46e2e0d33 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Tue, 6 Apr 2021 16:30:27 +0200 Subject: [PATCH 164/267] Release 4.1.2 --- .gitignore | 1 + sources | 2 +- xpra.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ba81411..205706c 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ /xpra-4.0.6.tar.xz /xpra-4.1.tar.gz /xpra-4.1.1.tar.gz +/xpra-4.1.2.tar.gz diff --git a/sources b/sources index 0123a87..288779d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-4.1.1.tar.gz) = 804ea59314559bc6a870461b14eb031db5a2db65ea2e6c7d41dc3f52921d74bb88b0ac9f06d09c671c050e5aaf79da546d6a50dd226fe01b0078c5157875d6fb +SHA512 (xpra-4.1.2.tar.gz) = 7bd2ab84dfe4d2b3755d393b777c9f09bcdcc1571cb3df36dcf350431f7c465236da32564fae89b3ebdab6bc3a2f8c2aa6c797ac4689d778ab772d307f3b33c5 diff --git a/xpra.spec b/xpra.spec index 5074740..ab4c868 100644 --- a/xpra.spec +++ b/xpra.spec @@ -38,7 +38,7 @@ %endif Name: xpra -Version: 4.1.1 +Version: 4.1.2 Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -310,6 +310,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Tue Apr 06 2021 Antonio Trande - 4.1.2-1 +- Release 4.1.2 + * Sun Mar 07 2021 Antonio Trande - 4.1.1-1 - Release 4.1.1 From 7627d95e5c37b55715bb1caeaa5a379b9bf25142 Mon Sep 17 00:00:00 2001 From: Antonio Date: Wed, 21 Apr 2021 14:13:26 +0200 Subject: [PATCH 165/267] Release 4.1.3 --- .gitignore | 1 + sources | 2 +- xpra.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 205706c..91d7543 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,4 @@ /xpra-4.1.tar.gz /xpra-4.1.1.tar.gz /xpra-4.1.2.tar.gz +/xpra-4.1.3.tar.gz diff --git a/sources b/sources index 288779d..fd30f33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-4.1.2.tar.gz) = 7bd2ab84dfe4d2b3755d393b777c9f09bcdcc1571cb3df36dcf350431f7c465236da32564fae89b3ebdab6bc3a2f8c2aa6c797ac4689d778ab772d307f3b33c5 +SHA512 (xpra-4.1.3.tar.gz) = d7bca01be846ba9026fbb2ab530f21541a8a9afc01015d103bc790222d8a1151d0a4502d9c26f07d1be650b80c9ccde7fd7141c17f51a01033406250aa55a702 diff --git a/xpra.spec b/xpra.spec index ab4c868..739a50a 100644 --- a/xpra.spec +++ b/xpra.spec @@ -38,7 +38,7 @@ %endif Name: xpra -Version: 4.1.2 +Version: 4.1.3 Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -310,6 +310,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Wed Apr 21 2021 Antonio Trande - 4.1.3-1 +- Release 4.1.3 + * Tue Apr 06 2021 Antonio Trande - 4.1.2-1 - Release 4.1.2 From 82a04dc3628a433c626ccda02c8e9e6cfb2c2473 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sun, 16 May 2021 16:42:03 +0200 Subject: [PATCH 166/267] Switch from pulseaudio to pipewire (rhbz#1960903) --- xpra.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xpra.spec b/xpra.spec index 739a50a..2770eb6 100644 --- a/xpra.spec +++ b/xpra.spec @@ -39,7 +39,7 @@ Name: xpra Version: 4.1.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -114,7 +114,9 @@ Requires: python3-numpy%{?_isa} Requires: gstreamer1%{?_isa} Requires: gstreamer1-plugins-base%{?_isa} Requires: gstreamer1-plugins-good%{?_isa} -Requires: pulseaudio pulseaudio-utils%{?_isa} +Requires: pipewire%{?_isa} +Requires: pipewire-utils%{?_isa} +Requires: pipewire-pulseaudio%{?_isa} Requires: cups-filesystem Requires: shared-mime-info%{?_isa} Requires: js-jquery @@ -310,6 +312,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Sun May 16 2021 Antonio Trande - 4.1.3-2 +- Switch from pulseaudio to pipewire (rhbz#1960903) + * Wed Apr 21 2021 Antonio Trande - 4.1.3-1 - Release 4.1.3 From 63d9d783e47003ba4797538dce8d3c69a24980d6 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sun, 16 May 2021 16:57:23 +0200 Subject: [PATCH 167/267] Switch from pulseaudio to pipewire (rhbz#1960903) /2 --- xpra.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xpra.spec b/xpra.spec index 2770eb6..33a68b7 100644 --- a/xpra.spec +++ b/xpra.spec @@ -114,9 +114,14 @@ Requires: python3-numpy%{?_isa} Requires: gstreamer1%{?_isa} Requires: gstreamer1-plugins-base%{?_isa} Requires: gstreamer1-plugins-good%{?_isa} +%if 0%{?fedora} Requires: pipewire%{?_isa} Requires: pipewire-utils%{?_isa} Requires: pipewire-pulseaudio%{?_isa} +%else +Requires: pulseaudio%{?_isa} +Requires: pulseaudio-utils%{?_isa} +%endif Requires: cups-filesystem Requires: shared-mime-info%{?_isa} Requires: js-jquery From 62261ead0233744f745d91970ba312b1c9a3fb08 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sat, 22 May 2021 17:37:01 +0200 Subject: [PATCH 168/267] Release 4.2 --- .gitignore | 1 + sources | 2 +- xpra.rpmlintrc | 16 ---------------- xpra.spec | 7 +++++-- 4 files changed, 7 insertions(+), 19 deletions(-) delete mode 100644 xpra.rpmlintrc diff --git a/.gitignore b/.gitignore index 91d7543..4f25a4d 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ /xpra-4.1.1.tar.gz /xpra-4.1.2.tar.gz /xpra-4.1.3.tar.gz +/xpra-4.2.tar.gz diff --git a/sources b/sources index fd30f33..f31133e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-4.1.3.tar.gz) = d7bca01be846ba9026fbb2ab530f21541a8a9afc01015d103bc790222d8a1151d0a4502d9c26f07d1be650b80c9ccde7fd7141c17f51a01033406250aa55a702 +SHA512 (xpra-4.2.tar.gz) = 261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353 diff --git a/xpra.rpmlintrc b/xpra.rpmlintrc deleted file mode 100644 index 838e43d..0000000 --- a/xpra.rpmlintrc +++ /dev/null @@ -1,16 +0,0 @@ -# Edited by sagitter (sagitter AT fedoraproject dot org) - -# KNOWN BUGS: -# - -# TESTS: -##### SRPMs ##### - -# ERRORS: -##### RPMs ##### - -# Required by upstream -addFilter(r'(non-readable) /usr/lib/cups/backend/xpraforwarder') -addFilter(r'(non-standard-executable-perm) /usr/lib/cups/backend/xpraforwarder') - - diff --git a/xpra.spec b/xpra.spec index 33a68b7..28c299a 100644 --- a/xpra.spec +++ b/xpra.spec @@ -38,8 +38,8 @@ %endif Name: xpra -Version: 4.1.3 -Release: 2%{?dist} +Version: 4.2 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -317,6 +317,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Sat May 22 2021 Antonio Trande - 4.2-1 +- Release 4.2 + * Sun May 16 2021 Antonio Trande - 4.1.3-2 - Switch from pulseaudio to pipewire (rhbz#1960903) From d4e586dd1bb2a199f5db6e71b89117df242476ea Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sat, 22 May 2021 17:38:14 +0200 Subject: [PATCH 169/267] Release 4.2| Include xpra.rpmlintrc --- xpra.rpmlintrc | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 xpra.rpmlintrc diff --git a/xpra.rpmlintrc b/xpra.rpmlintrc new file mode 100644 index 0000000..838e43d --- /dev/null +++ b/xpra.rpmlintrc @@ -0,0 +1,16 @@ +# Edited by sagitter (sagitter AT fedoraproject dot org) + +# KNOWN BUGS: +# + +# TESTS: +##### SRPMs ##### + +# ERRORS: +##### RPMs ##### + +# Required by upstream +addFilter(r'(non-readable) /usr/lib/cups/backend/xpraforwarder') +addFilter(r'(non-standard-executable-perm) /usr/lib/cups/backend/xpraforwarder') + + From 409299d433b8cbde63079de20ab9dd9464645f07 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 21:20:22 +0200 Subject: [PATCH 170/267] Rebuilt for Python 3.10 --- xpra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 28c299a..2034feb 100644 --- a/xpra.spec +++ b/xpra.spec @@ -39,7 +39,7 @@ Name: xpra Version: 4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -317,6 +317,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Fri Jun 04 2021 Python Maint - 4.2-2 +- Rebuilt for Python 3.10 + * Sat May 22 2021 Antonio Trande - 4.2-1 - Release 4.2 From c12bae943ce9de61defc85d52f78c25ccf32e58b Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sun, 11 Jul 2021 15:21:39 +0200 Subject: [PATCH 171/267] Release 4.2.1 --- .gitignore | 1 + sources | 2 +- xpra.spec | 8 +++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4f25a4d..427d2bd 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,4 @@ /xpra-4.1.2.tar.gz /xpra-4.1.3.tar.gz /xpra-4.2.tar.gz +/xpra-4.2.1.tar.gz diff --git a/sources b/sources index f31133e..84cc0f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-4.2.tar.gz) = 261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353 +SHA512 (xpra-4.2.1.tar.gz) = cf6c984601433d24198c935e85a9c0626d98cb5d058fe6994e86f494faff15d0e2cc2c23384e116c11598a89e96dc5a5e790d51edb11469431d7473ef9f9cf1d diff --git a/xpra.spec b/xpra.spec index 2034feb..2b823ce 100644 --- a/xpra.spec +++ b/xpra.spec @@ -38,8 +38,8 @@ %endif Name: xpra -Version: 4.2 -Release: 2%{?dist} +Version: 4.2.1 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -47,7 +47,6 @@ Source0: https://github.com/Xpra-org/xpra/archive/v%{version}/%{name}-%{v # Appdata file for Fedora Source1: %{name}.appdata.xml -%{?python_provide:%python_provide python3-%{name}} # Horrible fix to find py3cairo.h in python3-cairo-1.16.3 Patch0: %{name}-find_py3cairo.patch @@ -317,6 +316,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Sun Jul 11 2021 Antonio Trande - 4.2.1-1 +- Release 4.2.1 + * Fri Jun 04 2021 Python Maint - 4.2-2 - Rebuilt for Python 3.10 From f7200d0cdde3a996c8885570d4f0b3b12f7c038d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:54:55 +0000 Subject: [PATCH 172/267] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 2b823ce..c03d139 100644 --- a/xpra.spec +++ b/xpra.spec @@ -39,7 +39,7 @@ Name: xpra Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -316,6 +316,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 4.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sun Jul 11 2021 Antonio Trande - 4.2.1-1 - Release 4.2.1 From a4c5459de49bc721b2b6fef5793b34f39324a8a0 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Thu, 12 Aug 2021 11:58:42 +0200 Subject: [PATCH 173/267] Release 4.2.2 --- .gitignore | 1 + sources | 2 +- xpra.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 427d2bd..455bef0 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ /xpra-4.1.3.tar.gz /xpra-4.2.tar.gz /xpra-4.2.1.tar.gz +/xpra-4.2.2.tar.gz diff --git a/sources b/sources index 84cc0f3..76caf6d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-4.2.1.tar.gz) = cf6c984601433d24198c935e85a9c0626d98cb5d058fe6994e86f494faff15d0e2cc2c23384e116c11598a89e96dc5a5e790d51edb11469431d7473ef9f9cf1d +SHA512 (xpra-4.2.2.tar.gz) = ff69b0d01d999d27c405ee7c94e8d5b4e0dbfa2f852118a86386a70834d74ca986dc5200a51fa77d86b489986fe8e54d3b70c09417e5e218061f6528e984db49 diff --git a/xpra.spec b/xpra.spec index c03d139..9b9cf97 100644 --- a/xpra.spec +++ b/xpra.spec @@ -38,12 +38,12 @@ %endif Name: xpra -Version: 4.2.1 -Release: 2%{?dist} +Version: 4.2.2 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ -Source0: https://github.com/Xpra-org/xpra/archive/v%{version}/%{name}-%{version}.tar.gz +Source0: https://github.com/Xpra-org/xpra/archive/refs/tags/v%{version}/%{name}-%{version}.tar.gz # Appdata file for Fedora Source1: %{name}.appdata.xml @@ -316,6 +316,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Thu Aug 12 2021 Antonio Trande - 4.2.2-1 +- Release 4.2.2 + * Fri Jul 23 2021 Fedora Release Engineering - 4.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From cd8b2cd4c4671811d8b45739528c8959ee77258b Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Wed, 6 Oct 2021 19:37:12 +0200 Subject: [PATCH 174/267] Release 4.2.3 --- .gitignore | 1 + sources | 2 +- xpra.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 455bef0..112fa6d 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,4 @@ /xpra-4.2.tar.gz /xpra-4.2.1.tar.gz /xpra-4.2.2.tar.gz +/xpra-4.2.3.tar.gz diff --git a/sources b/sources index 76caf6d..358a509 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-4.2.2.tar.gz) = ff69b0d01d999d27c405ee7c94e8d5b4e0dbfa2f852118a86386a70834d74ca986dc5200a51fa77d86b489986fe8e54d3b70c09417e5e218061f6528e984db49 +SHA512 (xpra-4.2.3.tar.gz) = 9e0d3a2765a9c9465ecf9606f50ef74a9da2e41469a62118db1c59f3ed109cb5005763789275ada56f8b367473b72546dffb29150b9d6c2fd16a9fc567c1ab33 diff --git a/xpra.spec b/xpra.spec index 9b9cf97..5c81f42 100644 --- a/xpra.spec +++ b/xpra.spec @@ -38,7 +38,7 @@ %endif Name: xpra -Version: 4.2.2 +Version: 4.2.3 Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -316,6 +316,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Wed Oct 06 2021 Antonio Trande - 4.2.3-1 +- Release 4.2.3 + * Thu Aug 12 2021 Antonio Trande - 4.2.2-1 - Release 4.2.2 From 7cbecbe97ca421f80b27ff1278afe116c2cb1421 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sat, 18 Dec 2021 11:27:30 +0100 Subject: [PATCH 175/267] Release 4.3 --- .gitignore | 1 + sources | 2 +- xpra-find_py3cairo.patch | 19 +++++++++++++++---- xpra.spec | 9 +++++++-- 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 112fa6d..2e44e87 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,4 @@ /xpra-4.2.1.tar.gz /xpra-4.2.2.tar.gz /xpra-4.2.3.tar.gz +/xpra-4.3.tar.gz diff --git a/sources b/sources index 358a509..b832420 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-4.2.3.tar.gz) = 9e0d3a2765a9c9465ecf9606f50ef74a9da2e41469a62118db1c59f3ed109cb5005763789275ada56f8b367473b72546dffb29150b9d6c2fd16a9fc567c1ab33 +SHA512 (xpra-4.3.tar.gz) = 94a4e9c6d2a4b1c56cb2ebf0588e9f4d1e5a1a2ad290c132e24c45d9391a76947676c0afef8e261fb092b74903b5bc29bc7b589430fb202e21c12796fae485a6 diff --git a/xpra-find_py3cairo.patch b/xpra-find_py3cairo.patch index c916e72..d055d51 100644 --- a/xpra-find_py3cairo.patch +++ b/xpra-find_py3cairo.patch @@ -1,17 +1,28 @@ --- a/setup.orig.py 2020-06-05 11:40:10.000000000 +0200 +++ b/setup.py 2020-07-15 11:07:19.084531962 +0200 -@@ -1815,7 +1815,7 @@ +@@ -1899,8 +1899,8 @@ #cairo workaround: - cython_add(Extension("xpra.client.gtk3.cairo_workaround", + add_cython_ext("xpra.client.gtk3.cairo_workaround", ["xpra/client/gtk3/cairo_workaround.pyx"], - **pkgconfig("py3cairo") +- ) + ["@@python3_sitearch@@"] - )) ++ ) if client_ENABLED or server_ENABLED: + add_packages("xpra.codecs.argb") --- a/xpra/client/gtk3/cairo_workaround.orig.pyx 2020-05-10 19:00:53.000000000 +0200 +++ b/xpra/client/gtk3/cairo_workaround.pyx 2020-07-15 11:17:57.586807490 +0200 -@@ -61,7 +61,7 @@ +@@ -35,7 +35,7 @@ + pass + void * PyCapsule_Import(const char *name, int no_block) + +-cdef extern from "cairo/cairo.h": ++cdef extern from "cairo/include/py3cairo.h": + ctypedef struct cairo_surface_t: + pass + +@@ -59,7 +59,7 @@ void cairo_surface_flush (cairo_surface_t *surface) void cairo_surface_mark_dirty (cairo_surface_t *surface) diff --git a/xpra.spec b/xpra.spec index 5c81f42..35f2315 100644 --- a/xpra.spec +++ b/xpra.spec @@ -38,7 +38,7 @@ %endif Name: xpra -Version: 4.2.3 +Version: 4.3 Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -63,6 +63,7 @@ BuildRequires: ack BuildRequires: desktop-file-utils BuildRequires: libvpx-devel BuildRequires: libXdamage-devel +BuildRequires: libXres-devel BuildRequires: cups-devel, cups BuildRequires: redhat-lsb-core BuildRequires: gcc @@ -159,7 +160,8 @@ Udev rules of xpra. %autosetup -n %{name}-%{version} -N %if 0%{?el8} -%autopatch -p1 +%patch0 -p1 -b .backup +%patch1 -p1 -b .backup sed -i 's|@@python3_sitearch@@|%{python3_sitearch}|' setup.py %endif @@ -316,6 +318,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Fri Dec 17 2021 Antonio Trande - 4.3.0-1 +- Release 4.3 + * Wed Oct 06 2021 Antonio Trande - 4.2.3-1 - Release 4.2.3 From 7bac430219cb9867890c8a7ef2d9bdec595d781b Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Tue, 4 Jan 2022 19:01:15 +0100 Subject: [PATCH 176/267] Release 4.3.1 --- .gitignore | 1 + sources | 2 +- xpra.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2e44e87..c527c34 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,4 @@ /xpra-4.2.2.tar.gz /xpra-4.2.3.tar.gz /xpra-4.3.tar.gz +/xpra-4.3.1.tar.gz diff --git a/sources b/sources index b832420..e12ff07 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-4.3.tar.gz) = 94a4e9c6d2a4b1c56cb2ebf0588e9f4d1e5a1a2ad290c132e24c45d9391a76947676c0afef8e261fb092b74903b5bc29bc7b589430fb202e21c12796fae485a6 +SHA512 (xpra-4.3.1.tar.gz) = f39b1cdec2afaf32fb6deb3580608a0115e1174193e64c23ffe3aeeba566f98801c891b05576176dee33d6e02897a1005809ebb3c8849b7cd7409722710c06e2 diff --git a/xpra.spec b/xpra.spec index 35f2315..3a40861 100644 --- a/xpra.spec +++ b/xpra.spec @@ -38,7 +38,7 @@ %endif Name: xpra -Version: 4.3 +Version: 4.3.1 Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -318,6 +318,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Tue Jan 04 2022 Antonio Trande - 4.3.1-1 +- Release 4.3.1 + * Fri Dec 17 2021 Antonio Trande - 4.3.0-1 - Release 4.3 From f34413c3001fe2dfe642775e8147109787ba974a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:28:08 +0000 Subject: [PATCH 177/267] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 3a40861..41eca86 100644 --- a/xpra.spec +++ b/xpra.spec @@ -39,7 +39,7 @@ Name: xpra Version: 4.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -318,6 +318,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 4.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Jan 04 2022 Antonio Trande - 4.3.1-1 - Release 4.3.1 From 9994dfa6141110a83b07f6e06d26be8b1534ee7b Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Thu, 27 Jan 2022 16:43:13 -0500 Subject: [PATCH 178/267] rebuild for libvpx --- xpra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 41eca86..dc127e8 100644 --- a/xpra.spec +++ b/xpra.spec @@ -39,7 +39,7 @@ Name: xpra Version: 4.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -318,6 +318,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Thu Jan 27 2022 Tom Callaway - 4.3.1-3 +- rebuild for libvpx + * Sat Jan 22 2022 Fedora Release Engineering - 4.3.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From dc5ee4c85c15e67a3a52bf7a58b86ef0e4e6822f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 16 Feb 2022 01:16:36 +0000 Subject: [PATCH 179/267] Update xpra to 4.3.2 --- .gitignore | 1 + sources | 2 +- xpra.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c527c34..4363a3a 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,4 @@ /xpra-4.2.3.tar.gz /xpra-4.3.tar.gz /xpra-4.3.1.tar.gz +/xpra-4.3.2.tar.gz diff --git a/sources b/sources index e12ff07..43d6941 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-4.3.1.tar.gz) = f39b1cdec2afaf32fb6deb3580608a0115e1174193e64c23ffe3aeeba566f98801c891b05576176dee33d6e02897a1005809ebb3c8849b7cd7409722710c06e2 +SHA512 (xpra-4.3.2.tar.gz) = 8f150798173e0d4377ef884c9dcebb3e0b6c6b5cf5c9db20661e056a4be8b26c430652e934ab6b7180809cb2fbb88e38ef5219d77e871398f3967f490d42b109 diff --git a/xpra.spec b/xpra.spec index dc127e8..22f05e1 100644 --- a/xpra.spec +++ b/xpra.spec @@ -38,8 +38,8 @@ %endif Name: xpra -Version: 4.3.1 -Release: 3%{?dist} +Version: 4.3.2 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -318,6 +318,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Wed Feb 16 2022 Sérgio Basto - 4.3.2-1 +- Update xpra to 4.3.2 + * Thu Jan 27 2022 Tom Callaway - 4.3.1-3 - rebuild for libvpx From 4f7f8576856d0200fba00f6d847759c312c3fb5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 20 Feb 2022 22:44:07 +0000 Subject: [PATCH 180/267] minor clean up --- xpra.spec | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/xpra.spec b/xpra.spec index 22f05e1..16977e8 100644 --- a/xpra.spec +++ b/xpra.spec @@ -4,7 +4,7 @@ # For debugging only %bcond_with debug -%if !%{without debug} +%if %{with debug} %global _with_debug --with-debug %endif # @@ -14,15 +14,15 @@ # These are nececessary as the _with_foo is *not* defined if the # --with flag isn't specifed, and we need to have the --without # specified option in that case. -%if !%{with enc_x264} +%if %{without enc_x264} %global _with_enc_x264 --without-enc_x264 %endif -%if !%{with dec_avcodec2} +%if %{without dec_avcodec2} %global _with_dec_avcodec2 --without-dec_avcodec2 %endif -%if !%{with csc_swscale} +%if %{without csc_swscale} %global _with_csc_swscale --without-csc_swscale %endif @@ -81,7 +81,8 @@ BuildRequires: python3-cairo-devel BuildRequires: xorg-x11-server-Xorg BuildRequires: xorg-x11-drv-dummy BuildRequires: xorg-x11-xauth -BuildRequires: xkbcomp, setxkbmap +BuildRequires: xkbcomp +BuildRequires: setxkbmap %endif %if %{with debug} BuildRequires: libasan @@ -165,7 +166,7 @@ Udev rules of xpra. sed -i 's|@@python3_sitearch@@|%{python3_sitearch}|' setup.py %endif -# cc1: error: unrecognized command line option ‘-mfpmath=387’ +# cc1: error: unrecognized compiler option ‘-mfpmath=387’ %ifarch %{arm} sed -i 's|-mfpmath=387|-mfloat-abi=hard|' setup.py %endif @@ -187,18 +188,7 @@ export CFLAGS="%{build_cflags} -I%{_includedir}/cairo" --without-strict %install -%{__python3} setup.py install -O1 \ - --skip-build \ - --root %{buildroot} \ - --with-verbose \ - --with-vpx \ - %{?_with_enc_x264} \ - %{?_with_dec_avcodec2} \ - %{?_with_csc_swscale} \ - %{?_with_debug} \ - --with-Xdummy \ - --with-Xdummy_wrapper \ - --without-strict +%py3_install # Installation of these service files is not permitted on Fedora # See https://pagure.io/fesco/issue/1759 From 21d36c8eb57721790cb340f5f2477bf58840e889 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sat, 7 May 2022 21:37:53 +0200 Subject: [PATCH 181/267] Release 4.3.3 --- .gitignore | 1 + sources | 2 +- xpra.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4363a3a..07f6269 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,4 @@ /xpra-4.3.tar.gz /xpra-4.3.1.tar.gz /xpra-4.3.2.tar.gz +/xpra-4.3.3.tar.gz diff --git a/sources b/sources index 43d6941..c008020 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-4.3.2.tar.gz) = 8f150798173e0d4377ef884c9dcebb3e0b6c6b5cf5c9db20661e056a4be8b26c430652e934ab6b7180809cb2fbb88e38ef5219d77e871398f3967f490d42b109 +SHA512 (xpra-4.3.3.tar.gz) = 3d48d5eb2abe2433a4ce0faecc0c841b7b88510b4371f29a9eb1c29f9b69ff54cefd9342388db2b5d130c6079ab3bb7b7753005ee8a9c10841f23036d5c92edb diff --git a/xpra.spec b/xpra.spec index 16977e8..9ddead5 100644 --- a/xpra.spec +++ b/xpra.spec @@ -38,7 +38,7 @@ %endif Name: xpra -Version: 4.3.2 +Version: 4.3.3 Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -308,6 +308,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Fri Apr 29 2022 Antonio Trande - 4.3.3-1 +- Release 4.3.3 + * Wed Feb 16 2022 Sérgio Basto - 4.3.2-1 - Update xpra to 4.3.2 From b09b74144052b1a10c1c447742f527be6561c7de Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sun, 26 Jun 2022 11:54:46 +0200 Subject: [PATCH 182/267] Release 4.3.4 --- .gitignore | 1 + sources | 2 +- xpra.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 07f6269..9054991 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,4 @@ /xpra-4.3.1.tar.gz /xpra-4.3.2.tar.gz /xpra-4.3.3.tar.gz +/xpra-4.3.4.tar.gz diff --git a/sources b/sources index c008020..52a17ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-4.3.3.tar.gz) = 3d48d5eb2abe2433a4ce0faecc0c841b7b88510b4371f29a9eb1c29f9b69ff54cefd9342388db2b5d130c6079ab3bb7b7753005ee8a9c10841f23036d5c92edb +SHA512 (xpra-4.3.4.tar.gz) = 02b0ab2769278649b35c255d64560d393c1749112d24e8c65917ec09c40223fbd8b80b5959988e5dfcf2578827cfe7d027072515a5910db63cdade96a21b830e diff --git a/xpra.spec b/xpra.spec index 9ddead5..60546ae 100644 --- a/xpra.spec +++ b/xpra.spec @@ -38,7 +38,7 @@ %endif Name: xpra -Version: 4.3.3 +Version: 4.3.4 Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -65,7 +65,7 @@ BuildRequires: libvpx-devel BuildRequires: libXdamage-devel BuildRequires: libXres-devel BuildRequires: cups-devel, cups -BuildRequires: redhat-lsb-core +BuildRequires: redhat-rpm-config BuildRequires: gcc BuildRequires: pam-devel BuildRequires: pandoc @@ -308,6 +308,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Sun Jun 26 2022 Antonio Trande - 4.3.4-1 +- Release 4.3.4 + * Fri Apr 29 2022 Antonio Trande - 4.3.3-1 - Release 4.3.3 From db12405c4a06be9803f8b13e061faa9fd3005bb1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:29:19 +0000 Subject: [PATCH 183/267] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 60546ae..ee0673a 100644 --- a/xpra.spec +++ b/xpra.spec @@ -39,7 +39,7 @@ Name: xpra Version: 4.3.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -308,6 +308,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 4.3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sun Jun 26 2022 Antonio Trande - 4.3.4-1 - Release 4.3.4 From 56435205da39a69892b37d79f5a5c6b68f2c25cf Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sat, 1 Oct 2022 21:08:11 +0200 Subject: [PATCH 184/267] Release 4.4 --- .gitignore | 1 + sources | 2 +- xpra.spec | 35 ++++++++++++++++++++--------------- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 9054991..e3068de 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,4 @@ /xpra-4.3.2.tar.gz /xpra-4.3.3.tar.gz /xpra-4.3.4.tar.gz +/xpra-4.4.tar.gz diff --git a/sources b/sources index 52a17ad..df77435 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-4.3.4.tar.gz) = 02b0ab2769278649b35c255d64560d393c1749112d24e8c65917ec09c40223fbd8b80b5959988e5dfcf2578827cfe7d027072515a5910db63cdade96a21b830e +SHA512 (xpra-4.4.tar.gz) = a85e0934ee31d4db7cbb43107e19bde502c54cbf270e019fcafeabcbc781f7b0329533f275bfa48db2552aa26193b82cc8b411e8ef3212f6ee0cb9352d2ae859 diff --git a/xpra.spec b/xpra.spec index ee0673a..7da11ff 100644 --- a/xpra.spec +++ b/xpra.spec @@ -38,8 +38,8 @@ %endif Name: xpra -Version: 4.3.4 -Release: 2%{?dist} +Version: 4.4 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -64,6 +64,7 @@ BuildRequires: desktop-file-utils BuildRequires: libvpx-devel BuildRequires: libXdamage-devel BuildRequires: libXres-devel +BuildRequires: lz4-devel BuildRequires: cups-devel, cups BuildRequires: redhat-rpm-config BuildRequires: gcc @@ -95,23 +96,23 @@ BuildRequires: x264-devel BuildRequires: ffmpeg-devel %endif -Requires: python3-pillow%{?_isa} -Requires: python3-cups%{?_isa} -Requires: python3-pyopengl%{?_isa} +Requires: python3-pillow +Requires: python3-cups +Requires: python3-pyopengl Requires: python3-gobject Requires: python3-inotify -Requires: python3-lz4%{?_isa} +Requires: python3-lz4 Requires: python3-ldap3 -Requires: python3-rencode%{?_isa} -Requires: python3-netifaces%{?_isa} -Requires: python3-dbus%{?_isa} -Requires: dbus-x11%{?_isa} +Requires: python3-rencode +Requires: python3-netifaces +Requires: python3-dbus +Requires: dbus-x11 Requires: xmodmap Requires: xrandr Requires: xorg-x11-drv-dummy%{?_isa} Requires: xorg-x11-xauth%{?_isa} Requires: xorg-x11-server-Xorg%{?_isa} -Requires: python3-numpy%{?_isa} +Requires: python3-numpy Requires: gstreamer1%{?_isa} Requires: gstreamer1-plugins-base%{?_isa} Requires: gstreamer1-plugins-good%{?_isa} @@ -129,7 +130,7 @@ Requires: js-jquery # python3-opencv is required for webcam forwarding support, client-side only. # Available on Fedora only. -%{?fedora:Requires: python3-opencv%{?_isa}} +%{?fedora:Requires: python3-opencv} # Needed to create the xpra group Requires(pre): shadow-utils @@ -185,7 +186,8 @@ export CFLAGS="%{build_cflags} -I%{_includedir}/cairo" %{?_with_debug} \ --with-Xdummy \ --with-Xdummy_wrapper \ - --without-strict + --without-strict \ + --without-enc_ffmpeg %install %py3_install @@ -275,6 +277,7 @@ getent group xpra >/dev/null || groupadd -r xpra %config(noreplace) %{_sysconfdir}/sysconfig/xpra %config(noreplace) %{_sysconfdir}/pam.d/xpra %config(noreplace) %{_sysconfdir}/xpra/content-categories/10_default.conf +%config(noreplace) %{_sysconfdir}/xpra/content-parent/10_default.conf %config(noreplace) %{_sysconfdir}/xpra/content-type/10_role.conf %config(noreplace) %{_sysconfdir}/xpra/content-type/30_title.conf %config(noreplace) %{_sysconfdir}/xpra/content-type/50_class.conf @@ -283,7 +286,7 @@ getent group xpra >/dev/null || groupadd -r xpra %config(noreplace) %{_sysconfdir}/xpra/http-headers/10_content_security_policy.txt %{_libexecdir}/xpra/ %{_bindir}/xpra -%{_bindir}/xpra_* +%{_bindir}/xpra_launcher %{_bindir}/run_scaled %{_sysusersdir}/*.conf %{python3_sitearch}/xpra/ @@ -304,10 +307,12 @@ getent group xpra >/dev/null || groupadd -r xpra %{_pkgdocdir}/ %files udev -%{_bindir}/xpra_udev_product_version %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Sat Oct 01 2022 Antonio Trande - 4.4-1 +- Release 4.4 + * Sat Jul 23 2022 Fedora Release Engineering - 4.3.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 9d17921e970f432e39dce0beb2d5cd80b67d49bb Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Mon, 24 Oct 2022 10:44:18 +0200 Subject: [PATCH 185/267] Release 4.4.1 --- .gitignore | 1 + sources | 2 +- xpra.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e3068de..885df71 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,4 @@ /xpra-4.3.3.tar.gz /xpra-4.3.4.tar.gz /xpra-4.4.tar.gz +/xpra-4.4.1.tar.gz diff --git a/sources b/sources index df77435..67c449d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-4.4.tar.gz) = a85e0934ee31d4db7cbb43107e19bde502c54cbf270e019fcafeabcbc781f7b0329533f275bfa48db2552aa26193b82cc8b411e8ef3212f6ee0cb9352d2ae859 +SHA512 (xpra-4.4.1.tar.gz) = 41c2ebdb156262262330c8a40c915a7d42b801c51021e44fc417bb7bae01083fef9efda17f04e6a6ad17f579e0316f45fcdbcc0ee086a9e558155e3793f5c007 diff --git a/xpra.spec b/xpra.spec index 7da11ff..b491d61 100644 --- a/xpra.spec +++ b/xpra.spec @@ -38,7 +38,7 @@ %endif Name: xpra -Version: 4.4 +Version: 4.4.1 Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -310,6 +310,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Mon Oct 24 2022 Antonio Trande - 4.4.1-1 +- Release 4.4.1 + * Sat Oct 01 2022 Antonio Trande - 4.4-1 - Release 4.4 From 5d3f5f689926e37879f1ab8df300b3951a54e4e7 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 1 Nov 2022 07:21:33 +0100 Subject: [PATCH 186/267] Change location of pathfix.py For more info see https://fedoraproject.org/wiki/Changes/Python3.12#pathfix.py_tool_will_be_removed --- xpra.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xpra.spec b/xpra.spec index b491d61..7dff7f6 100644 --- a/xpra.spec +++ b/xpra.spec @@ -225,7 +225,7 @@ rm -f \ %{buildroot}%{_datadir}/xpra/COPYING #fix shebangs from python3_sitearch -find %{buildroot}%{python3_sitearch}/xpra -name '*.py' | xargs pathfix.py -pn -i "%{__python3}" +find %{buildroot}%{python3_sitearch}/xpra -name '*.py' | xargs %{__python3} %{_rpmconfigdir}/redhat/pathfix.py -pn -i "%{__python3}" find %{buildroot}%{python3_sitearch}/xpra -name '*.py' | xargs chmod 0755 for i in `ack -rl '^#!/.*python' %{buildroot}%{python3_sitearch}/xpra`; do chmod 0755 $i @@ -245,9 +245,9 @@ find %{buildroot}%{_datadir}/xpra -name '*.swf' -exec rm {} \; mkdir -p %{buildroot}%{_rundir}/xpra # Remove use of /usr/bin/enx on scripts -pathfix.py -pn -i "%{__python3}" %{buildroot}%{cupslibdir}/backend/xpraforwarder -pathfix.py -pn -i "%{__python3}" %{buildroot}%{_libexecdir}/xpra/auth_dialog -pathfix.py -pn -i "%{__python3}" %{buildroot}%{_libexecdir}/xpra/xdg-open +%{__python3} %{_rpmconfigdir}/redhat/pathfix.py -pn -i "%{__python3}" %{buildroot}%{cupslibdir}/backend/xpraforwarder +%{__python3} %{_rpmconfigdir}/redhat/pathfix.py -pn -i "%{__python3}" %{buildroot}%{_libexecdir}/xpra/auth_dialog +%{__python3} %{_rpmconfigdir}/redhat/pathfix.py -pn -i "%{__python3}" %{buildroot}%{_libexecdir}/xpra/xdg-open for i in `find %{buildroot}%{_bindir} -perm /644 -type f \( -name "*" \)`; do chmod 0755 $i From d2698affda76d3b2561431ae8823faa6942f89a2 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sun, 13 Nov 2022 16:02:22 +0100 Subject: [PATCH 187/267] Release 4.4.2 --- .gitignore | 1 + sources | 2 +- xpra.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 885df71..b7723df 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,4 @@ /xpra-4.3.4.tar.gz /xpra-4.4.tar.gz /xpra-4.4.1.tar.gz +/xpra-4.4.2.tar.gz diff --git a/sources b/sources index 67c449d..a8d33b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-4.4.1.tar.gz) = 41c2ebdb156262262330c8a40c915a7d42b801c51021e44fc417bb7bae01083fef9efda17f04e6a6ad17f579e0316f45fcdbcc0ee086a9e558155e3793f5c007 +SHA512 (xpra-4.4.2.tar.gz) = efe364c170169bb1487e1eff2fb5d04dc86e209a88f95400633fb749204b377af1dc7c675de4fa4a36e84e719ec73e500e3acf4a6dea2221295351c8feb559e0 diff --git a/xpra.spec b/xpra.spec index 7dff7f6..7c956c9 100644 --- a/xpra.spec +++ b/xpra.spec @@ -38,7 +38,7 @@ %endif Name: xpra -Version: 4.4.1 +Version: 4.4.2 Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -310,6 +310,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Sun Nov 13 2022 Antonio Trande - 4.4.2-1 +- Release 4.4.2 + * Mon Oct 24 2022 Antonio Trande - 4.4.1-1 - Release 4.4.1 From a8d1637791d158c6b6a89bc8f96cf939952882e0 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Thu, 8 Dec 2022 12:02:45 +0100 Subject: [PATCH 188/267] Release 4.4.3 --- .gitignore | 1 + sources | 2 +- xpra.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b7723df..ce68d1d 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,4 @@ /xpra-4.4.tar.gz /xpra-4.4.1.tar.gz /xpra-4.4.2.tar.gz +/xpra-4.4.3.tar.gz diff --git a/sources b/sources index a8d33b0..c47b01d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-4.4.2.tar.gz) = efe364c170169bb1487e1eff2fb5d04dc86e209a88f95400633fb749204b377af1dc7c675de4fa4a36e84e719ec73e500e3acf4a6dea2221295351c8feb559e0 +SHA512 (xpra-4.4.3.tar.gz) = db1815ce3b2220b7494ebaac22bf94df264fd440cf9d57a9088d29afe24481895de0633f70dc0f4f7ca3566454d6febe015d68339efb0b206564acc35ec672d2 diff --git a/xpra.spec b/xpra.spec index 7c956c9..ac6bb75 100644 --- a/xpra.spec +++ b/xpra.spec @@ -38,7 +38,7 @@ %endif Name: xpra -Version: 4.4.2 +Version: 4.4.3 Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -310,6 +310,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Thu Dec 08 2022 Antonio Trande - 4.4.3-1 +- Release 4.4.3 + * Sun Nov 13 2022 Antonio Trande - 4.4.2-1 - Release 4.4.2 From 26db8d57b124d3edde39f782fa9b9760bf924004 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Thu, 8 Dec 2022 15:01:04 +0100 Subject: [PATCH 189/267] Release 4.4.3| Disable CUDA rebuilds --- xpra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index ac6bb75..82b83ee 100644 --- a/xpra.spec +++ b/xpra.spec @@ -187,7 +187,9 @@ export CFLAGS="%{build_cflags} -I%{_includedir}/cairo" --with-Xdummy \ --with-Xdummy_wrapper \ --without-strict \ - --without-enc_ffmpeg + --without-enc_ffmpeg \ + --without-cuda_rebuild \ + --without-cuda_kernels %install %py3_install @@ -312,6 +314,7 @@ getent group xpra >/dev/null || groupadd -r xpra %changelog * Thu Dec 08 2022 Antonio Trande - 4.4.3-1 - Release 4.4.3 +- Disable CUDA rebuilds * Sun Nov 13 2022 Antonio Trande - 4.4.2-1 - Release 4.4.2 From 76387817391d40ebb128497faca9359100ac7010 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Thu, 8 Dec 2022 15:14:00 +0100 Subject: [PATCH 190/267] Release 4.4.3| Patched for bug #3693 --- xpra-bug3693.patch | 272 +++++++++++++++++++++++++++++++++++++++++++++ xpra.spec | 7 +- 2 files changed, 276 insertions(+), 3 deletions(-) create mode 100644 xpra-bug3693.patch diff --git a/xpra-bug3693.patch b/xpra-bug3693.patch new file mode 100644 index 0000000..cc2a0e3 --- /dev/null +++ b/xpra-bug3693.patch @@ -0,0 +1,272 @@ +From 23b2c55737ca8b368197f01cc547d5439c84b862 Mon Sep 17 00:00:00 2001 +From: totaam +Date: Sun, 27 Nov 2022 21:19:47 +0700 +Subject: [PATCH] make sure to include cuda libs when needed + +(on MS Windows) +--- + setup.py | 187 +++++++++++++++++++++++++++++++------------------------ + 1 file changed, 106 insertions(+), 81 deletions(-) + +diff --git a/setup.py b/setup.py +index fc5831cdc..22a2256b8 100755 +--- a/setup.py ++++ b/setup.py +@@ -1503,7 +1503,7 @@ def add_service_exe(script, icon, base_name): + add_console_exe("xpra/codecs/nv_util.py", "nvidia.ico", "NVidia_info") + if nvfbc_ENABLED: + add_console_exe("xpra/codecs/nvfbc/capture.py", "nvidia.ico", "NvFBC_capture") +- if nvfbc_ENABLED or nvenc_ENABLED: ++ if nvfbc_ENABLED or nvenc_ENABLED or nvjpeg_encoder_ENABLED or nvjpeg_decoder_ENABLED: + add_console_exe("xpra/codecs/cuda_common/cuda_context.py", "cuda.ico", "CUDA_info") + + if ("install_exe" in sys.argv) or ("install" in sys.argv): +@@ -2043,22 +2043,18 @@ def add_cython_ext(*_args, **_kwargs): + toggle_packages(nvenc_ENABLED or nvfbc_ENABLED, "xpra.codecs.cuda_common") + toggle_packages(nvenc_ENABLED or nvfbc_ENABLED, "xpra.codecs.nv_util") + +-CUDA_BIN = "%s/cuda" % share_xpra +-if (nvenc_ENABLED and cuda_kernels_ENABLED) or nvjpeg_encoder_ENABLED: ++nvidia_ENABLED = nvenc_ENABLED or nvfbc_ENABLED or nvjpeg_encoder_ENABLED or nvjpeg_decoder_ENABLED ++toggle_packages(nvidia_ENABLED, "xpra.codecs.nvidia") ++if nvidia_ENABLED: ++ CUDA_BIN = f"{share_xpra}/cuda" + #find nvcc: +- from xpra.util import sorted_nicely ++ from xpra.util import sorted_nicely # pylint: disable=import-outside-toplevel + path_options = os.environ.get("PATH", "").split(os.path.pathsep) + if WIN32: +- external_includes += ["pycuda"] ++ external_includes.append("pycuda") + nvcc_exe = "nvcc.exe" + CUDA_DIR = os.environ.get("CUDA_DIR", "C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA") +- path_options += ["./cuda/bin/"]+list(reversed(sorted_nicely(glob.glob("%s\\*\\bin" % CUDA_DIR)))) +- #pycuda may link against curand, find it and ship it: +- for p in path_options: +- if os.path.exists(p): +- add_data_files("", glob.glob("%s\\curand64*.dll" % p)) +- add_data_files("", glob.glob("%s\\cudart64*.dll" % p)) +- break ++ path_options += ["./cuda/bin/"]+list(reversed(sorted_nicely(glob.glob(f"{CUDA_DIR}\\*\\bin")))) + else: + nvcc_exe = "nvcc" + path_options += ["/usr/local/cuda/bin", "/opt/cuda/bin"] +@@ -2066,12 +2062,9 @@ def add_cython_ext(*_args, **_kwargs): + path_options += list(reversed(sorted_nicely(glob.glob("/opt/cuda*/bin")))) + options = [os.path.join(x, nvcc_exe) for x in path_options] + #prefer the one we find on the $PATH, if any: +- try: +- v = shutil.which(nvcc_exe) +- if v and (v not in options): +- options.insert(0, v) +- except: +- pass ++ v = shutil.which(nvcc_exe) ++ if v and (v not in options): ++ options.insert(0, v) + nvcc_versions = {} + def get_nvcc_version(command): + if not os.path.exists(command): +@@ -2082,30 +2075,94 @@ def get_nvcc_version(command): + vpos = out.rfind(", V") + if vpos>0: + version = out[vpos+3:].split("\n")[0] +- version_str = " version %s" % version ++ version_str = f" version {version}" + else: + version = "0" + version_str = " unknown version!" +- print("found CUDA compiler: %s%s" % (filename, version_str)) ++ print(f"found CUDA compiler: {filename}{version_str}") + return tuple(int(x) for x in version.split(".")) + for filename in options: + vnum = get_nvcc_version(filename) + if vnum: + nvcc_versions[vnum] = filename ++ nvcc_version = nvcc = None + if nvcc_versions: + #choose the most recent one: + nvcc_version, nvcc = list(reversed(sorted(nvcc_versions.items())))[0] + if len(nvcc_versions)>1: +- print(" using version %s from %s" % (nvcc_version, nvcc)) +- else: +- nvcc_version = nvcc = None +- if ((nvenc_ENABLED or nvjpeg_encoder_ENABLED) and cuda_kernels_ENABLED): +- assert nvcc_versions, "cannot find nvcc compiler!" ++ print(f" using version {nvcc_version} from {nvcc}") ++ if cuda_kernels_ENABLED and (nvenc_ENABLED or nvjpeg_encoder_ENABLED): ++ def get_gcc_version(): ++ if CC_is_clang(): ++ return (0, ) ++ cc = os.environ.get("CC", "gcc") ++ r, _, err = get_status_output([cc, "-v"]) ++ if r==0: ++ V_LINE = "gcc version " ++ tmp_version = [] ++ for line in err.splitlines(): ++ if not line.startswith(V_LINE): ++ continue ++ v_str = line[len(V_LINE):].strip().split(" ")[0] ++ for p in v_str.split("."): ++ try: ++ tmp_version.append(int(p)) ++ except ValueError: ++ break ++ print("found gcc version: %s" % ".".join(str(x) for x in tmp_version)) ++ break ++ return tuple(tmp_version) ++ return (0, ) ++ assert nvcc, "cannot find nvcc compiler!" ++ def get_nvcc_args(): ++ nvcc_cmd = [nvcc, "-fatbin"] ++ gcc_version = get_gcc_version() ++ if gcc_version<(7, 5): ++ print("gcc versions older than 7.5 are not supported!") ++ for _ in range(5): ++ sleep(1) ++ print(".") ++ if (8,1)<=gcc_version<(9, ): ++ #GCC 8.1 has compatibility issues with CUDA 9.2, ++ #so revert to C++03: ++ nvcc_cmd.append("-std=c++03") ++ #GCC 6 uses C++11 by default: ++ else: ++ nvcc_cmd.append("-std=c++11") ++ if gcc_version>=(12, 0) or CC_is_clang(): ++ nvcc_cmd.append("--allow-unsupported-compiler") ++ if nvcc_version>=(11, 5): ++ nvcc_cmd += ["-arch=all", ++ "-Wno-deprecated-gpu-targets", ++ ] ++ if nvcc_version>=(11, 6): ++ nvcc_cmd += ["-Xnvlink", "-ignore-host-info"] ++ return nvcc_cmd ++ #older versions, add every arch we know about: ++ comp_code_options = [] ++ if nvcc_version>=(7, 5): ++ comp_code_options.append((52, 52)) ++ comp_code_options.append((53, 53)) ++ if nvcc_version>=(8, 0): ++ comp_code_options.append((60, 60)) ++ comp_code_options.append((61, 61)) ++ comp_code_options.append((62, 62)) ++ if nvcc_version>=(9, 0): ++ comp_code_options.append((70, 70)) ++ if nvcc_version>=(10, 0): ++ comp_code_options.append((75, 75)) ++ if nvcc_version>=(11, 0): ++ comp_code_options.append((80, 80)) ++ if nvcc_version>=(11, 1): ++ comp_code_options.append((86, 86)) ++ #if nvcc_version>=(11, 6): ++ # comp_code_options.append((87, 87)) ++ for arch, code in comp_code_options: ++ nvcc_cmd.append(f"-gencode=arch=compute_{arch},code=sm_{code}") ++ return nvcc_cmd ++ nvcc_args = get_nvcc_args() + #first compile the cuda kernels + #(using the same cuda SDK for both nvenc modules for now..) +- #TODO: +- # * compile directly to output directory instead of using data files? +- # * detect which arches we want to build for? (does it really matter much?) + kernels = [] + if nvenc_ENABLED: + kernels += ["XRGB_to_NV12", "XRGB_to_YUV444", "BGRX_to_NV12", "BGRX_to_YUV444"] +@@ -2113,67 +2170,26 @@ def get_nvcc_version(command): + kernels += ["BGRX_to_RGB", "RGBX_to_RGB", "RGBA_to_RGBAP", "BGRA_to_RGBAP"] + nvcc_commands = [] + for kernel in kernels: +- cuda_src = "fs/share/xpra/cuda/%s.cu" % kernel +- cuda_bin = "fs/share/xpra/cuda/%s.fatbin" % kernel ++ cuda_src = f"fs/share/xpra/cuda/{kernel}.cu" ++ cuda_bin = f"fs/share/xpra/cuda/{kernel}.fatbin" + if os.path.exists(cuda_bin) and (cuda_rebuild_ENABLED is False): + continue + reason = should_rebuild(cuda_src, cuda_bin) + if not reason: + continue +- print("rebuilding %s: %s" % (kernel, reason)) +- cmd = [nvcc, +- '-fatbin', +- "-c", cuda_src, +- "-o", cuda_bin] +- gcc_version = get_gcc_version() +- if (8,1)<=gcc_version<(9, ): +- #GCC 8.1 has compatibility issues with CUDA 9.2, +- #so revert to C++03: +- cmd.append("-std=c++03") +- #GCC 6 uses C++11 by default: +- else: +- cmd.append("-std=c++11") +- if gcc_version>=(12, 0) or CC_is_clang(): +- cmd.append("--allow-unsupported-compiler") +- if nvcc_version>=(11, 5): +- cmd += ["-arch=all", +- "-Wno-deprecated-gpu-targets", +- ] +- if nvcc_version>=(11, 6): +- cmd += ["-Xnvlink", "-ignore-host-info"] +- else: +- comp_code_options = [] +- if nvcc_version>=(7, 5): +- comp_code_options.append((52, 52)) +- comp_code_options.append((53, 53)) +- if nvcc_version>=(8, 0): +- comp_code_options.append((60, 60)) +- comp_code_options.append((61, 61)) +- comp_code_options.append((62, 62)) +- if nvcc_version>=(9, 0): +- comp_code_options.append((70, 70)) +- if nvcc_version>=(10, 0): +- comp_code_options.append((75, 75)) +- if nvcc_version>=(11, 0): +- comp_code_options.append((80, 80)) +- if nvcc_version>=(11, 1): +- comp_code_options.append((86, 86)) +- #if nvcc_version>=(11, 6): +- # comp_code_options.append((87, 87)) +- for arch, code in comp_code_options: +- cmd.append("-gencode=arch=compute_%s,code=sm_%s" % (arch, code)) +- print("CUDA compiling %s (%s)" % (kernel.ljust(16), reason)) +- print(" %s" % " ".join("'%s'" % x for x in cmd)) +- nvcc_commands.append(cmd) +- ++ print(f"rebuilding {kernel}: {reason}") ++ kbuild_cmd = nvcc_args + ["-c", cuda_src, "-o", cuda_bin] ++ print(f"CUDA compiling %s ({reason})" % kernel.ljust(16)) ++ print(" "+" ".join(f"{x!r}" for x in kbuild_cmd)) ++ nvcc_commands.append(kbuild_cmd) + #parallel build: + nvcc_errors = [] +- def nvcc_compile(cmd): +- c, stdout, stderr = get_status_output(cmd) ++ def nvcc_compile(nvcc_cmd): ++ c, stdout, stderr = get_status_output(nvcc_cmd) + if c!=0: + nvcc_errors.append(c) +- print("Error: failed to compile CUDA kernel %s" % kernel) +- print(" using command: %s" % (cmd,)) ++ print(f"Error: failed to compile CUDA kernel {kernel}") ++ print(f" using command: {nvcc_cmd}") + print(stdout or "") + print(stderr or "") + nvcc_threads = [] +@@ -2186,8 +2202,17 @@ def nvcc_compile(cmd): + if nvcc_errors: + sys.exit(1) + t.join() ++ add_data_files(CUDA_BIN, [f"fs/share/xpra/cuda/{x}.fatbin" for x in kernels]) ++ add_data_files(CUDA_BIN, ["fs/share/xpra/cuda/README.md"]) ++ if WIN32 and (nvjpeg_encoder_ENABLED or nvjpeg_decoder_ENABLED or nvenc_ENABLED): ++ assert nvcc_versions ++ CUDA_BIN_DIR = os.path.dirname(nvcc) ++ add_data_files("", glob.glob(f"{CUDA_BIN_DIR}/cudart64*dll")) ++ #if pycuda is built with curand, add this: ++ #add_data_files("", glob.glob(f"{CUDA_BIN_DIR}/curand64*dll")) ++ if nvjpeg_encoder_ENABLED or nvjpeg_decoder_ENABLED: ++ add_data_files("", glob.glob(f"{CUDA_BIN_DIR}/nvjpeg64*dll")) + +- add_data_files(CUDA_BIN, ["fs/share/xpra/cuda/%s.fatbin" % x for x in kernels]) + add_data_files(CUDA_BIN, ["fs/share/xpra/cuda/README.md"]) + + tace(nvenc_ENABLED, "xpra.codecs.nvenc.encoder", "nvenc") diff --git a/xpra.spec b/xpra.spec index 82b83ee..08e97c3 100644 --- a/xpra.spec +++ b/xpra.spec @@ -54,6 +54,8 @@ Patch0: %{name}-find_py3cairo.patch # Install into /usr/libexec always Patch1: %{name}-force_always_libexec.patch +Patch2: %{name}-bug3693.patch + BuildRequires: python3-devel BuildRequires: gtk3-devel BuildRequires: libXtst-devel @@ -166,6 +168,7 @@ Udev rules of xpra. %patch1 -p1 -b .backup sed -i 's|@@python3_sitearch@@|%{python3_sitearch}|' setup.py %endif +%patch2 -p1 -b .backup # cc1: error: unrecognized compiler option ‘-mfpmath=387’ %ifarch %{arm} @@ -187,9 +190,7 @@ export CFLAGS="%{build_cflags} -I%{_includedir}/cairo" --with-Xdummy \ --with-Xdummy_wrapper \ --without-strict \ - --without-enc_ffmpeg \ - --without-cuda_rebuild \ - --without-cuda_kernels + --without-enc_ffmpeg %install %py3_install From b49472a367ea58466b4c93f9473e15bc9b992ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 2 Jan 2023 22:32:06 +0000 Subject: [PATCH 191/267] sync and fix the way of the patch is applied --- xpra.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/xpra.spec b/xpra.spec index 08e97c3..ad9df00 100644 --- a/xpra.spec +++ b/xpra.spec @@ -1,4 +1,5 @@ %bcond_with enc_x264 +%bcond_with enc_x265 %bcond_with dec_avcodec2 %bcond_with csc_swscale @@ -18,6 +19,10 @@ %global _with_enc_x264 --without-enc_x264 %endif +%if %{with enc_x265} +%global _with_enc_x265 --with-enc_x265 +%endif + %if %{without dec_avcodec2} %global _with_dec_avcodec2 --without-dec_avcodec2 %endif @@ -51,7 +56,7 @@ Source1: %{name}.appdata.xml # Horrible fix to find py3cairo.h in python3-cairo-1.16.3 Patch0: %{name}-find_py3cairo.patch -# Install into /usr/libexec always +# Install into /usr/libexec always Patch1: %{name}-force_always_libexec.patch Patch2: %{name}-bug3693.patch @@ -168,7 +173,7 @@ Udev rules of xpra. %patch1 -p1 -b .backup sed -i 's|@@python3_sitearch@@|%{python3_sitearch}|' setup.py %endif -%patch2 -p1 -b .backup +%patch2 -p1 -R -b .backup # cc1: error: unrecognized compiler option ‘-mfpmath=387’ %ifarch %{arm} @@ -184,6 +189,7 @@ export CFLAGS="%{build_cflags} -I%{_includedir}/cairo" --with-verbose \ --with-vpx \ %{?_with_enc_x264} \ + %{?_with_enc_x265} \ %{?_with_dec_avcodec2} \ %{?_with_csc_swscale} \ %{?_with_debug} \ From 70ec1d014bb84c0a48c65ab289819696285130ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 6 Jan 2023 00:47:50 +0000 Subject: [PATCH 192/267] sync xpra --- xpra.spec | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/xpra.spec b/xpra.spec index ad9df00..8f8e34f 100644 --- a/xpra.spec +++ b/xpra.spec @@ -12,7 +12,7 @@ %global __js_jquery_latest %{_datadir}/javascript/jquery/latest/ -# These are nececessary as the _with_foo is *not* defined if the +# These are necessary as the _with_foo is *not* defined if the # --with flag isn't specifed, and we need to have the --without # specified option in that case. %if %{without enc_x264} @@ -65,13 +65,13 @@ BuildRequires: python3-devel BuildRequires: gtk3-devel BuildRequires: libXtst-devel BuildRequires: libxkbfile-devel +BuildRequires: lz4-devel BuildRequires: python3-Cython BuildRequires: ack BuildRequires: desktop-file-utils BuildRequires: libvpx-devel BuildRequires: libXdamage-devel BuildRequires: libXres-devel -BuildRequires: lz4-devel BuildRequires: cups-devel, cups BuildRequires: redhat-rpm-config BuildRequires: gcc @@ -241,10 +241,8 @@ for i in `ack -rl '^#!/.*python' %{buildroot}%{python3_sitearch}/xpra`; do done #fix permissions on shared objects -pushd %{buildroot}%{python3_sitearch}/xpra -find . -name '*.so' \ +find %{buildroot}%{python3_sitearch}/xpra -name '*.so' \ -exec chmod 0755 {} \; -popd # delete any bundled SWFs - binary content forbidden by packaging # guidelines From 06ee1778aa8f06f0ffe1257c15ed92e798ac700c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 15 Jan 2023 01:45:25 +0000 Subject: [PATCH 193/267] Add unitdir, we may have unitdir but by default disabled, preset just enable service by default which understandably was not approved. to check presets run `systemctl status xpra | grep preset` Un-split xpra-udev and other improvements Add support to procps, avif, qrencode, libdrm and libwebp --- xpra.spec | 57 ++++++++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/xpra.spec b/xpra.spec index 8f8e34f..4319d5c 100644 --- a/xpra.spec +++ b/xpra.spec @@ -44,7 +44,7 @@ Name: xpra Version: 4.4.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -74,9 +74,17 @@ BuildRequires: libXdamage-devel BuildRequires: libXres-devel BuildRequires: cups-devel, cups BuildRequires: redhat-rpm-config +BuildRequires: python3-rpm-macros BuildRequires: gcc BuildRequires: pam-devel BuildRequires: pandoc +# needs by setup.py to detect systemd `sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd")` +BuildRequires: systemd-devel +BuildRequires: pkgconfig(libprocps) +BuildRequires: pkgconfig(libavif) +BuildRequires: pkgconfig(libqrencode) +BuildRequires: libdrm-devel +BuildRequires: pkgconfig(libwebp) %if 0%{?el8} BuildRequires: xorg-x11-server-Xvfb BuildRequires: python3-cairo @@ -142,9 +150,13 @@ Requires: js-jquery # Needed to create the xpra group Requires(pre): shadow-utils -# xpra-html5 is now separately provided +# xpra-html5 is now separately provided Obsoletes: xpra-html5 < 0:4.1-1 +Requires: systemd-udev%{?_isa} +Obsoletes: xpra-udev < %{version}-%{release} +Provides: xpra-udev = %{version}-%{release} + %description Xpra is "screen for X": it allows you to run X programs, usually on a remote host, direct their display to your local machine, and then to disconnect from @@ -157,14 +169,6 @@ Sessions can be accessed over SSH, or password protected over plain TCP sockets. Xpra is usable over reasonably slow links and does its best to adapt to changing network bandwidth constraints. -%package udev -Summary: xpra udev files -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: systemd-udev%{?_isa} - -%description udev -Udev rules of xpra. - %prep %autosetup -n %{name}-%{version} -N @@ -201,10 +205,8 @@ export CFLAGS="%{build_cflags} -I%{_includedir}/cairo" %install %py3_install -# Installation of these service files is not permitted on Fedora -# See https://pagure.io/fesco/issue/1759 -rm -f %{buildroot}/lib/systemd/system/xpra.service -rm -f %{buildroot}/lib/systemd/system/xpra.socket +mkdir -p %{buildroot}%{_unitdir} +mv %{buildroot}/lib/systemd/system/xpra.* %{buildroot}%{_unitdir}/ #move icon to proper directory mkdir -p %{buildroot}%{_datadir}/icons/hicolor/48x48/apps @@ -229,14 +231,11 @@ mkdir -p %{buildroot}%{_sysconfdir}/xpra install -pm 644 fs/etc/xpra/nvenc.keys %{buildroot}%{_sysconfdir}/xpra #remove doc stuff from /usr/share -rm -f \ - %{buildroot}%{_datadir}/xpra/README \ - %{buildroot}%{_datadir}/xpra/COPYING +rm %{buildroot}%{_datadir}/xpra/COPYING -#fix shebangs from python3_sitearch -find %{buildroot}%{python3_sitearch}/xpra -name '*.py' | xargs %{__python3} %{_rpmconfigdir}/redhat/pathfix.py -pn -i "%{__python3}" -find %{buildroot}%{python3_sitearch}/xpra -name '*.py' | xargs chmod 0755 +#fi shebangs from python3_sitearch for i in `ack -rl '^#!/.*python' %{buildroot}%{python3_sitearch}/xpra`; do + %py3_shebang_fix $i chmod 0755 $i done @@ -252,9 +251,9 @@ find %{buildroot}%{_datadir}/xpra -name '*.swf' -exec rm {} \; mkdir -p %{buildroot}%{_rundir}/xpra # Remove use of /usr/bin/enx on scripts -%{__python3} %{_rpmconfigdir}/redhat/pathfix.py -pn -i "%{__python3}" %{buildroot}%{cupslibdir}/backend/xpraforwarder -%{__python3} %{_rpmconfigdir}/redhat/pathfix.py -pn -i "%{__python3}" %{buildroot}%{_libexecdir}/xpra/auth_dialog -%{__python3} %{_rpmconfigdir}/redhat/pathfix.py -pn -i "%{__python3}" %{buildroot}%{_libexecdir}/xpra/xdg-open +%py3_shebang_fix %{buildroot}%{cupslibdir}/backend/xpraforwarder +%py3_shebang_fix %{buildroot}%{_libexecdir}/xpra/auth_dialog +%py3_shebang_fix %{buildroot}%{_libexecdir}/xpra/xdg-open for i in `find %{buildroot}%{_bindir} -perm /644 -type f \( -name "*" \)`; do chmod 0755 $i @@ -311,12 +310,18 @@ getent group xpra >/dev/null || groupadd -r xpra %{cupslibdir}/backend/xpraforwarder %{_tmpfilesdir}/xpra.conf %dir %{_rundir}/xpra -%{_pkgdocdir}/ - -%files udev +%{_docdir}/xpra +%{_unitdir}/xpra.service +%{_unitdir}/xpra.socket %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Sun Jan 08 2023 Sérgio Basto - 4.4.3-2 +- Add unitdir, we may have unitdir but by default disabled, preset just enable service by default which understandably was not approved. + to check presets run `systemctl status xpra | grep preset` +- Un-split xpra-udev and other improvements +- Add support to procps, avif, qrencode, libdrm and libwebp + * Thu Dec 08 2022 Antonio Trande - 4.4.3-1 - Release 4.4.3 - Disable CUDA rebuilds From 3da1878e51d7d2466c4046a8ab0aa02efcd8aa0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 18 Jan 2023 11:44:14 +0000 Subject: [PATCH 194/267] Fix epel builds, seems upstream sort out py3cairo hack on el8 el8 now also have xorg-x11-drv-dummy --- xpra-find_py3cairo.patch | 33 --------------------------------- xpra-force_always_libexec.patch | 11 ----------- xpra.spec | 31 ++++++++++--------------------- 3 files changed, 10 insertions(+), 65 deletions(-) delete mode 100644 xpra-find_py3cairo.patch delete mode 100644 xpra-force_always_libexec.patch diff --git a/xpra-find_py3cairo.patch b/xpra-find_py3cairo.patch deleted file mode 100644 index d055d51..0000000 --- a/xpra-find_py3cairo.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/setup.orig.py 2020-06-05 11:40:10.000000000 +0200 -+++ b/setup.py 2020-07-15 11:07:19.084531962 +0200 -@@ -1899,8 +1899,8 @@ - #cairo workaround: - add_cython_ext("xpra.client.gtk3.cairo_workaround", - ["xpra/client/gtk3/cairo_workaround.pyx"], -- **pkgconfig("py3cairo") -- ) -+ ["@@python3_sitearch@@"] -+ ) - - if client_ENABLED or server_ENABLED: - add_packages("xpra.codecs.argb") ---- a/xpra/client/gtk3/cairo_workaround.orig.pyx 2020-05-10 19:00:53.000000000 +0200 -+++ b/xpra/client/gtk3/cairo_workaround.pyx 2020-07-15 11:17:57.586807490 +0200 -@@ -35,7 +35,7 @@ - pass - void * PyCapsule_Import(const char *name, int no_block) - --cdef extern from "cairo/cairo.h": -+cdef extern from "cairo/include/py3cairo.h": - ctypedef struct cairo_surface_t: - pass - -@@ -59,7 +59,7 @@ - void cairo_surface_flush (cairo_surface_t *surface) - void cairo_surface_mark_dirty (cairo_surface_t *surface) - --cdef extern from "pycairo/py3cairo.h": -+cdef extern from "cairo/include/py3cairo.h": - ctypedef struct Pycairo_CAPI_t: - pass - ctypedef struct PycairoSurface: diff --git a/xpra-force_always_libexec.patch b/xpra-force_always_libexec.patch deleted file mode 100644 index 577570a..0000000 --- a/xpra-force_always_libexec.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/setup.orig.py 2020-07-15 17:54:25.805747151 +0200 -+++ b/setup.py 2020-07-15 17:53:15.841073182 +0200 -@@ -1510,7 +1510,7 @@ - if is_Fedora() or is_CentOS() or is_RedHat() or FREEBSD: - libexec = "libexec" - else: -- libexec = "lib" -+ libexec = "libexec" - if LINUX or FREEBSD: - if scripts_ENABLED: - scripts += ["fs/bin/xpra_udev_product_version", "fs/bin/xpra_signal_listener"] diff --git a/xpra.spec b/xpra.spec index 4319d5c..96c97c0 100644 --- a/xpra.spec +++ b/xpra.spec @@ -44,21 +44,13 @@ Name: xpra Version: 4.4.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ Source0: https://github.com/Xpra-org/xpra/archive/refs/tags/v%{version}/%{name}-%{version}.tar.gz - # Appdata file for Fedora Source1: %{name}.appdata.xml - -# Horrible fix to find py3cairo.h in python3-cairo-1.16.3 -Patch0: %{name}-find_py3cairo.patch - -# Install into /usr/libexec always -Patch1: %{name}-force_always_libexec.patch - Patch2: %{name}-bug3693.patch BuildRequires: python3-devel @@ -80,18 +72,20 @@ BuildRequires: pam-devel BuildRequires: pandoc # needs by setup.py to detect systemd `sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd")` BuildRequires: systemd-devel +%if 0%{?fedora} BuildRequires: pkgconfig(libprocps) +%endif BuildRequires: pkgconfig(libavif) BuildRequires: pkgconfig(libqrencode) BuildRequires: libdrm-devel BuildRequires: pkgconfig(libwebp) %if 0%{?el8} -BuildRequires: xorg-x11-server-Xvfb -BuildRequires: python3-cairo -BuildRequires: cairo-devel +#BuildRequires: xorg-x11-server-Xvfb +#BuildRequires: cairo-devel BuildRequires: pygobject3-devel %else BuildRequires: python3-gobject-devel +%endif BuildRequires: libappstream-glib BuildRequires: python3-cairo-devel BuildRequires: xorg-x11-server-Xorg @@ -99,7 +93,6 @@ BuildRequires: xorg-x11-drv-dummy BuildRequires: xorg-x11-xauth BuildRequires: xkbcomp BuildRequires: setxkbmap -%endif %if %{with debug} BuildRequires: libasan %endif @@ -172,11 +165,6 @@ network bandwidth constraints. %prep %autosetup -n %{name}-%{version} -N -%if 0%{?el8} -%patch0 -p1 -b .backup -%patch1 -p1 -b .backup -sed -i 's|@@python3_sitearch@@|%{python3_sitearch}|' setup.py -%endif %patch2 -p1 -R -b .backup # cc1: error: unrecognized compiler option ‘-mfpmath=387’ @@ -186,9 +174,6 @@ sed -i 's|-mfpmath=387|-mfloat-abi=hard|' setup.py %build %set_build_flags -%if 0%{?el8} -export CFLAGS="%{build_cflags} -I%{_includedir}/cairo" -%endif %{__python3} setup.py build --executable="%{__python3} -s" \ --with-verbose \ --with-vpx \ @@ -316,6 +301,10 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Wed Jan 18 2023 Sérgio Basto - 4.4.3-3 +- Fix epel builds, seems upstream sort out py3cairo hack on el8 +- el8 now also have xorg-x11-drv-dummy + * Sun Jan 08 2023 Sérgio Basto - 4.4.3-2 - Add unitdir, we may have unitdir but by default disabled, preset just enable service by default which understandably was not approved. to check presets run `systemctl status xpra | grep preset` From a37a2f734aef92d699f35914317dfef6df6f72ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:49:26 +0000 Subject: [PATCH 195/267] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xpra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 96c97c0..1aee6e1 100644 --- a/xpra.spec +++ b/xpra.spec @@ -44,7 +44,7 @@ Name: xpra Version: 4.4.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -301,6 +301,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 4.4.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jan 18 2023 Sérgio Basto - 4.4.3-3 - Fix epel builds, seems upstream sort out py3cairo hack on el8 - el8 now also have xorg-x11-drv-dummy From d44662aee52f6693b8a846ee4a9e995c24a567ad Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 15 Feb 2023 17:44:27 -0500 Subject: [PATCH 196/267] rebuild for libvpx --- xpra.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 1aee6e1..5fab20f 100644 --- a/xpra.spec +++ b/xpra.spec @@ -44,7 +44,7 @@ Name: xpra Version: 4.4.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -301,6 +301,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Wed Feb 15 2023 Tom Callaway - 4.4.3-5 +- rebuild for libvpx + * Sat Jan 21 2023 Fedora Release Engineering - 4.4.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 92211a6f61e7eb58ebddd1d615ef0e55e8bd52ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 13 Mar 2023 16:13:47 +0000 Subject: [PATCH 197/267] Add python3-zeroconf to requires, we need to see if it iwe choose be just recommend xpra-bug3693.patch already available in source code --- xpra-bug3693.patch | 272 --------------------------------------------- xpra.spec | 17 +-- 2 files changed, 10 insertions(+), 279 deletions(-) delete mode 100644 xpra-bug3693.patch diff --git a/xpra-bug3693.patch b/xpra-bug3693.patch deleted file mode 100644 index cc2a0e3..0000000 --- a/xpra-bug3693.patch +++ /dev/null @@ -1,272 +0,0 @@ -From 23b2c55737ca8b368197f01cc547d5439c84b862 Mon Sep 17 00:00:00 2001 -From: totaam -Date: Sun, 27 Nov 2022 21:19:47 +0700 -Subject: [PATCH] make sure to include cuda libs when needed - -(on MS Windows) ---- - setup.py | 187 +++++++++++++++++++++++++++++++------------------------ - 1 file changed, 106 insertions(+), 81 deletions(-) - -diff --git a/setup.py b/setup.py -index fc5831cdc..22a2256b8 100755 ---- a/setup.py -+++ b/setup.py -@@ -1503,7 +1503,7 @@ def add_service_exe(script, icon, base_name): - add_console_exe("xpra/codecs/nv_util.py", "nvidia.ico", "NVidia_info") - if nvfbc_ENABLED: - add_console_exe("xpra/codecs/nvfbc/capture.py", "nvidia.ico", "NvFBC_capture") -- if nvfbc_ENABLED or nvenc_ENABLED: -+ if nvfbc_ENABLED or nvenc_ENABLED or nvjpeg_encoder_ENABLED or nvjpeg_decoder_ENABLED: - add_console_exe("xpra/codecs/cuda_common/cuda_context.py", "cuda.ico", "CUDA_info") - - if ("install_exe" in sys.argv) or ("install" in sys.argv): -@@ -2043,22 +2043,18 @@ def add_cython_ext(*_args, **_kwargs): - toggle_packages(nvenc_ENABLED or nvfbc_ENABLED, "xpra.codecs.cuda_common") - toggle_packages(nvenc_ENABLED or nvfbc_ENABLED, "xpra.codecs.nv_util") - --CUDA_BIN = "%s/cuda" % share_xpra --if (nvenc_ENABLED and cuda_kernels_ENABLED) or nvjpeg_encoder_ENABLED: -+nvidia_ENABLED = nvenc_ENABLED or nvfbc_ENABLED or nvjpeg_encoder_ENABLED or nvjpeg_decoder_ENABLED -+toggle_packages(nvidia_ENABLED, "xpra.codecs.nvidia") -+if nvidia_ENABLED: -+ CUDA_BIN = f"{share_xpra}/cuda" - #find nvcc: -- from xpra.util import sorted_nicely -+ from xpra.util import sorted_nicely # pylint: disable=import-outside-toplevel - path_options = os.environ.get("PATH", "").split(os.path.pathsep) - if WIN32: -- external_includes += ["pycuda"] -+ external_includes.append("pycuda") - nvcc_exe = "nvcc.exe" - CUDA_DIR = os.environ.get("CUDA_DIR", "C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA") -- path_options += ["./cuda/bin/"]+list(reversed(sorted_nicely(glob.glob("%s\\*\\bin" % CUDA_DIR)))) -- #pycuda may link against curand, find it and ship it: -- for p in path_options: -- if os.path.exists(p): -- add_data_files("", glob.glob("%s\\curand64*.dll" % p)) -- add_data_files("", glob.glob("%s\\cudart64*.dll" % p)) -- break -+ path_options += ["./cuda/bin/"]+list(reversed(sorted_nicely(glob.glob(f"{CUDA_DIR}\\*\\bin")))) - else: - nvcc_exe = "nvcc" - path_options += ["/usr/local/cuda/bin", "/opt/cuda/bin"] -@@ -2066,12 +2062,9 @@ def add_cython_ext(*_args, **_kwargs): - path_options += list(reversed(sorted_nicely(glob.glob("/opt/cuda*/bin")))) - options = [os.path.join(x, nvcc_exe) for x in path_options] - #prefer the one we find on the $PATH, if any: -- try: -- v = shutil.which(nvcc_exe) -- if v and (v not in options): -- options.insert(0, v) -- except: -- pass -+ v = shutil.which(nvcc_exe) -+ if v and (v not in options): -+ options.insert(0, v) - nvcc_versions = {} - def get_nvcc_version(command): - if not os.path.exists(command): -@@ -2082,30 +2075,94 @@ def get_nvcc_version(command): - vpos = out.rfind(", V") - if vpos>0: - version = out[vpos+3:].split("\n")[0] -- version_str = " version %s" % version -+ version_str = f" version {version}" - else: - version = "0" - version_str = " unknown version!" -- print("found CUDA compiler: %s%s" % (filename, version_str)) -+ print(f"found CUDA compiler: {filename}{version_str}") - return tuple(int(x) for x in version.split(".")) - for filename in options: - vnum = get_nvcc_version(filename) - if vnum: - nvcc_versions[vnum] = filename -+ nvcc_version = nvcc = None - if nvcc_versions: - #choose the most recent one: - nvcc_version, nvcc = list(reversed(sorted(nvcc_versions.items())))[0] - if len(nvcc_versions)>1: -- print(" using version %s from %s" % (nvcc_version, nvcc)) -- else: -- nvcc_version = nvcc = None -- if ((nvenc_ENABLED or nvjpeg_encoder_ENABLED) and cuda_kernels_ENABLED): -- assert nvcc_versions, "cannot find nvcc compiler!" -+ print(f" using version {nvcc_version} from {nvcc}") -+ if cuda_kernels_ENABLED and (nvenc_ENABLED or nvjpeg_encoder_ENABLED): -+ def get_gcc_version(): -+ if CC_is_clang(): -+ return (0, ) -+ cc = os.environ.get("CC", "gcc") -+ r, _, err = get_status_output([cc, "-v"]) -+ if r==0: -+ V_LINE = "gcc version " -+ tmp_version = [] -+ for line in err.splitlines(): -+ if not line.startswith(V_LINE): -+ continue -+ v_str = line[len(V_LINE):].strip().split(" ")[0] -+ for p in v_str.split("."): -+ try: -+ tmp_version.append(int(p)) -+ except ValueError: -+ break -+ print("found gcc version: %s" % ".".join(str(x) for x in tmp_version)) -+ break -+ return tuple(tmp_version) -+ return (0, ) -+ assert nvcc, "cannot find nvcc compiler!" -+ def get_nvcc_args(): -+ nvcc_cmd = [nvcc, "-fatbin"] -+ gcc_version = get_gcc_version() -+ if gcc_version<(7, 5): -+ print("gcc versions older than 7.5 are not supported!") -+ for _ in range(5): -+ sleep(1) -+ print(".") -+ if (8,1)<=gcc_version<(9, ): -+ #GCC 8.1 has compatibility issues with CUDA 9.2, -+ #so revert to C++03: -+ nvcc_cmd.append("-std=c++03") -+ #GCC 6 uses C++11 by default: -+ else: -+ nvcc_cmd.append("-std=c++11") -+ if gcc_version>=(12, 0) or CC_is_clang(): -+ nvcc_cmd.append("--allow-unsupported-compiler") -+ if nvcc_version>=(11, 5): -+ nvcc_cmd += ["-arch=all", -+ "-Wno-deprecated-gpu-targets", -+ ] -+ if nvcc_version>=(11, 6): -+ nvcc_cmd += ["-Xnvlink", "-ignore-host-info"] -+ return nvcc_cmd -+ #older versions, add every arch we know about: -+ comp_code_options = [] -+ if nvcc_version>=(7, 5): -+ comp_code_options.append((52, 52)) -+ comp_code_options.append((53, 53)) -+ if nvcc_version>=(8, 0): -+ comp_code_options.append((60, 60)) -+ comp_code_options.append((61, 61)) -+ comp_code_options.append((62, 62)) -+ if nvcc_version>=(9, 0): -+ comp_code_options.append((70, 70)) -+ if nvcc_version>=(10, 0): -+ comp_code_options.append((75, 75)) -+ if nvcc_version>=(11, 0): -+ comp_code_options.append((80, 80)) -+ if nvcc_version>=(11, 1): -+ comp_code_options.append((86, 86)) -+ #if nvcc_version>=(11, 6): -+ # comp_code_options.append((87, 87)) -+ for arch, code in comp_code_options: -+ nvcc_cmd.append(f"-gencode=arch=compute_{arch},code=sm_{code}") -+ return nvcc_cmd -+ nvcc_args = get_nvcc_args() - #first compile the cuda kernels - #(using the same cuda SDK for both nvenc modules for now..) -- #TODO: -- # * compile directly to output directory instead of using data files? -- # * detect which arches we want to build for? (does it really matter much?) - kernels = [] - if nvenc_ENABLED: - kernels += ["XRGB_to_NV12", "XRGB_to_YUV444", "BGRX_to_NV12", "BGRX_to_YUV444"] -@@ -2113,67 +2170,26 @@ def get_nvcc_version(command): - kernels += ["BGRX_to_RGB", "RGBX_to_RGB", "RGBA_to_RGBAP", "BGRA_to_RGBAP"] - nvcc_commands = [] - for kernel in kernels: -- cuda_src = "fs/share/xpra/cuda/%s.cu" % kernel -- cuda_bin = "fs/share/xpra/cuda/%s.fatbin" % kernel -+ cuda_src = f"fs/share/xpra/cuda/{kernel}.cu" -+ cuda_bin = f"fs/share/xpra/cuda/{kernel}.fatbin" - if os.path.exists(cuda_bin) and (cuda_rebuild_ENABLED is False): - continue - reason = should_rebuild(cuda_src, cuda_bin) - if not reason: - continue -- print("rebuilding %s: %s" % (kernel, reason)) -- cmd = [nvcc, -- '-fatbin', -- "-c", cuda_src, -- "-o", cuda_bin] -- gcc_version = get_gcc_version() -- if (8,1)<=gcc_version<(9, ): -- #GCC 8.1 has compatibility issues with CUDA 9.2, -- #so revert to C++03: -- cmd.append("-std=c++03") -- #GCC 6 uses C++11 by default: -- else: -- cmd.append("-std=c++11") -- if gcc_version>=(12, 0) or CC_is_clang(): -- cmd.append("--allow-unsupported-compiler") -- if nvcc_version>=(11, 5): -- cmd += ["-arch=all", -- "-Wno-deprecated-gpu-targets", -- ] -- if nvcc_version>=(11, 6): -- cmd += ["-Xnvlink", "-ignore-host-info"] -- else: -- comp_code_options = [] -- if nvcc_version>=(7, 5): -- comp_code_options.append((52, 52)) -- comp_code_options.append((53, 53)) -- if nvcc_version>=(8, 0): -- comp_code_options.append((60, 60)) -- comp_code_options.append((61, 61)) -- comp_code_options.append((62, 62)) -- if nvcc_version>=(9, 0): -- comp_code_options.append((70, 70)) -- if nvcc_version>=(10, 0): -- comp_code_options.append((75, 75)) -- if nvcc_version>=(11, 0): -- comp_code_options.append((80, 80)) -- if nvcc_version>=(11, 1): -- comp_code_options.append((86, 86)) -- #if nvcc_version>=(11, 6): -- # comp_code_options.append((87, 87)) -- for arch, code in comp_code_options: -- cmd.append("-gencode=arch=compute_%s,code=sm_%s" % (arch, code)) -- print("CUDA compiling %s (%s)" % (kernel.ljust(16), reason)) -- print(" %s" % " ".join("'%s'" % x for x in cmd)) -- nvcc_commands.append(cmd) -- -+ print(f"rebuilding {kernel}: {reason}") -+ kbuild_cmd = nvcc_args + ["-c", cuda_src, "-o", cuda_bin] -+ print(f"CUDA compiling %s ({reason})" % kernel.ljust(16)) -+ print(" "+" ".join(f"{x!r}" for x in kbuild_cmd)) -+ nvcc_commands.append(kbuild_cmd) - #parallel build: - nvcc_errors = [] -- def nvcc_compile(cmd): -- c, stdout, stderr = get_status_output(cmd) -+ def nvcc_compile(nvcc_cmd): -+ c, stdout, stderr = get_status_output(nvcc_cmd) - if c!=0: - nvcc_errors.append(c) -- print("Error: failed to compile CUDA kernel %s" % kernel) -- print(" using command: %s" % (cmd,)) -+ print(f"Error: failed to compile CUDA kernel {kernel}") -+ print(f" using command: {nvcc_cmd}") - print(stdout or "") - print(stderr or "") - nvcc_threads = [] -@@ -2186,8 +2202,17 @@ def nvcc_compile(cmd): - if nvcc_errors: - sys.exit(1) - t.join() -+ add_data_files(CUDA_BIN, [f"fs/share/xpra/cuda/{x}.fatbin" for x in kernels]) -+ add_data_files(CUDA_BIN, ["fs/share/xpra/cuda/README.md"]) -+ if WIN32 and (nvjpeg_encoder_ENABLED or nvjpeg_decoder_ENABLED or nvenc_ENABLED): -+ assert nvcc_versions -+ CUDA_BIN_DIR = os.path.dirname(nvcc) -+ add_data_files("", glob.glob(f"{CUDA_BIN_DIR}/cudart64*dll")) -+ #if pycuda is built with curand, add this: -+ #add_data_files("", glob.glob(f"{CUDA_BIN_DIR}/curand64*dll")) -+ if nvjpeg_encoder_ENABLED or nvjpeg_decoder_ENABLED: -+ add_data_files("", glob.glob(f"{CUDA_BIN_DIR}/nvjpeg64*dll")) - -- add_data_files(CUDA_BIN, ["fs/share/xpra/cuda/%s.fatbin" % x for x in kernels]) - add_data_files(CUDA_BIN, ["fs/share/xpra/cuda/README.md"]) - - tace(nvenc_ENABLED, "xpra.codecs.nvenc.encoder", "nvenc") diff --git a/xpra.spec b/xpra.spec index 96c97c0..d531f43 100644 --- a/xpra.spec +++ b/xpra.spec @@ -44,14 +44,13 @@ Name: xpra Version: 4.4.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ Source0: https://github.com/Xpra-org/xpra/archive/refs/tags/v%{version}/%{name}-%{version}.tar.gz # Appdata file for Fedora Source1: %{name}.appdata.xml -Patch2: %{name}-bug3693.patch BuildRequires: python3-devel BuildRequires: gtk3-devel @@ -73,7 +72,7 @@ BuildRequires: pandoc # needs by setup.py to detect systemd `sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd")` BuildRequires: systemd-devel %if 0%{?fedora} -BuildRequires: pkgconfig(libprocps) +BuildRequires: procps-ng-devel %endif BuildRequires: pkgconfig(libavif) BuildRequires: pkgconfig(libqrencode) @@ -114,13 +113,14 @@ Requires: python3-ldap3 Requires: python3-rencode Requires: python3-netifaces Requires: python3-dbus +Requires: python3-numpy +Requires: python3-zeroconf Requires: dbus-x11 Requires: xmodmap Requires: xrandr Requires: xorg-x11-drv-dummy%{?_isa} Requires: xorg-x11-xauth%{?_isa} Requires: xorg-x11-server-Xorg%{?_isa} -Requires: python3-numpy Requires: gstreamer1%{?_isa} Requires: gstreamer1-plugins-base%{?_isa} Requires: gstreamer1-plugins-good%{?_isa} @@ -165,8 +165,6 @@ network bandwidth constraints. %prep %autosetup -n %{name}-%{version} -N -%patch2 -p1 -R -b .backup - # cc1: error: unrecognized compiler option ‘-mfpmath=387’ %ifarch %{arm} sed -i 's|-mfpmath=387|-mfloat-abi=hard|' setup.py @@ -218,7 +216,7 @@ install -pm 644 fs/etc/xpra/nvenc.keys %{buildroot}%{_sysconfdir}/xpra #remove doc stuff from /usr/share rm %{buildroot}%{_datadir}/xpra/COPYING -#fi shebangs from python3_sitearch +#fix shebangs from python3_sitearch for i in `ack -rl '^#!/.*python' %{buildroot}%{python3_sitearch}/xpra`; do %py3_shebang_fix $i chmod 0755 $i @@ -301,6 +299,11 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Mon Mar 13 2023 Sérgio Basto - 4.4.3-4 +- Add python3-zeroconf to requires, we need to see if it iwe choose be just + recommend +- xpra-bug3693.patch already available in source code + * Wed Jan 18 2023 Sérgio Basto - 4.4.3-3 - Fix epel builds, seems upstream sort out py3cairo hack on el8 - el8 now also have xorg-x11-drv-dummy From cc9ebaeb09b6c599f8ac403f3d4e0bf7982af76e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 13 Mar 2023 16:18:47 +0000 Subject: [PATCH 198/267] Add python3-zeroconf to requires, we need to see if it iwe choose be just recommend xpra-bug3693.patch already available in source code --- xpra-bug3693.patch | 272 --------------------------------------------- xpra.spec | 17 +-- 2 files changed, 10 insertions(+), 279 deletions(-) delete mode 100644 xpra-bug3693.patch diff --git a/xpra-bug3693.patch b/xpra-bug3693.patch deleted file mode 100644 index cc2a0e3..0000000 --- a/xpra-bug3693.patch +++ /dev/null @@ -1,272 +0,0 @@ -From 23b2c55737ca8b368197f01cc547d5439c84b862 Mon Sep 17 00:00:00 2001 -From: totaam -Date: Sun, 27 Nov 2022 21:19:47 +0700 -Subject: [PATCH] make sure to include cuda libs when needed - -(on MS Windows) ---- - setup.py | 187 +++++++++++++++++++++++++++++++------------------------ - 1 file changed, 106 insertions(+), 81 deletions(-) - -diff --git a/setup.py b/setup.py -index fc5831cdc..22a2256b8 100755 ---- a/setup.py -+++ b/setup.py -@@ -1503,7 +1503,7 @@ def add_service_exe(script, icon, base_name): - add_console_exe("xpra/codecs/nv_util.py", "nvidia.ico", "NVidia_info") - if nvfbc_ENABLED: - add_console_exe("xpra/codecs/nvfbc/capture.py", "nvidia.ico", "NvFBC_capture") -- if nvfbc_ENABLED or nvenc_ENABLED: -+ if nvfbc_ENABLED or nvenc_ENABLED or nvjpeg_encoder_ENABLED or nvjpeg_decoder_ENABLED: - add_console_exe("xpra/codecs/cuda_common/cuda_context.py", "cuda.ico", "CUDA_info") - - if ("install_exe" in sys.argv) or ("install" in sys.argv): -@@ -2043,22 +2043,18 @@ def add_cython_ext(*_args, **_kwargs): - toggle_packages(nvenc_ENABLED or nvfbc_ENABLED, "xpra.codecs.cuda_common") - toggle_packages(nvenc_ENABLED or nvfbc_ENABLED, "xpra.codecs.nv_util") - --CUDA_BIN = "%s/cuda" % share_xpra --if (nvenc_ENABLED and cuda_kernels_ENABLED) or nvjpeg_encoder_ENABLED: -+nvidia_ENABLED = nvenc_ENABLED or nvfbc_ENABLED or nvjpeg_encoder_ENABLED or nvjpeg_decoder_ENABLED -+toggle_packages(nvidia_ENABLED, "xpra.codecs.nvidia") -+if nvidia_ENABLED: -+ CUDA_BIN = f"{share_xpra}/cuda" - #find nvcc: -- from xpra.util import sorted_nicely -+ from xpra.util import sorted_nicely # pylint: disable=import-outside-toplevel - path_options = os.environ.get("PATH", "").split(os.path.pathsep) - if WIN32: -- external_includes += ["pycuda"] -+ external_includes.append("pycuda") - nvcc_exe = "nvcc.exe" - CUDA_DIR = os.environ.get("CUDA_DIR", "C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA") -- path_options += ["./cuda/bin/"]+list(reversed(sorted_nicely(glob.glob("%s\\*\\bin" % CUDA_DIR)))) -- #pycuda may link against curand, find it and ship it: -- for p in path_options: -- if os.path.exists(p): -- add_data_files("", glob.glob("%s\\curand64*.dll" % p)) -- add_data_files("", glob.glob("%s\\cudart64*.dll" % p)) -- break -+ path_options += ["./cuda/bin/"]+list(reversed(sorted_nicely(glob.glob(f"{CUDA_DIR}\\*\\bin")))) - else: - nvcc_exe = "nvcc" - path_options += ["/usr/local/cuda/bin", "/opt/cuda/bin"] -@@ -2066,12 +2062,9 @@ def add_cython_ext(*_args, **_kwargs): - path_options += list(reversed(sorted_nicely(glob.glob("/opt/cuda*/bin")))) - options = [os.path.join(x, nvcc_exe) for x in path_options] - #prefer the one we find on the $PATH, if any: -- try: -- v = shutil.which(nvcc_exe) -- if v and (v not in options): -- options.insert(0, v) -- except: -- pass -+ v = shutil.which(nvcc_exe) -+ if v and (v not in options): -+ options.insert(0, v) - nvcc_versions = {} - def get_nvcc_version(command): - if not os.path.exists(command): -@@ -2082,30 +2075,94 @@ def get_nvcc_version(command): - vpos = out.rfind(", V") - if vpos>0: - version = out[vpos+3:].split("\n")[0] -- version_str = " version %s" % version -+ version_str = f" version {version}" - else: - version = "0" - version_str = " unknown version!" -- print("found CUDA compiler: %s%s" % (filename, version_str)) -+ print(f"found CUDA compiler: {filename}{version_str}") - return tuple(int(x) for x in version.split(".")) - for filename in options: - vnum = get_nvcc_version(filename) - if vnum: - nvcc_versions[vnum] = filename -+ nvcc_version = nvcc = None - if nvcc_versions: - #choose the most recent one: - nvcc_version, nvcc = list(reversed(sorted(nvcc_versions.items())))[0] - if len(nvcc_versions)>1: -- print(" using version %s from %s" % (nvcc_version, nvcc)) -- else: -- nvcc_version = nvcc = None -- if ((nvenc_ENABLED or nvjpeg_encoder_ENABLED) and cuda_kernels_ENABLED): -- assert nvcc_versions, "cannot find nvcc compiler!" -+ print(f" using version {nvcc_version} from {nvcc}") -+ if cuda_kernels_ENABLED and (nvenc_ENABLED or nvjpeg_encoder_ENABLED): -+ def get_gcc_version(): -+ if CC_is_clang(): -+ return (0, ) -+ cc = os.environ.get("CC", "gcc") -+ r, _, err = get_status_output([cc, "-v"]) -+ if r==0: -+ V_LINE = "gcc version " -+ tmp_version = [] -+ for line in err.splitlines(): -+ if not line.startswith(V_LINE): -+ continue -+ v_str = line[len(V_LINE):].strip().split(" ")[0] -+ for p in v_str.split("."): -+ try: -+ tmp_version.append(int(p)) -+ except ValueError: -+ break -+ print("found gcc version: %s" % ".".join(str(x) for x in tmp_version)) -+ break -+ return tuple(tmp_version) -+ return (0, ) -+ assert nvcc, "cannot find nvcc compiler!" -+ def get_nvcc_args(): -+ nvcc_cmd = [nvcc, "-fatbin"] -+ gcc_version = get_gcc_version() -+ if gcc_version<(7, 5): -+ print("gcc versions older than 7.5 are not supported!") -+ for _ in range(5): -+ sleep(1) -+ print(".") -+ if (8,1)<=gcc_version<(9, ): -+ #GCC 8.1 has compatibility issues with CUDA 9.2, -+ #so revert to C++03: -+ nvcc_cmd.append("-std=c++03") -+ #GCC 6 uses C++11 by default: -+ else: -+ nvcc_cmd.append("-std=c++11") -+ if gcc_version>=(12, 0) or CC_is_clang(): -+ nvcc_cmd.append("--allow-unsupported-compiler") -+ if nvcc_version>=(11, 5): -+ nvcc_cmd += ["-arch=all", -+ "-Wno-deprecated-gpu-targets", -+ ] -+ if nvcc_version>=(11, 6): -+ nvcc_cmd += ["-Xnvlink", "-ignore-host-info"] -+ return nvcc_cmd -+ #older versions, add every arch we know about: -+ comp_code_options = [] -+ if nvcc_version>=(7, 5): -+ comp_code_options.append((52, 52)) -+ comp_code_options.append((53, 53)) -+ if nvcc_version>=(8, 0): -+ comp_code_options.append((60, 60)) -+ comp_code_options.append((61, 61)) -+ comp_code_options.append((62, 62)) -+ if nvcc_version>=(9, 0): -+ comp_code_options.append((70, 70)) -+ if nvcc_version>=(10, 0): -+ comp_code_options.append((75, 75)) -+ if nvcc_version>=(11, 0): -+ comp_code_options.append((80, 80)) -+ if nvcc_version>=(11, 1): -+ comp_code_options.append((86, 86)) -+ #if nvcc_version>=(11, 6): -+ # comp_code_options.append((87, 87)) -+ for arch, code in comp_code_options: -+ nvcc_cmd.append(f"-gencode=arch=compute_{arch},code=sm_{code}") -+ return nvcc_cmd -+ nvcc_args = get_nvcc_args() - #first compile the cuda kernels - #(using the same cuda SDK for both nvenc modules for now..) -- #TODO: -- # * compile directly to output directory instead of using data files? -- # * detect which arches we want to build for? (does it really matter much?) - kernels = [] - if nvenc_ENABLED: - kernels += ["XRGB_to_NV12", "XRGB_to_YUV444", "BGRX_to_NV12", "BGRX_to_YUV444"] -@@ -2113,67 +2170,26 @@ def get_nvcc_version(command): - kernels += ["BGRX_to_RGB", "RGBX_to_RGB", "RGBA_to_RGBAP", "BGRA_to_RGBAP"] - nvcc_commands = [] - for kernel in kernels: -- cuda_src = "fs/share/xpra/cuda/%s.cu" % kernel -- cuda_bin = "fs/share/xpra/cuda/%s.fatbin" % kernel -+ cuda_src = f"fs/share/xpra/cuda/{kernel}.cu" -+ cuda_bin = f"fs/share/xpra/cuda/{kernel}.fatbin" - if os.path.exists(cuda_bin) and (cuda_rebuild_ENABLED is False): - continue - reason = should_rebuild(cuda_src, cuda_bin) - if not reason: - continue -- print("rebuilding %s: %s" % (kernel, reason)) -- cmd = [nvcc, -- '-fatbin', -- "-c", cuda_src, -- "-o", cuda_bin] -- gcc_version = get_gcc_version() -- if (8,1)<=gcc_version<(9, ): -- #GCC 8.1 has compatibility issues with CUDA 9.2, -- #so revert to C++03: -- cmd.append("-std=c++03") -- #GCC 6 uses C++11 by default: -- else: -- cmd.append("-std=c++11") -- if gcc_version>=(12, 0) or CC_is_clang(): -- cmd.append("--allow-unsupported-compiler") -- if nvcc_version>=(11, 5): -- cmd += ["-arch=all", -- "-Wno-deprecated-gpu-targets", -- ] -- if nvcc_version>=(11, 6): -- cmd += ["-Xnvlink", "-ignore-host-info"] -- else: -- comp_code_options = [] -- if nvcc_version>=(7, 5): -- comp_code_options.append((52, 52)) -- comp_code_options.append((53, 53)) -- if nvcc_version>=(8, 0): -- comp_code_options.append((60, 60)) -- comp_code_options.append((61, 61)) -- comp_code_options.append((62, 62)) -- if nvcc_version>=(9, 0): -- comp_code_options.append((70, 70)) -- if nvcc_version>=(10, 0): -- comp_code_options.append((75, 75)) -- if nvcc_version>=(11, 0): -- comp_code_options.append((80, 80)) -- if nvcc_version>=(11, 1): -- comp_code_options.append((86, 86)) -- #if nvcc_version>=(11, 6): -- # comp_code_options.append((87, 87)) -- for arch, code in comp_code_options: -- cmd.append("-gencode=arch=compute_%s,code=sm_%s" % (arch, code)) -- print("CUDA compiling %s (%s)" % (kernel.ljust(16), reason)) -- print(" %s" % " ".join("'%s'" % x for x in cmd)) -- nvcc_commands.append(cmd) -- -+ print(f"rebuilding {kernel}: {reason}") -+ kbuild_cmd = nvcc_args + ["-c", cuda_src, "-o", cuda_bin] -+ print(f"CUDA compiling %s ({reason})" % kernel.ljust(16)) -+ print(" "+" ".join(f"{x!r}" for x in kbuild_cmd)) -+ nvcc_commands.append(kbuild_cmd) - #parallel build: - nvcc_errors = [] -- def nvcc_compile(cmd): -- c, stdout, stderr = get_status_output(cmd) -+ def nvcc_compile(nvcc_cmd): -+ c, stdout, stderr = get_status_output(nvcc_cmd) - if c!=0: - nvcc_errors.append(c) -- print("Error: failed to compile CUDA kernel %s" % kernel) -- print(" using command: %s" % (cmd,)) -+ print(f"Error: failed to compile CUDA kernel {kernel}") -+ print(f" using command: {nvcc_cmd}") - print(stdout or "") - print(stderr or "") - nvcc_threads = [] -@@ -2186,8 +2202,17 @@ def nvcc_compile(cmd): - if nvcc_errors: - sys.exit(1) - t.join() -+ add_data_files(CUDA_BIN, [f"fs/share/xpra/cuda/{x}.fatbin" for x in kernels]) -+ add_data_files(CUDA_BIN, ["fs/share/xpra/cuda/README.md"]) -+ if WIN32 and (nvjpeg_encoder_ENABLED or nvjpeg_decoder_ENABLED or nvenc_ENABLED): -+ assert nvcc_versions -+ CUDA_BIN_DIR = os.path.dirname(nvcc) -+ add_data_files("", glob.glob(f"{CUDA_BIN_DIR}/cudart64*dll")) -+ #if pycuda is built with curand, add this: -+ #add_data_files("", glob.glob(f"{CUDA_BIN_DIR}/curand64*dll")) -+ if nvjpeg_encoder_ENABLED or nvjpeg_decoder_ENABLED: -+ add_data_files("", glob.glob(f"{CUDA_BIN_DIR}/nvjpeg64*dll")) - -- add_data_files(CUDA_BIN, ["fs/share/xpra/cuda/%s.fatbin" % x for x in kernels]) - add_data_files(CUDA_BIN, ["fs/share/xpra/cuda/README.md"]) - - tace(nvenc_ENABLED, "xpra.codecs.nvenc.encoder", "nvenc") diff --git a/xpra.spec b/xpra.spec index 5fab20f..6f3ed66 100644 --- a/xpra.spec +++ b/xpra.spec @@ -44,14 +44,13 @@ Name: xpra Version: 4.4.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ Source0: https://github.com/Xpra-org/xpra/archive/refs/tags/v%{version}/%{name}-%{version}.tar.gz # Appdata file for Fedora Source1: %{name}.appdata.xml -Patch2: %{name}-bug3693.patch BuildRequires: python3-devel BuildRequires: gtk3-devel @@ -73,7 +72,7 @@ BuildRequires: pandoc # needs by setup.py to detect systemd `sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd")` BuildRequires: systemd-devel %if 0%{?fedora} -BuildRequires: pkgconfig(libprocps) +BuildRequires: procps-ng-devel %endif BuildRequires: pkgconfig(libavif) BuildRequires: pkgconfig(libqrencode) @@ -114,13 +113,14 @@ Requires: python3-ldap3 Requires: python3-rencode Requires: python3-netifaces Requires: python3-dbus +Requires: python3-numpy +Requires: python3-zeroconf Requires: dbus-x11 Requires: xmodmap Requires: xrandr Requires: xorg-x11-drv-dummy%{?_isa} Requires: xorg-x11-xauth%{?_isa} Requires: xorg-x11-server-Xorg%{?_isa} -Requires: python3-numpy Requires: gstreamer1%{?_isa} Requires: gstreamer1-plugins-base%{?_isa} Requires: gstreamer1-plugins-good%{?_isa} @@ -165,8 +165,6 @@ network bandwidth constraints. %prep %autosetup -n %{name}-%{version} -N -%patch2 -p1 -R -b .backup - # cc1: error: unrecognized compiler option ‘-mfpmath=387’ %ifarch %{arm} sed -i 's|-mfpmath=387|-mfloat-abi=hard|' setup.py @@ -218,7 +216,7 @@ install -pm 644 fs/etc/xpra/nvenc.keys %{buildroot}%{_sysconfdir}/xpra #remove doc stuff from /usr/share rm %{buildroot}%{_datadir}/xpra/COPYING -#fi shebangs from python3_sitearch +#fix shebangs from python3_sitearch for i in `ack -rl '^#!/.*python' %{buildroot}%{python3_sitearch}/xpra`; do %py3_shebang_fix $i chmod 0755 $i @@ -301,6 +299,11 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Mon Mar 13 2023 Sérgio Basto - 4.4.3-6 +- Add python3-zeroconf to requires, we need to see if it iwe choose be just + recommend +- xpra-bug3693.patch already available in source code + * Wed Feb 15 2023 Tom Callaway - 4.4.3-5 - rebuild for libvpx From 87e1e203f87e20080709c0e71718770f2ccdab99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 13 Mar 2023 18:44:16 +0000 Subject: [PATCH 199/267] Update xpra to 4.4.4 (#2177195) --- .gitignore | 1 + ignore_assert_pandoc.patch | 41 ++++++++++++++++++++++++++++++++++++++ sources | 2 +- xpra.spec | 10 +++++++--- 4 files changed, 50 insertions(+), 4 deletions(-) create mode 100644 ignore_assert_pandoc.patch diff --git a/.gitignore b/.gitignore index ce68d1d..16258a5 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,4 @@ /xpra-4.4.1.tar.gz /xpra-4.4.2.tar.gz /xpra-4.4.3.tar.gz +/xpra-4.4.4.tar.gz diff --git a/ignore_assert_pandoc.patch b/ignore_assert_pandoc.patch new file mode 100644 index 0000000..ceacee9 --- /dev/null +++ b/ignore_assert_pandoc.patch @@ -0,0 +1,41 @@ +only on ppc64le pandoc returns -11 + + Debian.md -> Debian.html +Traceback (most recent call last): + File "/builddir/build/BUILD/xpra-4.4.4/setup.py", line 2384, in + main() + File "/builddir/build/BUILD/xpra-4.4.4/setup.py", line 2380, in main + setup(**setup_options) + File "/usr/lib64/python3.11/distutils/core.py", line 148, in setup + dist.run_commands() + File "/usr/lib64/python3.11/distutils/dist.py", line 966, in run_commands + self.run_command(cmd) + File "/usr/lib64/python3.11/distutils/dist.py", line 985, in run_command + cmd_obj.run() + File "/usr/lib64/python3.11/distutils/command/install.py", line 584, in run + self.run_command(cmd_name) + File "/usr/lib64/python3.11/distutils/cmd.py", line 313, in run_command + self.distribution.run_command(command) + File "/usr/lib64/python3.11/distutils/dist.py", line 985, in run_command + cmd_obj.run() + File "/builddir/build/BUILD/xpra-4.4.4/setup.py", line 1810, in run + convert_doc_dir("./docs", doc_dir) + File "/builddir/build/BUILD/xpra-4.4.4/setup.py", line 423, in convert_doc_dir + convert_doc_dir(fsrc, fdst, fmt, force) + File "/builddir/build/BUILD/xpra-4.4.4/setup.py", line 426, in convert_doc_dir + convert_doc(fsrc, fdst, fmt, force) + File "/builddir/build/BUILD/xpra-4.4.4/setup.py", line 413, in convert_doc + assert r==0, "'%s' returned %s" % (" ".join(cmd), r) + ^^^^ +AssertionError: 'pandoc --from markdown --to html -o /builddir/build/BUILDROOT/xpra-4.4.4-1.fc38.ppc64le/usr/share/doc/xpra/Build/Debian.html ./docs/Build/Debian.md --lua-filter ./fs/bin/links-to-html.lua' returned -11 +--- ./setup.py.orig 2023-03-13 17:59:39.193977373 +0000 ++++ ./setup.py 2023-03-13 17:59:48.477944801 +0000 +@@ -410,7 +410,7 @@ def convert_doc(fsrc, fdst, fmt="html", + else: + cmd += ["--lua-filter", "./fs/bin/links-to-html.lua"] + r = subprocess.Popen(cmd).wait(30) +- assert r==0, "'%s' returned %s" % (" ".join(cmd), r) ++ #assert r==0, "'%s' returned %s" % (" ".join(cmd), r) + + def convert_doc_dir(src, dst, fmt="html", force=False): + print("%-20s -> %s" % (src, dst)) diff --git a/sources b/sources index c47b01d..b2b8e1c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-4.4.3.tar.gz) = db1815ce3b2220b7494ebaac22bf94df264fd440cf9d57a9088d29afe24481895de0633f70dc0f4f7ca3566454d6febe015d68339efb0b206564acc35ec672d2 +SHA512 (xpra-4.4.4.tar.gz) = b2e5928bcf9a483fdb5c3096206e26b5bab690bfa2190b2c17ea43986cf53e4584546b2f5af7d3c63798096b648ec2f843d82a4bfd74719f3cf1f3c8cadaf9b7 diff --git a/xpra.spec b/xpra.spec index 6f3ed66..ff33f78 100644 --- a/xpra.spec +++ b/xpra.spec @@ -43,14 +43,15 @@ %endif Name: xpra -Version: 4.4.3 -Release: 6%{?dist} +Version: 4.4.4 +Release: 1%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ Source0: https://github.com/Xpra-org/xpra/archive/refs/tags/v%{version}/%{name}-%{version}.tar.gz # Appdata file for Fedora Source1: %{name}.appdata.xml +Patch1: ignore_assert_pandoc.patch BuildRequires: python3-devel BuildRequires: gtk3-devel @@ -163,7 +164,7 @@ Xpra is usable over reasonably slow links and does its best to adapt to changing network bandwidth constraints. %prep -%autosetup -n %{name}-%{version} -N +%autosetup -p1 -n %{name}-%{version} # cc1: error: unrecognized compiler option ‘-mfpmath=387’ %ifarch %{arm} @@ -299,6 +300,9 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Mon Mar 13 2023 Sérgio Basto - 4.4.4-1 +- Update xpra to 4.4.4 (#2177195) + * Mon Mar 13 2023 Sérgio Basto - 4.4.3-6 - Add python3-zeroconf to requires, we need to see if it iwe choose be just recommend From 4ed00855f372e205e12c7448422ce1894950e82d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Mon, 22 May 2023 15:48:17 +0100 Subject: [PATCH 200/267] Fix epel 8 and 9 builds , no python3-zeroconf on epel and use pipewire on el9 --- xpra.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/xpra.spec b/xpra.spec index ff33f78..0ca9023 100644 --- a/xpra.spec +++ b/xpra.spec @@ -44,7 +44,7 @@ Name: xpra Version: 4.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -115,7 +115,9 @@ Requires: python3-rencode Requires: python3-netifaces Requires: python3-dbus Requires: python3-numpy +%if 0%{?fedora} Requires: python3-zeroconf +%endif Requires: dbus-x11 Requires: xmodmap Requires: xrandr @@ -125,7 +127,7 @@ Requires: xorg-x11-server-Xorg%{?_isa} Requires: gstreamer1%{?_isa} Requires: gstreamer1-plugins-base%{?_isa} Requires: gstreamer1-plugins-good%{?_isa} -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 9 Requires: pipewire%{?_isa} Requires: pipewire-utils%{?_isa} Requires: pipewire-pulseaudio%{?_isa} @@ -300,12 +302,14 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog +* Mon May 22 2023 Sérgio Basto - 4.4.4-2 +- Fix epel 8 and 9 builds , no python3-zeroconf on epel and use pipewire on el9 + * Mon Mar 13 2023 Sérgio Basto - 4.4.4-1 - Update xpra to 4.4.4 (#2177195) * Mon Mar 13 2023 Sérgio Basto - 4.4.3-6 -- Add python3-zeroconf to requires, we need to see if it iwe choose be just - recommend +- Add python3-zeroconf to the requires, we need to see if we choose to be recommend only - xpra-bug3693.patch already available in source code * Wed Feb 15 2023 Tom Callaway - 4.4.3-5 From 19677b8b6bd0ed76a2c6abbc59eefd02363c2579 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sat, 27 May 2023 19:53:57 +0200 Subject: [PATCH 201/267] Release 4.4.5 --- .gitignore | 1 + sources | 2 +- xpra.spec | 669 +---------------------------------------------------- 3 files changed, 5 insertions(+), 667 deletions(-) diff --git a/.gitignore b/.gitignore index 16258a5..5c06611 100644 --- a/.gitignore +++ b/.gitignore @@ -81,3 +81,4 @@ /xpra-4.4.2.tar.gz /xpra-4.4.3.tar.gz /xpra-4.4.4.tar.gz +/xpra-4.4.5.tar.gz diff --git a/sources b/sources index b2b8e1c..cd7ef36 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-4.4.4.tar.gz) = b2e5928bcf9a483fdb5c3096206e26b5bab690bfa2190b2c17ea43986cf53e4584546b2f5af7d3c63798096b648ec2f843d82a4bfd74719f3cf1f3c8cadaf9b7 +SHA512 (xpra-4.4.5.tar.gz) = 518f52dddd59aa958aaa31bca9e87e1eb55755760307342c6d95693e886c6a4adba1906513f3dcb015f0b2a4b12890760169b8e5afccdbd2007ca75fc227b536 diff --git a/xpra.spec b/xpra.spec index 0ca9023..d034413 100644 --- a/xpra.spec +++ b/xpra.spec @@ -43,8 +43,8 @@ %endif Name: xpra -Version: 4.4.4 -Release: 2%{?dist} +Version: 4.4.5 +Release: %autorelease Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT URL: https://www.xpra.org/ @@ -302,667 +302,4 @@ getent group xpra >/dev/null || groupadd -r xpra %{_udevrulesdir}/71-xpra-virtual-pointer.rules %changelog -* Mon May 22 2023 Sérgio Basto - 4.4.4-2 -- Fix epel 8 and 9 builds , no python3-zeroconf on epel and use pipewire on el9 - -* Mon Mar 13 2023 Sérgio Basto - 4.4.4-1 -- Update xpra to 4.4.4 (#2177195) - -* Mon Mar 13 2023 Sérgio Basto - 4.4.3-6 -- Add python3-zeroconf to the requires, we need to see if we choose to be recommend only -- xpra-bug3693.patch already available in source code - -* Wed Feb 15 2023 Tom Callaway - 4.4.3-5 -- rebuild for libvpx - -* Sat Jan 21 2023 Fedora Release Engineering - 4.4.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jan 18 2023 Sérgio Basto - 4.4.3-3 -- Fix epel builds, seems upstream sort out py3cairo hack on el8 -- el8 now also have xorg-x11-drv-dummy - -* Sun Jan 08 2023 Sérgio Basto - 4.4.3-2 -- Add unitdir, we may have unitdir but by default disabled, preset just enable service by default which understandably was not approved. - to check presets run `systemctl status xpra | grep preset` -- Un-split xpra-udev and other improvements -- Add support to procps, avif, qrencode, libdrm and libwebp - -* Thu Dec 08 2022 Antonio Trande - 4.4.3-1 -- Release 4.4.3 -- Disable CUDA rebuilds - -* Sun Nov 13 2022 Antonio Trande - 4.4.2-1 -- Release 4.4.2 - -* Mon Oct 24 2022 Antonio Trande - 4.4.1-1 -- Release 4.4.1 - -* Sat Oct 01 2022 Antonio Trande - 4.4-1 -- Release 4.4 - -* Sat Jul 23 2022 Fedora Release Engineering - 4.3.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sun Jun 26 2022 Antonio Trande - 4.3.4-1 -- Release 4.3.4 - -* Fri Apr 29 2022 Antonio Trande - 4.3.3-1 -- Release 4.3.3 - -* Wed Feb 16 2022 Sérgio Basto - 4.3.2-1 -- Update xpra to 4.3.2 - -* Thu Jan 27 2022 Tom Callaway - 4.3.1-3 -- rebuild for libvpx - -* Sat Jan 22 2022 Fedora Release Engineering - 4.3.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Jan 04 2022 Antonio Trande - 4.3.1-1 -- Release 4.3.1 - -* Fri Dec 17 2021 Antonio Trande - 4.3.0-1 -- Release 4.3 - -* Wed Oct 06 2021 Antonio Trande - 4.2.3-1 -- Release 4.2.3 - -* Thu Aug 12 2021 Antonio Trande - 4.2.2-1 -- Release 4.2.2 - -* Fri Jul 23 2021 Fedora Release Engineering - 4.2.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sun Jul 11 2021 Antonio Trande - 4.2.1-1 -- Release 4.2.1 - -* Fri Jun 04 2021 Python Maint - 4.2-2 -- Rebuilt for Python 3.10 - -* Sat May 22 2021 Antonio Trande - 4.2-1 -- Release 4.2 - -* Sun May 16 2021 Antonio Trande - 4.1.3-2 -- Switch from pulseaudio to pipewire (rhbz#1960903) - -* Wed Apr 21 2021 Antonio Trande - 4.1.3-1 -- Release 4.1.3 - -* Tue Apr 06 2021 Antonio Trande - 4.1.2-1 -- Release 4.1.2 - -* Sun Mar 07 2021 Antonio Trande - 4.1.1-1 -- Release 4.1.1 - -* Wed Mar 03 2021 Antonio Trande - 4.1-2 -- Fix epel8 builds - -* Mon Mar 01 2021 Antonio Trande - 4.1-1 -- Release 4.1 - -* Thu Jan 28 2021 Fedora Release Engineering - 4.0.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Jan 14 2021 Antonio Trande - 4.0.6-2 -- Fix rhbz#1916026 - -* Thu Dec 31 2020 Antonio Trande - 4.0.6-1 -- Release 4.0.6 - -* Wed Nov 18 2020 Antonio Trande - 4.0.5-2 -- Fix BR packages for epel8 - -* Wed Nov 18 2020 Antonio Trande - 4.0.5-1 -- Release 4.0.5 - -* Mon Sep 28 2020 Antonio Trande - 4.0.4-1 -- Release 4.0.4 - -* Sat Aug 08 2020 Antonio Trande - 4.0.3-1 -- Release 4.0.3 - -* Wed Aug 05 2020 Antonio Trande - 4.0.2-4 -- Requires xmodmap xrandr without %%?_isa wrapper (rhbz#1864529) - -* Tue Jul 28 2020 Adam Jackson - 4.0.2-3 -- Requires xmodmap xrandr, not xorg-x11-server-utils - -* Thu Jul 16 2020 Antonio Trande - 4.0.2-2 -- Built on EPEL8 -- Drop (obsolete) python-websockify dependency -- Add MPLv2.0 LICENSE file for HTML5 version - -* Fri Jun 05 2020 Antonio Trande - 4.0.2-1 -- Release 4.0.2 - -* Tue May 26 2020 Miro Hrončok - 4.0.1-2 -- Rebuilt for Python 3.9 - -* Sun May 17 2020 Antonio Trande - 4.0.1-1 -- Release 4.0.1 - -* Fri May 15 2020 Antonio Trande - 4.0-2 -- Remove uglify-js - -* Sun May 10 2020 Antonio Trande - 4.0-1 -- Release 4.0 - -* Tue Apr 14 2020 Antonio Trande - 3.0.9-1 -- Release 3.0.9 - -* Thu Apr 02 2020 Antonio Trande - 3.0.8-1 -- Release 3.0.8 - -* Sat Mar 14 2020 Antonio Trande - 3.0.7-2 -- Add PAM support (rhbz#1812903) - -* Sat Mar 14 2020 Antonio Trande - 3.0.7-1 -- Release 3.0.7 - -* Wed Feb 12 2020 Antonio Trande - 3.0.6-2 -- Fix symlinks to js-jquery (rhbz#1801878) - -* Sat Feb 08 2020 Antonio Trande - 3.0.6-1 -- Release 3.0.6 - -* Fri Jan 31 2020 Fedora Release Engineering - 3.0.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jan 10 2020 Antonio Trande - 3.0.5-1 -- Release 3.0.5 - -* Thu Dec 12 2019 Antonio Trande - 3.0.3-1 -- Release 3.0.3 - -* Tue Nov 05 2019 Antonio Trande - 3.0.2-1 -- Release 3.0.2 - -* Sat Nov 02 2019 Sérgio Basto - 3.0.1-3 -- Use %%{_sysusersdir} to fix rpmlint E: hardcoded-library-path - -* Fri Nov 01 2019 Antonio Trande - 3.0.1-2 -- Create /run/xpra (rhbz#1381005) - -* Mon Oct 28 2019 Antonio Trande - 3.0.1-1 -- Release 3.0.1 - -* Wed Oct 02 2019 Antonio Trande - 3.0-1 -- Release 3.0 - -* Tue Sep 24 2019 Sérgio Basto - 2.5.3-4 -- BR: the new python3-gobject-devel instead pygobject3-devel (#1749589) - -* Thu Sep 05 2019 Sérgio Basto - 2.5.3-3 -- Remove BR: pygtk2-devel and Requires: pygtkglext (#1738465) - -* Mon Aug 19 2019 Miro Hrončok - 2.5.3-2 -- Rebuilt for Python 3.8 - -* Thu Jul 25 2019 Antonio Trande - 2.5.3-1 -- Release to 2.5.3 -- Switch to Python3 definitively - -* Sat Jun 08 2019 Antonio Trande - 2.5.2-1 -- Release to 2.5.2 - -* Thu Apr 18 2019 Antonio Trande - 2.5.1-1 -- Release to 2.5.1 - -* Wed Mar 20 2019 Antonio Trande - 2.5.0-1 -- Release to 2.5.0 -- Switch to Python3 on Fedora 29+ - -* Tue Feb 05 2019 Björn Esser - 2.4.3-3 -- Rebuilt (libvpx) - -* Sun Feb 03 2019 Fedora Release Engineering - 2.4.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jan 17 2019 Antonio Trande - 2.4.3-1 -- Update to 2.4.3 - -* Mon Nov 26 2018 Antonio Trande - 2.4.2-2 -- Add inotify dependency (rhbz#1653096) - -* Fri Nov 23 2018 Antonio Trande - 2.4.2-1 -- Update to 2.4.2 - -* Wed Oct 31 2018 Antonio Trande - 2.4.1-1 -- Update to 2.4.1 -- Add Python Cairo library BR - -* Mon Oct 15 2018 Antonio Trande - 2.4-1 -- Update to 2.4 - -* Sun Sep 23 2018 Antonio Trande - 2.3.4-1 -- Update to 2.3.4 - -* Sun Aug 19 2018 Antonio Trande - 2.3.3-1 -- Update to 2.3.3 - -* Sat Jul 14 2018 Fedora Release Engineering - 2.3.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Jul 05 2018 Antonio Trande - 2.3.2-3 -- SPEC file modified for EPEL7 - -* Mon Jul 02 2018 Miro Hrončok - 2.3.2-2 -- Rebuilt for Python 3.7 - -* Wed Jun 27 2018 Antonio Trande - 2.3.2-1 -- Update to 2.3.2 - -* Sun Jun 24 2018 Antonio Trande - 2.3.1-3 -- Define build conditions for debugging -- Switch back to Python2 (see xpra.org/trac/ticket/1885) (bz#1583319) - -* Sat Jun 23 2018 Antonio Trande - 2.3.1-2 -- Rebuilt for Python 3.7 -- Use --without-strict option - -* Wed May 30 2018 Antonio Trande - 2.3.1-1 -- Update to 2.3.1 - -* Thu May 10 2018 Antonio Trande - 2.3-1 -- Update to 2.3 -- Switch to Python3 - -* Tue Apr 03 2018 Antonio Trande - 2.2.6-1 -- Update to 2.2.6 - -* Wed Mar 07 2018 Antonio Trande - 2.2.5-1 -- Update to 2.2.5 - -* Thu Feb 22 2018 Antonio Trande - 2.2.4-2 -- Add gcc BR - -* Fri Feb 09 2018 Antonio Trande - 2.2.4-1 -- Update to 2.2.4 - -* Sun Jan 28 2018 Antonio Trande - 2.2.3-5 -- Rebuild for libvpx again - -* Fri Jan 26 2018 Tom Callaway - 2.2.3-4 -- rebuild for new libvpx - -* Thu Jan 25 2018 Antonio Trande - 2.2.3-3 -- Still require python-gobject on fedora < 27 - -* Thu Jan 18 2018 Igor Gnatenko - 2.2.3-2 -- Remove obsolete scriptlets - -* Thu Jan 18 2018 Antonio Trande - 2.2.3-1 -- Update to 2.2.3 - -* Wed Jan 17 2018 Antonio Trande - 2.2.2-2 -- Fix python2-gobject as Requires package - -* Wed Jan 17 2018 Antonio Trande - 2.2.2-1 -- Update to 2.2.2 - -* Thu Dec 21 2017 Antonio Trande - 2.2.1-2 -- Remove unused directory - -* Thu Dec 21 2017 Antonio Trande - 2.2.1-1 -- Update to 2.2.1 -- Appdata file moved into metainfo data directory - -* Wed Dec 13 2017 Antonio Trande - 2.2-2 -- Fix dependency - -* Tue Dec 12 2017 Antonio Trande - 2.2-1 -- Update to 2.2 -- Split off udev files - -* Thu Oct 26 2017 Antonio Trande - 2.1.3-1 -- Update to 2.1.3 - -* Mon Sep 18 2017 Antonio Trande - 2.1.2-1 -- Update to 2.1.2 - -* Fri Aug 18 2017 Antonio Trande - 2.1.1-2 -- Fix Requires - -* Fri Aug 18 2017 Antonio Trande - 2.1.1-1 -- Update to 2.1.1 -- Replace appdata file with horrible WindowsXP image - -* Thu Aug 03 2017 Fedora Release Engineering - 2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Antonio Trande - 2.1-2 -- Fix Python2 shebang - -* Wed Jul 26 2017 Antonio Trande - 2.1-1 -- Update to 2.1 (bz#1475316) -- Drop old Werror patch -- Fix systemd files management - -* Tue Jul 04 2017 Antonio Trande - 2.0.3-1 -- Update to 2.0.3 - -* Tue May 09 2017 Antonio Trande - 2.0.2-1 -- Update to 2.0.2 -- webp option deprecated - -* Mon Feb 6 2017 Orion Poplawski - 1.0.2-1 -- Update to 1.0.2 -- Drop webp import patch applied upstream - -* Sat Dec 10 2016 Jonathan Underwood - 1.0-2 -- Disable webp by default, consistent with upstream - https://www.xpra.org/trac/ticket/1379 - -* Sat Dec 10 2016 Jonathan Underwood - 1.0-1 -- Update to version 1.0 -- No longer unbundle javascript libs - shipped versions in html4 client newer than packaged -- Enumerate all bundled js Provides properly -- Improve commentary of Werror patch -- Include all new conf files in pakcage -- Include systemd serice and add BR for systemd - -* Tue Nov 8 2016 Orion Poplawski - 0.17.6-1 -- Update to 0.17.6 -- Fix build on EPEL7 -- Use %%license - -* Sat Oct 1 2016 Jonathan Underwood - 0.17.5-2 -- Clean up some rpmlint errors -- Use %%_cups_serverbin if defined -- Use %%{_tmpfilesdir} - -* Sun Sep 11 2016 Jonathan Underwood - 0.17.5-1 -- Update to 0.17.5 - -* Sun Jul 31 2016 Jonathan Underwood - 0.17.4-1 -- Update to 0.17.4 - -* Fri Jul 22 2016 Tom Callaway - 0.16.3-5 -- rebuild for libvpx 1.6.0 - -* Tue Jul 19 2016 Fedora Release Engineering - 0.16.3-4 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Thu Apr 14 2016 Jonathan Underwood - 0.16.3-3 -- Fix deps for F22 - -* Thu Apr 14 2016 Jonathan Underwood - 0.16.3-2 -- Correctly enable use of shared sockets with the xpra group -- Require(pre) for shadow-utils -- Create xpra group during %%pre -- Create and ghost own %%{_localstatedir}/run/lightdm/ - -* Thu Mar 24 2016 Jonathan Underwood - 0.16.3-1 -- Update to 0.16.3 - -* Mon Feb 29 2016 Jonathan Underwood - 0.16.2-8 -- Properly enable opencl support on Fedora 23 -- Change PyOpenGL requires to python2-opengl on f24 and higher - -* Sun Feb 28 2016 Jonathan Underwood - 0.16.2-7 -- Change python-imaging dep to python[2]-pillow -- Change python-cups to python2-cups of F24 and higher - -* Sun Feb 28 2016 Jonathan Underwood - 0.16.2-6 -- Remove python-numeric Requires -- Change python-rencode dep to python2-rencode -- Change python-lz4 dep to python2-lz4 - -* Mon Feb 22 2016 Jonathan Underwood - 0.16.2-5 -- Fix cupslibdir macro to not spew errors during SRPM build - -* Fri Feb 19 2016 Jonathan Underwood - 0.16.2-4 -- Move icon files back into main package - -* Fri Feb 19 2016 Jonathan Underwood - 0.16.2-3 -- Drop xpra-0.16.2-move-to-var-run.patch - broken - -* Fri Feb 19 2016 Jonathan Underwood - 0.16.2-2 -- Add pyopencl Suggests for F23 -- No longer move the run script to /var/run - breaks other clients -- Use XDG_RUNTIME_DIR for socket and logs (BZ 1309872) - -* Fri Feb 19 2016 Jonathan Underwood - 0.16.2-1 -- Uodate to 0.16.2 (BZ 1301357) -- Replace gstreamer Requires with gstreamer1 Requires (BZ 1309811) -- Require python-gobject (BZ 1309811) -- No longer Require gstreamer-python (BZ 1309811) -- Require xorg-x11-xauth (BZ 1309804) -- Require dbus-x11 (BZ 1309827) - -* Fri Feb 05 2016 Fedora Release Engineering - 0.16.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jan 26 2016 Jonathan Underwood - 0.16.1-2 -- Split html5 support out into subpackage - -* Tue Jan 26 2016 Jonathan Underwood - 0.16.1-1 -- Update to 0.16.1 - -* Thu Jan 7 2016 Jonathan Underwood - 0.16.0-3 -- Re-add ~/.xpra to socket-dirs for backwards compatibility as second - in search order - -* Thu Jan 7 2016 Jonathan Underwood - 0.16.0-2 -- Add patch to Move sockets, log files, script files from ~/.xpra to - /var/run/user/$UID/xpra - -* Thu Jan 7 2016 Jonathan Underwood - 0.16.0-1 -- Update to 0.16.0 - -* Tue Dec 29 2015 Jonathan Underwood - 0.15.10-2 -- Rebuild for libwebp 0.5.0 - -* Sat Dec 19 2015 Jonathan Underwood - 0.15.10-1 -- Update to 0.15.10 - -* Wed Dec 2 2015 Jonathan Underwood - 0.15.9-1 -- Update to 0.15.9 - -* Tue Dec 1 2015 Tom Callaway - 0.15.8-3 -- rebuild for libvpx 1.5.0 - -* Mon Nov 30 2015 Jonathan Underwood - 0.15.8-2 -- Use same options for build and install -- Add csc_opencl support for Fedora 24 and later - -* Sat Nov 14 2015 Jonathan Underwood - 0.15.8-1 -- Update to 0.15.8 -- Fix typo in spec file - -* Wed Sep 16 2015 Jonathan Underwood - 0.15.7-1 -- Update to 0.15.7 -- Fix typo in spec changelog - -* Wed Sep 16 2015 Jonathan Underwood - 0.15.6-1 -- Update to 0.15.6 - -* Wed Sep 2 2015 Jonathan Underwood - 0.15.5-1 -- Update to 0.15.5 -- Drop patches related to color encoding - -* Fri Aug 21 2015 Jonathan G. Underwood - 0.15.4-4 -- Remove xpra-r10393.patch and add xpra-r10396.patch and xpra-r10399.patch - as second attempt to fix the color encoding issues - -* Fri Aug 21 2015 Jonathan G. Underwood - 0.15.4-3 -- No longer revert r9983, but include xpra-r10393.patch to fix the - color encoding - -* Wed Aug 5 2015 Jonathan G. Underwood - 0.15.4-2 -- Add patch to revert upstream commit r9983 which breaks color encodding - -* Tue Aug 4 2015 Jonathan G. Underwood - 0.15.4-1 -- Update to 0.15.4 -- Add missing release tag to previous rpm changelog entry - -* Tue Jul 14 2015 Jonathan G. Underwood - 0.15.3-1 -- Update to 0.15.3 -- Remove xpra-0.15.2-9768.patch -- Add BuildRequires for redhat-lsb-core to make lsb_release available - at build time (used to detect system type) -- Add --with-Xdummy and --with-Xdummy_wrapper to install options to - ensure Xdummy is used - -* Thu Jul 2 2015 Jonathan G. Underwood - 0.15.2-2 -- Add small fix from upsteam (rev 9768) - -* Thu Jul 2 2015 Jonathan G. Underwood - 0.15.2-1 -- Update to 0.15.2 -- Add Requires for python-lz4 and python-cups - -* Mon Jun 22 2015 Jonathan G. Underwood - 0.15.1-1 -- Update to 0.15.1 -- Add Requires shared-mime-info for (/usr/share/mime/packages ownership) -- Add /usr/share/mime/packages/application-x-xpraconfig.xml file - -* Fri Jun 19 2015 Fedora Release Engineering - 0.15.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Jun 4 2015 Jonathan G. Underwood - 0.15.0-2 -- Remove extraneous second definition of cupslibdir - -* Mon Jun 1 2015 Jonathan G. Underwood - 0.15.0-1 -- Update to 0.15.0 -- Add BuildRequires for cups-devel and Requires for cups-filesystem -- Replace mention of avcodec with avcodec2 -- Drop xpra-unbundle-rencode.patch, and no longer patch to use system - rencode -- Drop xpra-0.14-stop-using-void-driver.patch -- Drop xpra-0.14.22-fedora22-xorg.patch - -* Wed May 27 2015 Jonathan G. Underwood - 0.14.24-1 -- Update to 0.14.24 -- Remove Requires for xorg-x11-server-Xvfb -- Remove upstreamed appdata patch - -* Tue May 26 2015 Jonathan G. Underwood - 0.14.22-5 -- Add patch to correctly locate Xorg binary in Fedora 22 onwards (BZ 1224678) - -* Tue Apr 28 2015 Jonathan G. Underwood - 0.14.22-4 -- Patch appdata file to have more information and proper paragraph - ending period so validation works - -* Mon Apr 27 2015 Jonathan G. Underwood - 0.14.22-3 -- Remove Requires for xorg-x11-drv-void - -* Mon Apr 27 2015 Jonathan G. Underwood - 0.14.22-2 -- Validate and own /usr/share/appdata/xpra.appdata.xml -- Add BuildRequires libappstream-glib - -* Mon Apr 27 2015 Jonathan G. Underwood - 0.14.22-1 -- Update to 0.14.22 - -* Mon Apr 27 2015 Jonathan G. Underwood - 0.14.21-5 -- Add patch to remove reference to the xorg void driver in xorg.conf (BZ #1215527) - -* Mon Apr 6 2015 Tom Callaway - 0.14.21-4 -- rebuild for libvpx 1.4.0 - -* Tue Mar 24 2015 Jonathan G. Underwood - 0.14.21-3 -- Update license tag from GPLv2+ to GPLv2+ and BSD and LGPLv3+ and MIT - -* Mon Mar 23 2015 Jonathan G. Underwood - 0.14.21-2 -- Add conditionals for building with ffmpeg and x264 support, disabled - by default -- Remove Provides for bundled(js-web-socket-js) -- Use system js-zlib on Fedora >= 21 -- On Fedora < 21 add Provides for bundled(js-zlib) - -* Wed Mar 18 2015 Jonathan G. Underwood - 0.14.21-1 -- Update to 0.14.21 - -* Wed Mar 18 2015 Jonathan G. Underwood - 0.14.19-6 -- Unbundle js-query even on Fedora 20 - -* Wed Mar 18 2015 Jonathan G. Underwood - 0.14.19-5 -- Unbundle web-socket-js - -* Tue Mar 3 2015 Jonathan G. Underwood - 0.14.19-4 -- Add --with-Xdummy and --with-Xdummy_wrapper build options since Xorg - not installed at build time so autodetection fails - -* Tue Mar 3 2015 Jonathan G. Underwood - 0.14.19-3 -- Use js-jquery package only on F22 or later - not available on - earlier distros - -* Tue Mar 3 2015 Jonathan G. Underwood - 0.14.19-2 -- Update Summary to be more descriptive of package -- Use packaged js-jquery -- Add provides for bundled(js-jquery-ui) and bundled(js-web-socket-js) -- Build with vpx and webp support enabled -- Remove any installed SWF files -- Remove executable flag for all .js files -- Remove Requires for python-webm - -* Tue Mar 3 2015 Jonathan G. Underwood - 0.14.19-1 -- Update to upstream 0.14.19 -- Add BuildRequires for libxkbfile-devel -- No longer need to unbundle webp -- Rework and rename patch for unbundling of rencode - -* Fri Oct 18 2013 T.C. Hollingsworth - 0.10.6-1 -- new upstream release 0.10.6 - http://lists.devloop.org.uk/pipermail/shifter-users/2013-October/000726.html - -* Tue Oct 08 2013 T.C. Hollingsworth - 0.10.4-2 -- reenable webp support -- fix webm unbundling to support importing all modules in the webm package -- require latest python-webm so it matches what's bundled upstream - -* Mon Oct 07 2013 T.C. Hollingsworth - 0.10.4-1 -- rebase to 0.10.4 -- don't ship webm stuff that doesn't work without ffmpeg anyway - -* Thu Aug 01 2013 T.C. Hollingsworth - 0.9.8-1 -- new upstream release 0.9.8 - http://lists.devloop.org.uk/pipermail/shifter-users/2013-July/000615.html -- use HTTPS for URL and Source0 - -* Wed Jul 03 2013 T.C. Hollingsworth - 0.9.6-1 -- new upstream release 0.9.6 - http://lists.devloop.org.uk/pipermail/shifter-users/2013-June/000552.html - -* Thu Jun 27 2013 T.C. Hollingsworth - 0.9.5-1 -- new upstream release 0.9.5 - http://lists.devloop.org.uk/pipermail/shifter-users/2013-June/000549.html - -* Thu May 30 2013 T.C. Hollingsworth - 0.9.4-1 -- new upstream release 0.9.4 - http://lists.devloop.org.uk/pipermail/shifter-users/2013-May/000539.html - -* Mon May 13 2013 T.C. Hollingsworth - 0.9.2-1 -- new upstream release 0.9.2 - http://lists.devloop.org.uk/pipermail/shifter-users/2013-May/000525.html - -* Fri May 10 2013 T.C. Hollingsworth - 0.9.1-1 -- new upstream release 0.9.1 - http://lists.devloop.org.uk/pipermail/shifter-users/2013-May/000522.html - -* Tue May 07 2013 T.C. Hollingsworth - 0.9.0-2 -- fix rencode __version__ importing - -* Thu May 02 2013 T.C. Hollingsworth - 0.9.0-1 -- new upstream release 0.9.0 - http://lists.devloop.org.uk/pipermail/shifter-users/2013-April/000479.html -- delete the bundled code in prep instead of inside the patches -- don't bother including parti; it's going away upstream soon -- merge python-wimpiggy into main xpra package; it won't be seperated upstream soon - -* Thu Apr 18 2013 T.C. Hollingsworth - 0.8.8-4 -- unbundle rencode and webm -- fix equality operator in Requires -- drop unnecessary multiple copies of NEWS -- don't remove buildroot - -* Thu Apr 11 2013 T.C. Hollingsworth - 0.8.8-3 -- drop unmet dependency on gstreamer-plugins-ugly -- fix permissions on shared objects -- add scriptlets necessary for icon/desktop file - -* Thu Mar 28 2013 T.C. Hollingsworth - 0.8.8-2 -- disable codecs prohibited in Fedora - -* Thu Mar 14 2013 T.C. Hollingsworth - 0.8.8-1 -- initial package +%autochangelog From a0f04c2100c46223b8838247d2f34c0ee0bea714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Wed, 31 May 2023 23:41:00 +0100 Subject: [PATCH 202/267] Rebuild for procps-ng-4.x.x From ca403d9f20405c84ef63424365a9daf0963cee07 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 15 Jun 2023 17:01:03 +0200 Subject: [PATCH 203/267] Rebuilt for Python 3.12 From 2bafbf36054f70b780279d756f269dc8fec95ce0 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Tue, 20 Jun 2023 19:54:43 +0200 Subject: [PATCH 204/267] Release 4.4.6 --- .gitignore | 1 + sources | 2 +- xpra.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5c06611..885ad48 100644 --- a/.gitignore +++ b/.gitignore @@ -82,3 +82,4 @@ /xpra-4.4.3.tar.gz /xpra-4.4.4.tar.gz /xpra-4.4.5.tar.gz +/xpra-4.4.6.tar.gz diff --git a/sources b/sources index cd7ef36..3f1674e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-4.4.5.tar.gz) = 518f52dddd59aa958aaa31bca9e87e1eb55755760307342c6d95693e886c6a4adba1906513f3dcb015f0b2a4b12890760169b8e5afccdbd2007ca75fc227b536 +SHA512 (xpra-4.4.6.tar.gz) = b6236ded715d661c0de79b5e2e0315ed3077b410792986d85e88a89ead119cfcf31d49a6aad719e488300e800e585fc060d51cbf1b6aeccb0b0d8c8168712c81 diff --git a/xpra.spec b/xpra.spec index d034413..2109c62 100644 --- a/xpra.spec +++ b/xpra.spec @@ -43,7 +43,7 @@ %endif Name: xpra -Version: 4.4.5 +Version: 4.4.6 Release: %autorelease Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT From 9c90c1c44c309002a7b4d207f3947a1e1634f824 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 26 Jun 2023 12:28:03 +0200 Subject: [PATCH 205/267] Rebuilt for Python 3.12 From 2b82082deb80bced10cc0f9366e5eef402f0842d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:14:59 +0000 Subject: [PATCH 206/267] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 13c7a2cb0419c34c91fc9042d3f3331c7e06bfe4 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sun, 27 Aug 2023 11:21:24 +0200 Subject: [PATCH 207/267] Release 5.0 --- .gitignore | 1 + sources | 2 +- xpra.spec | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 885ad48..11e01e0 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,4 @@ /xpra-4.4.4.tar.gz /xpra-4.4.5.tar.gz /xpra-4.4.6.tar.gz +/xpra-5.0.tar.gz diff --git a/sources b/sources index 3f1674e..b1e889e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-4.4.6.tar.gz) = b6236ded715d661c0de79b5e2e0315ed3077b410792986d85e88a89ead119cfcf31d49a6aad719e488300e800e585fc060d51cbf1b6aeccb0b0d8c8168712c81 +SHA512 (xpra-5.0.tar.gz) = 94d4ec4fa9581a9e184ee47b8f8d53a6f73cbbce1156e21c033805482f84779272a69a746efdb37ce564fdd5c74ef74f4e14351c858408f6b43e267f0ca03d62 diff --git a/xpra.spec b/xpra.spec index 2109c62..f7ec12a 100644 --- a/xpra.spec +++ b/xpra.spec @@ -43,7 +43,7 @@ %endif Name: xpra -Version: 4.4.6 +Version: 5.0 Release: %autorelease Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -76,6 +76,7 @@ BuildRequires: systemd-devel BuildRequires: procps-ng-devel %endif BuildRequires: pkgconfig(libavif) +BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libqrencode) BuildRequires: libdrm-devel BuildRequires: pkgconfig(libwebp) @@ -175,7 +176,7 @@ sed -i 's|-mfpmath=387|-mfloat-abi=hard|' setup.py %build %set_build_flags -%{__python3} setup.py build --executable="%{__python3} -s" \ +%py3_build -- \ --with-verbose \ --with-vpx \ %{?_with_enc_x264} \ From 6a0712f0031aaccd11d1bb7fa07ad6a657a4aba8 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sat, 2 Sep 2023 19:04:05 +0200 Subject: [PATCH 208/267] Release 5.0.1 --- .gitignore | 1 + sources | 2 +- xpra.spec | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 11e01e0..8119bd3 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,4 @@ /xpra-4.4.5.tar.gz /xpra-4.4.6.tar.gz /xpra-5.0.tar.gz +/xpra-5.0.1.tar.gz diff --git a/sources b/sources index b1e889e..2fdb546 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-5.0.tar.gz) = 94d4ec4fa9581a9e184ee47b8f8d53a6f73cbbce1156e21c033805482f84779272a69a746efdb37ce564fdd5c74ef74f4e14351c858408f6b43e267f0ca03d62 +SHA512 (xpra-5.0.1.tar.gz) = 202c05fb191fdc462a07c5659b33763b2090435ca16cfe2dd5261394a7092fdca432c8ac66a016cbe945802a3ecd8863b88c0822317739cbd477b37b8a3494cd diff --git a/xpra.spec b/xpra.spec index f7ec12a..63b44a1 100644 --- a/xpra.spec +++ b/xpra.spec @@ -43,7 +43,7 @@ %endif Name: xpra -Version: 5.0 +Version: 5.0.1 Release: %autorelease Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -177,6 +177,7 @@ sed -i 's|-mfpmath=387|-mfloat-abi=hard|' setup.py %build %set_build_flags %py3_build -- \ + --without-nvidia --without-pandoc_lua \ --with-verbose \ --with-vpx \ %{?_with_enc_x264} \ From cce31e65e8e70bbd3a013085a2880823662f232d Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sat, 2 Sep 2023 20:02:01 +0200 Subject: [PATCH 209/267] Add python3-cups BR --- xpra.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xpra.spec b/xpra.spec index 63b44a1..c9d53f8 100644 --- a/xpra.spec +++ b/xpra.spec @@ -65,6 +65,7 @@ BuildRequires: libvpx-devel BuildRequires: libXdamage-devel BuildRequires: libXres-devel BuildRequires: cups-devel, cups +BuildRequires: python3-cups BuildRequires: redhat-rpm-config BuildRequires: python3-rpm-macros BuildRequires: gcc From 9048d2cd2a3c54acab6663d3eb06adf89579ecc1 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Tue, 19 Sep 2023 14:01:28 +0200 Subject: [PATCH 210/267] Release 5.0.2 --- .gitignore | 1 + sources | 2 +- xpra.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8119bd3..56a2467 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,4 @@ /xpra-4.4.6.tar.gz /xpra-5.0.tar.gz /xpra-5.0.1.tar.gz +/xpra-5.0.2.tar.gz diff --git a/sources b/sources index 2fdb546..17ff60f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-5.0.1.tar.gz) = 202c05fb191fdc462a07c5659b33763b2090435ca16cfe2dd5261394a7092fdca432c8ac66a016cbe945802a3ecd8863b88c0822317739cbd477b37b8a3494cd +SHA512 (xpra-5.0.2.tar.gz) = 66dfa31d4cdab078d2b6447b4b57ca1a51dab0b2911430ea3b96c6cf124b4a9a064d4fbe70e96faaf522f7a190374f12bafa7e97c9496d52733c56fa52bdbdfd diff --git a/xpra.spec b/xpra.spec index c9d53f8..e009bbd 100644 --- a/xpra.spec +++ b/xpra.spec @@ -43,7 +43,7 @@ %endif Name: xpra -Version: 5.0.1 +Version: 5.0.2 Release: %autorelease Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT From c76677cdd35ed8d481ecc8b1402e7cd1211c9ce1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sat, 23 Sep 2023 23:58:02 +0100 Subject: [PATCH 211/267] Move ffmpeg plugin to Fedora one motivation was dnf Transaction test error: file /usr/lib64/python3.11/site-packages/xpra/codecs/ffmpeg/av_log.cpython-311-x86_64-linux-gnu.so conflicts between attempted installs of xpra-codecs-freeworld-5.0.1-2.fc38.1.x86_64 and xpra-5.0.1-2.fc38.x86_64 --- xpra.spec | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/xpra.spec b/xpra.spec index e009bbd..a855216 100644 --- a/xpra.spec +++ b/xpra.spec @@ -1,7 +1,13 @@ %bcond_with enc_x264 %bcond_with enc_x265 +# Theses settings requires 64bit +%if 0%{?__isa_bits} == 64 +%bcond_without dec_avcodec2 +%bcond_without csc_swscale +%else %bcond_with dec_avcodec2 %bcond_with csc_swscale +%endif # For debugging only %bcond_with debug @@ -64,11 +70,11 @@ BuildRequires: desktop-file-utils BuildRequires: libvpx-devel BuildRequires: libXdamage-devel BuildRequires: libXres-devel -BuildRequires: cups-devel, cups +BuildRequires: cups-devel BuildRequires: python3-cups BuildRequires: redhat-rpm-config BuildRequires: python3-rpm-macros -BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: pam-devel BuildRequires: pandoc # needs by setup.py to detect systemd `sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd")` @@ -77,7 +83,6 @@ BuildRequires: systemd-devel BuildRequires: procps-ng-devel %endif BuildRequires: pkgconfig(libavif) -BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libqrencode) BuildRequires: libdrm-devel BuildRequires: pkgconfig(libwebp) @@ -102,9 +107,13 @@ BuildRequires: libasan %if %{with enc_x264} BuildRequires: x264-devel %endif -%if %{with dec_avcodec2} || %{with csc_swscale} -BuildRequires: ffmpeg-devel -%endif +# While ffmpeg-devel should only be needed in theses conditions, setup.py requires it anyway +#if %%{with dec_avcodec2} || %%{with csc_swscale} +BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavformat) +BuildRequires: pkgconfig(libavutil) +BuildRequires: pkgconfig(libswscale) +#endif Requires: python3-pillow Requires: python3-cups @@ -189,7 +198,7 @@ sed -i 's|-mfpmath=387|-mfloat-abi=hard|' setup.py --with-Xdummy \ --with-Xdummy_wrapper \ --without-strict \ - --without-enc_ffmpeg + --with-enc_ffmpeg %install %py3_install From dfa1606cde140e5362409f43cb966983625ad31d Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sun, 15 Oct 2023 14:42:05 +0200 Subject: [PATCH 212/267] Release 5.0.3 --- .gitignore | 1 + sources | 2 +- xpra.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 56a2467..01a0cf8 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,4 @@ /xpra-5.0.tar.gz /xpra-5.0.1.tar.gz /xpra-5.0.2.tar.gz +/xpra-5.0.3.tar.gz diff --git a/sources b/sources index 17ff60f..0d6abdf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-5.0.2.tar.gz) = 66dfa31d4cdab078d2b6447b4b57ca1a51dab0b2911430ea3b96c6cf124b4a9a064d4fbe70e96faaf522f7a190374f12bafa7e97c9496d52733c56fa52bdbdfd +SHA512 (xpra-5.0.3.tar.gz) = 8c028f0437213e5d0849258e2bb93a227ae3404b768853b597515db9b31b05fbbe60b45c58e4a2ed17349c4b77b9e0d15dbb8c48bef8cc27fe378ac8caba3686 diff --git a/xpra.spec b/xpra.spec index a855216..2ad4e51 100644 --- a/xpra.spec +++ b/xpra.spec @@ -49,7 +49,7 @@ %endif Name: xpra -Version: 5.0.2 +Version: 5.0.3 Release: %autorelease Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT From 14038cc9cf3ee3a16071a83a42251229bda10c63 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 10:07:01 +0000 Subject: [PATCH 213/267] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 7fbb5931b1243435ffac989514e7d004a9654b5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Wed, 31 Jan 2024 15:53:10 +0100 Subject: [PATCH 214/267] GCC 14 Fix Backport (Fixes RHBZ#2261813) --- 0001-GCC-14.patch | 102 ++++++++++++++++++++++++++++++++++++++++++++++ xpra.spec | 5 +++ 2 files changed, 107 insertions(+) create mode 100644 0001-GCC-14.patch diff --git a/0001-GCC-14.patch b/0001-GCC-14.patch new file mode 100644 index 0000000..ef6d726 --- /dev/null +++ b/0001-GCC-14.patch @@ -0,0 +1,102 @@ +From d8790b37d0da7fdcad9cad6e2a1d23e574965395 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= +Date: Wed, 31 Jan 2024 15:43:23 +0100 +Subject: [PATCH] GCC 14 + +--- + setup.py | 2 +- + xpra/platform/posix/proc_libproc.pyx | 44 +++++++++++----------------- + 2 files changed, 18 insertions(+), 28 deletions(-) + +diff --git a/setup.py b/setup.py +index 48c55ce..c38f7a2 100755 +--- a/setup.py ++++ b/setup.py +@@ -2189,7 +2189,7 @@ if pam_ENABLED: + #platform: + tace(sd_listen_ENABLED, "xpra.platform.posix.sd_listen", "libsystemd") + tace(proc_ENABLED and proc_use_procps, "xpra.platform.posix.proc_procps", "libprocps", extra_compile_args = "-Wno-error") +-tace(proc_ENABLED and proc_use_libproc, "xpra.platform.posix.proc_libproc", "libproc2", extra_compile_args = "-Wno-error") ++tace(proc_ENABLED and proc_use_libproc, "xpra.platform.posix.proc_libproc", "libproc2", language="c++") + + #codecs: + toggle_packages(enc_proxy_ENABLED, "xpra.codecs.proxy") +diff --git a/xpra/platform/posix/proc_libproc.pyx b/xpra/platform/posix/proc_libproc.pyx +index 577a542..0de8914 100644 +--- a/xpra/platform/posix/proc_libproc.pyx ++++ b/xpra/platform/posix/proc_libproc.pyx +@@ -1,10 +1,8 @@ + # This file is part of Xpra. +-# Copyright (C) 2022 Antoine Martin ++# Copyright (C) 2022-2024 Antoine Martin + # Xpra is released under the terms of the GNU GPL v2, or, at your option, any + # later version. See the file COPYING for details. + +-from libc.string cimport memset +- + from xpra.log import Logger + + log = Logger("util", "exec") +@@ -14,6 +12,9 @@ DEF PROC_PID = 0x1000 #process id numbers ( 0 terminated ) + + + cdef extern from "libproc2/pids.h": ++ ctypedef enum pids_item: ++ PIDS_ID_PPID ++ + # Opaque handle used by procps to store its buffers + struct pids_info: + pass +@@ -38,36 +39,25 @@ cdef extern from "libproc2/pids.h": + pids_counts *counts + pids_stack **stacks + +- # Flag used to query the parent process, part of the pids_item enum +- int PIDS_ID_PPID +- +- # Flag used to return one value per process, part of pids_select_type enum. +- # All we care about here is PPID which is the same for each thread within a +- # process. +- int PIDS_SELECT_PID ++ ctypedef enum pids_select_type: ++ PIDS_SELECT_PID ++ PIDS_SELECT_PID_THREADS ++ PIDS_SELECT_UID ++ PIDS_SELECT_UID_THREADS + +- int procps_pids_new(pids_info **info, int *items, int numitems) ++ int procps_pids_new(pids_info **info, pids_item *items, int numitems) + int procps_pids_unref(pids_info **info) +- pids_fetch *procps_pids_select(pids_info *info, unsigned int *pids, int pidcount, int select_type) ++ pids_fetch *procps_pids_select(pids_info *info, unsigned*pids, int pidcount, int select_type) + +-def get_parent_pid(int pid) -> int: +- cdef pids_info *handle +- cdef int selector +- +- handle = NULL +- selector = PIDS_ID_PPID ++def get_parent_pid(unsigned int pid) -> int: ++ cdef pids_info *handle = NULL ++ cdef pids_item selector = PIDS_ID_PPID + if procps_pids_new(&handle, &selector, 1) != 0: + return 0 + +- cdef unsigned int upid +- cdef pids_fetch *query +- cdef int retval +- +- upid = pid +- query = procps_pids_select(handle, &upid, 1, PIDS_SELECT_PID) +- if query == NULL or query.counts.total != 1 or query.stacks[0].head.item != PIDS_ID_PPID: +- retval = 0 +- else: ++ cdef pids_fetch *query = procps_pids_select(handle, &pid, 1, PIDS_SELECT_PID) ++ cdef int retval = 0 ++ if query != NULL and query.counts.total == 1 and query.stacks[0].head.item == PIDS_ID_PPID: + retval = query.stacks[0].head.result.s_int + + procps_pids_unref(&handle) +-- +2.43.0 + diff --git a/xpra.spec b/xpra.spec index 2ad4e51..b9f74c0 100644 --- a/xpra.spec +++ b/xpra.spec @@ -59,6 +59,11 @@ Source0: https://github.com/Xpra-org/xpra/archive/refs/tags/v%{version}/% Source1: %{name}.appdata.xml Patch1: ignore_assert_pandoc.patch +# GCC 14 Fix backport +# https://github.com/Xpra-org/xpra/issues/4113 +# https://github.com/Xpra-org/xpra/commit/f12369ad493b0987cd62c1baca24b1067183e657 +Patch2: 0001-GCC-14.patch + BuildRequires: python3-devel BuildRequires: gtk3-devel BuildRequires: libXtst-devel From 96c56894c4dacb7accf4131c6273b6eb316fd6fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Wed, 31 Jan 2024 16:26:11 +0100 Subject: [PATCH 215/267] Rebuilt for libavif 1.0.3 From 1efb3066bb02623a98d3b54bb22949dd3be26547 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Thu, 8 Feb 2024 00:06:28 +0000 Subject: [PATCH 216/267] Rebuild for libvpx 1.14.x From ea007192d58a5e33f2dbfa2f29c7365fb60997bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 23 Feb 2024 14:11:42 +0000 Subject: [PATCH 217/267] Update xpra to 5.0.6 --- .gitignore | 1 + 0001-GCC-14.patch | 102 ---------------------------------------------- sources | 2 +- 3 files changed, 2 insertions(+), 103 deletions(-) delete mode 100644 0001-GCC-14.patch diff --git a/.gitignore b/.gitignore index 01a0cf8..145891b 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,4 @@ /xpra-5.0.1.tar.gz /xpra-5.0.2.tar.gz /xpra-5.0.3.tar.gz +/xpra-5.0.6.tar.gz diff --git a/0001-GCC-14.patch b/0001-GCC-14.patch deleted file mode 100644 index ef6d726..0000000 --- a/0001-GCC-14.patch +++ /dev/null @@ -1,102 +0,0 @@ -From d8790b37d0da7fdcad9cad6e2a1d23e574965395 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= -Date: Wed, 31 Jan 2024 15:43:23 +0100 -Subject: [PATCH] GCC 14 - ---- - setup.py | 2 +- - xpra/platform/posix/proc_libproc.pyx | 44 +++++++++++----------------- - 2 files changed, 18 insertions(+), 28 deletions(-) - -diff --git a/setup.py b/setup.py -index 48c55ce..c38f7a2 100755 ---- a/setup.py -+++ b/setup.py -@@ -2189,7 +2189,7 @@ if pam_ENABLED: - #platform: - tace(sd_listen_ENABLED, "xpra.platform.posix.sd_listen", "libsystemd") - tace(proc_ENABLED and proc_use_procps, "xpra.platform.posix.proc_procps", "libprocps", extra_compile_args = "-Wno-error") --tace(proc_ENABLED and proc_use_libproc, "xpra.platform.posix.proc_libproc", "libproc2", extra_compile_args = "-Wno-error") -+tace(proc_ENABLED and proc_use_libproc, "xpra.platform.posix.proc_libproc", "libproc2", language="c++") - - #codecs: - toggle_packages(enc_proxy_ENABLED, "xpra.codecs.proxy") -diff --git a/xpra/platform/posix/proc_libproc.pyx b/xpra/platform/posix/proc_libproc.pyx -index 577a542..0de8914 100644 ---- a/xpra/platform/posix/proc_libproc.pyx -+++ b/xpra/platform/posix/proc_libproc.pyx -@@ -1,10 +1,8 @@ - # This file is part of Xpra. --# Copyright (C) 2022 Antoine Martin -+# Copyright (C) 2022-2024 Antoine Martin - # Xpra is released under the terms of the GNU GPL v2, or, at your option, any - # later version. See the file COPYING for details. - --from libc.string cimport memset -- - from xpra.log import Logger - - log = Logger("util", "exec") -@@ -14,6 +12,9 @@ DEF PROC_PID = 0x1000 #process id numbers ( 0 terminated ) - - - cdef extern from "libproc2/pids.h": -+ ctypedef enum pids_item: -+ PIDS_ID_PPID -+ - # Opaque handle used by procps to store its buffers - struct pids_info: - pass -@@ -38,36 +39,25 @@ cdef extern from "libproc2/pids.h": - pids_counts *counts - pids_stack **stacks - -- # Flag used to query the parent process, part of the pids_item enum -- int PIDS_ID_PPID -- -- # Flag used to return one value per process, part of pids_select_type enum. -- # All we care about here is PPID which is the same for each thread within a -- # process. -- int PIDS_SELECT_PID -+ ctypedef enum pids_select_type: -+ PIDS_SELECT_PID -+ PIDS_SELECT_PID_THREADS -+ PIDS_SELECT_UID -+ PIDS_SELECT_UID_THREADS - -- int procps_pids_new(pids_info **info, int *items, int numitems) -+ int procps_pids_new(pids_info **info, pids_item *items, int numitems) - int procps_pids_unref(pids_info **info) -- pids_fetch *procps_pids_select(pids_info *info, unsigned int *pids, int pidcount, int select_type) -+ pids_fetch *procps_pids_select(pids_info *info, unsigned*pids, int pidcount, int select_type) - --def get_parent_pid(int pid) -> int: -- cdef pids_info *handle -- cdef int selector -- -- handle = NULL -- selector = PIDS_ID_PPID -+def get_parent_pid(unsigned int pid) -> int: -+ cdef pids_info *handle = NULL -+ cdef pids_item selector = PIDS_ID_PPID - if procps_pids_new(&handle, &selector, 1) != 0: - return 0 - -- cdef unsigned int upid -- cdef pids_fetch *query -- cdef int retval -- -- upid = pid -- query = procps_pids_select(handle, &upid, 1, PIDS_SELECT_PID) -- if query == NULL or query.counts.total != 1 or query.stacks[0].head.item != PIDS_ID_PPID: -- retval = 0 -- else: -+ cdef pids_fetch *query = procps_pids_select(handle, &pid, 1, PIDS_SELECT_PID) -+ cdef int retval = 0 -+ if query != NULL and query.counts.total == 1 and query.stacks[0].head.item == PIDS_ID_PPID: - retval = query.stacks[0].head.result.s_int - - procps_pids_unref(&handle) --- -2.43.0 - diff --git a/sources b/sources index 0d6abdf..0fb0044 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-5.0.3.tar.gz) = 8c028f0437213e5d0849258e2bb93a227ae3404b768853b597515db9b31b05fbbe60b45c58e4a2ed17349c4b77b9e0d15dbb8c48bef8cc27fe378ac8caba3686 +SHA512 (xpra-5.0.6.tar.gz) = c25a763f4925c2ee987d7994cb040538635ba32bdfec830f386cae48e6acf4644b68198f79f42ddfef8174a16d6b40cdcedd75756fec1b23baa2319947a573be From cada609a295451582d113a15b170cdfc60bf609f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 23 Feb 2024 14:22:12 +0000 Subject: [PATCH 218/267] Update xpra to 5.0.6 --- xpra.spec | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/xpra.spec b/xpra.spec index b9f74c0..a4adb04 100644 --- a/xpra.spec +++ b/xpra.spec @@ -49,7 +49,7 @@ %endif Name: xpra -Version: 5.0.3 +Version: 5.0.6 Release: %autorelease Summary: Remote display server for applications and desktops License: GPLv2+ and BSD and LGPLv3+ and MIT @@ -59,11 +59,6 @@ Source0: https://github.com/Xpra-org/xpra/archive/refs/tags/v%{version}/% Source1: %{name}.appdata.xml Patch1: ignore_assert_pandoc.patch -# GCC 14 Fix backport -# https://github.com/Xpra-org/xpra/issues/4113 -# https://github.com/Xpra-org/xpra/commit/f12369ad493b0987cd62c1baca24b1067183e657 -Patch2: 0001-GCC-14.patch - BuildRequires: python3-devel BuildRequires: gtk3-devel BuildRequires: libXtst-devel From af3f8fefccfef9cb251e220bd74572577a4fbb46 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 14:12:53 +0200 Subject: [PATCH 219/267] Rebuilt for Python 3.13 From 851ab605bf542f9412eadab6500815add3c24332 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:25:17 +0000 Subject: [PATCH 220/267] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From dcacc70157f3a43a637a10ef265ce56b2d7ea085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 22:57:05 +0200 Subject: [PATCH 221/267] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- xpra.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index a4adb04..fbd0be9 100644 --- a/xpra.spec +++ b/xpra.spec @@ -52,7 +52,8 @@ Name: xpra Version: 5.0.6 Release: %autorelease Summary: Remote display server for applications and desktops -License: GPLv2+ and BSD and LGPLv3+ and MIT +# Automatically converted from old format: GPLv2+ and BSD and LGPLv3+ and MIT - review is highly recommended. +License: GPL-2.0-or-later AND LicenseRef-Callaway-BSD AND LGPL-3.0-or-later AND LicenseRef-Callaway-MIT URL: https://www.xpra.org/ Source0: https://github.com/Xpra-org/xpra/archive/refs/tags/v%{version}/%{name}-%{version}.tar.gz # Appdata file for Fedora From 3464c2d5e0522ada20d1a6195dcb70cf5aca59ec Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 23 Sep 2024 17:03:09 +0200 Subject: [PATCH 222/267] Rebuild for ffmpeg 7 From ff1e77045f0cb17894a9ed2c5fca205b695d32cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Tue, 7 May 2024 07:25:22 +0200 Subject: [PATCH 223/267] Add compatibility with FFMPEG 7.0 --- 0001-Add-compatibility-with-FFMPEG-7.0.patch | 182 +++++++++++++++++++ xpra.spec | 3 + 2 files changed, 185 insertions(+) create mode 100644 0001-Add-compatibility-with-FFMPEG-7.0.patch diff --git a/0001-Add-compatibility-with-FFMPEG-7.0.patch b/0001-Add-compatibility-with-FFMPEG-7.0.patch new file mode 100644 index 0000000..93a6890 --- /dev/null +++ b/0001-Add-compatibility-with-FFMPEG-7.0.patch @@ -0,0 +1,182 @@ +From 6722df9aeb90857bc1c979c92d47e57903e0ebd6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= +Date: Tue, 7 May 2024 07:23:07 +0200 +Subject: [PATCH] Add compatibility with FFMPEG 7.0 + +channel_layout has been replaced with ch_layout + +avcodec_close has been deprecated in favor of avcodec_free_context + +avio: Constify data pointees of write callbacks + +FF_API_FRAME_PICTURE_NUMBER has been deprecated + +AV_PIX_FMT_XVMC has been deprecated +--- + xpra/codecs/ffmpeg/decoder.pyx | 9 ++------- + xpra/codecs/ffmpeg/encoder.pyx | 37 ++++++++++++++++++++++------------ + 2 files changed, 26 insertions(+), 20 deletions(-) + +diff --git a/xpra/codecs/ffmpeg/decoder.pyx b/xpra/codecs/ffmpeg/decoder.pyx +index 4f71b5bf1f..f1df36a85a 100644 +--- a/xpra/codecs/ffmpeg/decoder.pyx ++++ b/xpra/codecs/ffmpeg/decoder.pyx +@@ -203,7 +203,6 @@ cdef extern from "libavutil/pixfmt.h": + AVPixelFormat AV_PIX_FMT_BAYER_GBRG16BE + AVPixelFormat AV_PIX_FMT_BAYER_GRBG16LE + AVPixelFormat AV_PIX_FMT_BAYER_GRBG16BE +- AVPixelFormat AV_PIX_FMT_XVMC + AVPixelFormat AV_PIX_FMT_YUV440P10LE + AVPixelFormat AV_PIX_FMT_YUV440P10BE + AVPixelFormat AV_PIX_FMT_YUV440P12LE +@@ -294,7 +293,7 @@ cdef extern from "libavcodec/avcodec.h": + int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options) + AVFrame* av_frame_alloc() + void av_frame_free(AVFrame **frame) +- int avcodec_close(AVCodecContext *avctx) ++ void avcodec_free_context(AVCodecContext **avctx) + + #actual decoding: + AVPacket *av_packet_alloc() nogil +@@ -462,7 +461,6 @@ FORMAT_TO_STR = { + AV_PIX_FMT_BAYER_GBRG16BE : "BAYER_GBRG16BE", + AV_PIX_FMT_BAYER_GRBG16LE : "BAYER_GRBG16LE", + AV_PIX_FMT_BAYER_GRBG16BE : "BAYER_GRBG16BE", +- AV_PIX_FMT_XVMC : "XVMC", + AV_PIX_FMT_YUV440P10LE : "YUV440P10LE", + AV_PIX_FMT_YUV440P10BE : "YUV440P10BE", + AV_PIX_FMT_YUV440P12LE : "YUV440P12LE", +@@ -812,10 +810,7 @@ cdef class Decoder: + img.clone_pixel_data() + log("clean_decoder() freeing AVCodecContext: %#x", self.codec_ctx) + if self.codec_ctx!=NULL: +- r = avcodec_close(self.codec_ctx) +- if r!=0: +- log.error("Error: failed to close decoder context %#x:", self.codec_ctx) +- log.error(" %s", av_error_str(r)) ++ avcodec_free_context(&self.codec_ctx) + av_free(self.codec_ctx) + self.codec_ctx = NULL + f = self.file +diff --git a/xpra/codecs/ffmpeg/encoder.pyx b/xpra/codecs/ffmpeg/encoder.pyx +index 6af88a5629..5df0c590c0 100644 +--- a/xpra/codecs/ffmpeg/encoder.pyx ++++ b/xpra/codecs/ffmpeg/encoder.pyx +@@ -120,10 +120,26 @@ cdef extern from "libavformat/avio.h": + AVIOContext *avio_alloc_context(unsigned char *buffer, int buffer_size, int write_flag, + void *opaque, + int (*read_packet)(void *opaque, uint8_t *buf, int buf_size), +- int (*write_packet)(void *opaque, uint8_t *buf, int buf_size) except 0, ++ int (*write_packet)(void *opaque, const uint8_t *buf, int buf_size) except 0, + int64_t (*seek)(void *opaque, int64_t offset, int whence)) + + ++cdef extern from "libavutil/channel_layout.h": ++ ctypedef int AVChannelOrder ++ ctypedef int AVChannel ++ ctypedef struct AVChannelCustom: ++ AVChannel id ++ char name[16] ++ void *opaque ++ ctypedef union ChannelUnion: ++ uint64_t mask ++ AVChannelCustom* map ++ ctypedef struct AVChannelLayout: ++ AVChannelOrder order ++ int nb_channels ++ ChannelUnion u ++ void *opaque ++ + cdef extern from "libavcodec/avcodec.h": + int FF_THREAD_SLICE #allow more than one thread per frame + int FF_THREAD_FRAME #Decode more than one frame at once +@@ -190,8 +206,6 @@ cdef extern from "libavcodec/avcodec.h": + int format + int key_frame + int64_t pts +- int coded_picture_number +- int display_picture_number + int quality + void *opaque + AVPictureType pict_type +@@ -288,14 +302,12 @@ cdef extern from "libavcodec/avcodec.h": + #skipped: AVColor* + int slices + int sample_rate +- int channels + AVSampleFormat sample_fmt ++ AVChannelLayout ch_layout + int frame_size + int frame_number + int block_align + int cutoff +- uint64_t channel_layout +- uint64_t request_channel_layout + #skipped: AVAudioServiceType + # AVSampleFormat + int refcounted_frames +@@ -483,7 +495,7 @@ cdef extern from "libavutil/opt.h": + AVOptionType AV_OPT_TYPE_VIDEO_RATE + AVOptionType AV_OPT_TYPE_DURATION + AVOptionType AV_OPT_TYPE_COLOR +- AVOptionType AV_OPT_TYPE_CHANNEL_LAYOUT ++ AVOptionType AV_OPT_TYPE_CHLAYOUT + AVOptionType AV_OPT_TYPE_BOOL + + int AV_OPT_SEARCH_CHILDREN +@@ -686,7 +698,7 @@ AV_OPT_TYPES = { + AV_OPT_TYPE_VIDEO_RATE : "VIDEO_RATE", + AV_OPT_TYPE_DURATION : "DURATION", + AV_OPT_TYPE_COLOR : "COLOR", +- AV_OPT_TYPE_CHANNEL_LAYOUT : "CHANNEL_LAYOUT", ++ AV_OPT_TYPE_CHLAYOUT : "CHANNEL_LAYOUT", + AV_OPT_TYPE_BOOL : "BOOL", + } + +@@ -1137,7 +1149,7 @@ cdef list_options(void *obj, const AVClass *av_class, int skip=1): + list_options(child, child_class, skip-1) + + +-cdef int write_packet(void *opaque, uint8_t *buf, int buf_size) except 0: ++cdef int write_packet(void *opaque, const uint8_t *buf, int buf_size) except 0: + global GEN_TO_ENCODER + encoder = GEN_TO_ENCODER.get( opaque) + #log.warn("write_packet(%#x, %#x, %#x) encoder=%s", opaque, buf, buf_size, type(encoder)) +@@ -1146,6 +1158,7 @@ cdef int write_packet(void *opaque, uint8_t *buf, int buf_size) except 0: + return -1 + return encoder.write_packet( buf, buf_size) + ++ + MAX_WIDTH, MAX_HEIGHT = (4096, 4096) + def get_specs(encoding, colorspace): + assert encoding in get_encodings(), "invalid encoding: %s (must be one of %s" % (encoding, get_encodings()) +@@ -1504,7 +1517,7 @@ cdef class Encoder: + self.audio_ctx.time_base.num = 1 + self.audio_ctx.bit_rate = 64000 + self.audio_ctx.sample_rate = 44100 +- self.audio_ctx.channels = 2 ++ self.audio_ctx.ch_layout.nb_channels = 2 + #if audio_codec.capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE: + # pass + #cdef AVDictionary *opts = NULL +@@ -1689,8 +1702,6 @@ cdef class Encoder: + self.av_frame.height = self.height + self.av_frame.format = self.pix_fmt + self.av_frame.pts = self.frames+1 +- self.av_frame.coded_picture_number = self.frames+1 +- self.av_frame.display_picture_number = self.frames+1 + #if self.frames==0: + self.av_frame.pict_type = AV_PICTURE_TYPE_I + #self.av_frame.key_frame = 1 +@@ -1823,7 +1834,7 @@ cdef class Encoder: + + def write_packet(self, uintptr_t buf, int buf_size): + log("write_packet(%#x, %#x)", buf, buf_size) +- cdef uint8_t *cbuf = buf ++ cdef const uint8_t *cbuf = buf + buffer = cbuf[:buf_size] + self.buffers.append(buffer) + return buf_size +-- +2.44.0 + diff --git a/xpra.spec b/xpra.spec index fbd0be9..fd2e3ea 100644 --- a/xpra.spec +++ b/xpra.spec @@ -59,6 +59,9 @@ Source0: https://github.com/Xpra-org/xpra/archive/refs/tags/v%{version}/% # Appdata file for Fedora Source1: %{name}.appdata.xml Patch1: ignore_assert_pandoc.patch +# Add compatibility with FFMPEG 7.0 +# https://github.com/Xpra-org/xpra/pull/4216 +Patch2: 0001-Add-compatibility-with-FFMPEG-7.0.patch BuildRequires: python3-devel BuildRequires: gtk3-devel From 639b0a7626ad11fa4c39e4e66d768dfb10b52531 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 10 Oct 2024 22:22:46 +0100 Subject: [PATCH 224/267] Simply removing the unnecessary python-opencv dependency --- xpra.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index fd2e3ea..0408794 100644 --- a/xpra.spec +++ b/xpra.spec @@ -156,7 +156,8 @@ Requires: js-jquery # python3-opencv is required for webcam forwarding support, client-side only. # Available on Fedora only. -%{?fedora:Requires: python3-opencv} +# https://github.com/Xpra-org/xpra/issues/4035#issuecomment-2405430577 +#%%{?fedora:Requires: python3-opencv} # Needed to create the xpra group Requires(pre): shadow-utils From a3143a0e1d85f4c1d9837f56d59efb06961cb1b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 11 Oct 2024 14:29:38 +0100 Subject: [PATCH 225/267] Update xpra to 5.0.10 --- .gitignore | 1 + 0001-Add-compatibility-with-FFMPEG-7.0.patch | 39 ++++++-------------- ignore_assert_pandoc.patch | 8 ++-- sources | 2 +- xpra.spec | 2 +- 5 files changed, 19 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index 145891b..2d3c94c 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,4 @@ /xpra-5.0.2.tar.gz /xpra-5.0.3.tar.gz /xpra-5.0.6.tar.gz +/xpra-5.0.10.tar.gz diff --git a/0001-Add-compatibility-with-FFMPEG-7.0.patch b/0001-Add-compatibility-with-FFMPEG-7.0.patch index 93a6890..dfb37d8 100644 --- a/0001-Add-compatibility-with-FFMPEG-7.0.patch +++ b/0001-Add-compatibility-with-FFMPEG-7.0.patch @@ -21,43 +21,26 @@ diff --git a/xpra/codecs/ffmpeg/decoder.pyx b/xpra/codecs/ffmpeg/decoder.pyx index 4f71b5bf1f..f1df36a85a 100644 --- a/xpra/codecs/ffmpeg/decoder.pyx +++ b/xpra/codecs/ffmpeg/decoder.pyx -@@ -203,7 +203,6 @@ cdef extern from "libavutil/pixfmt.h": - AVPixelFormat AV_PIX_FMT_BAYER_GBRG16BE - AVPixelFormat AV_PIX_FMT_BAYER_GRBG16LE - AVPixelFormat AV_PIX_FMT_BAYER_GRBG16BE -- AVPixelFormat AV_PIX_FMT_XVMC - AVPixelFormat AV_PIX_FMT_YUV440P10LE - AVPixelFormat AV_PIX_FMT_YUV440P10BE - AVPixelFormat AV_PIX_FMT_YUV440P12LE -@@ -294,7 +293,7 @@ cdef extern from "libavcodec/avcodec.h": +@@ -295,6 +295,7 @@ cdef extern from "libavcodec/avcodec.h": int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options) AVFrame* av_frame_alloc() void av_frame_free(AVFrame **frame) -- int avcodec_close(AVCodecContext *avctx) -+ void avcodec_free_context(AVCodecContext **avctx) ++ int avcodec_close(AVCodecContext *avctx) #actual decoding: AVPacket *av_packet_alloc() nogil -@@ -462,7 +461,6 @@ FORMAT_TO_STR = { - AV_PIX_FMT_BAYER_GBRG16BE : "BAYER_GBRG16BE", - AV_PIX_FMT_BAYER_GRBG16LE : "BAYER_GRBG16LE", - AV_PIX_FMT_BAYER_GRBG16BE : "BAYER_GRBG16BE", -- AV_PIX_FMT_XVMC : "XVMC", - AV_PIX_FMT_YUV440P10LE : "YUV440P10LE", - AV_PIX_FMT_YUV440P10BE : "YUV440P10BE", - AV_PIX_FMT_YUV440P12LE : "YUV440P12LE", -@@ -812,10 +810,7 @@ cdef class Decoder: +@@ -818,7 +819,10 @@ cdef class Decoder: img.clone_pixel_data() log("clean_decoder() freeing AVCodecContext: %#x", self.codec_ctx) if self.codec_ctx!=NULL: -- r = avcodec_close(self.codec_ctx) -- if r!=0: -- log.error("Error: failed to close decoder context %#x:", self.codec_ctx) -- log.error(" %s", av_error_str(r)) -+ avcodec_free_context(&self.codec_ctx) - av_free(self.codec_ctx) - self.codec_ctx = NULL +- avcodec_free_context(&self.codec_ctx) ++ r = avcodec_close(self.codec_ctx) ++ if r!=0: ++ log.error("Error: failed to close decoder context %#x:", self.codec_ctx) ++ log.error(" %s", av_error_str(r)) f = self.file + if f: + self.file = None diff --git a/xpra/codecs/ffmpeg/encoder.pyx b/xpra/codecs/ffmpeg/encoder.pyx index 6af88a5629..5df0c590c0 100644 --- a/xpra/codecs/ffmpeg/encoder.pyx @@ -180,3 +163,5 @@ index 6af88a5629..5df0c590c0 100644 -- 2.44.0 +--- xpra/codecs/ffmpeg/decoder.pyx.orig 2024-10-11 13:55:29.562576235 +0100 ++++ xpra/codecs/ffmpeg/decoder.pyx 2024-10-11 14:00:42.835059698 +0100 diff --git a/ignore_assert_pandoc.patch b/ignore_assert_pandoc.patch index ceacee9..81f654e 100644 --- a/ignore_assert_pandoc.patch +++ b/ignore_assert_pandoc.patch @@ -28,12 +28,12 @@ Traceback (most recent call last): assert r==0, "'%s' returned %s" % (" ".join(cmd), r) ^^^^ AssertionError: 'pandoc --from markdown --to html -o /builddir/build/BUILDROOT/xpra-4.4.4-1.fc38.ppc64le/usr/share/doc/xpra/Build/Debian.html ./docs/Build/Debian.md --lua-filter ./fs/bin/links-to-html.lua' returned -11 ---- ./setup.py.orig 2023-03-13 17:59:39.193977373 +0000 -+++ ./setup.py 2023-03-13 17:59:48.477944801 +0000 -@@ -410,7 +410,7 @@ def convert_doc(fsrc, fdst, fmt="html", +--- ./setup.py.orig 2024-10-11 13:20:23.798168651 +0100 ++++ ./setup.py 2024-10-11 13:23:23.220858810 +0100 +@@ -514,7 +514,7 @@ def convert_doc(fsrc, fdst, fmt="html", else: cmd += ["--lua-filter", "./fs/bin/links-to-html.lua"] - r = subprocess.Popen(cmd).wait(30) + r = subprocess.Popen(cmd).wait(TIMEOUT) - assert r==0, "'%s' returned %s" % (" ".join(cmd), r) + #assert r==0, "'%s' returned %s" % (" ".join(cmd), r) diff --git a/sources b/sources index 0fb0044..ede007b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-5.0.6.tar.gz) = c25a763f4925c2ee987d7994cb040538635ba32bdfec830f386cae48e6acf4644b68198f79f42ddfef8174a16d6b40cdcedd75756fec1b23baa2319947a573be +SHA512 (xpra-5.0.10.tar.gz) = e1b01eb1d36351db460d7631dd33efd24e68d374784d803fcd8ad6774b25509dcd42c2d62fd00999ec513265745a3be17dde611a61c07fa70136f319a9a4eaca diff --git a/xpra.spec b/xpra.spec index 0408794..7d8f4db 100644 --- a/xpra.spec +++ b/xpra.spec @@ -49,7 +49,7 @@ %endif Name: xpra -Version: 5.0.6 +Version: 5.0.10 Release: %autorelease Summary: Remote display server for applications and desktops # Automatically converted from old format: GPLv2+ and BSD and LGPLv3+ and MIT - review is highly recommended. From ba3b7a9dbcda22a03abaed5767ea2d21ef3e9639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Fri, 11 Oct 2024 18:21:26 +0100 Subject: [PATCH 226/267] Apply FFMPEG-7 only on Fedora 41+ --- 0001-Add-compatibility-with-FFMPEG-7.0.patch | 11 ----------- xpra.spec | 7 ++++++- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/0001-Add-compatibility-with-FFMPEG-7.0.patch b/0001-Add-compatibility-with-FFMPEG-7.0.patch index dfb37d8..d01a792 100644 --- a/0001-Add-compatibility-with-FFMPEG-7.0.patch +++ b/0001-Add-compatibility-with-FFMPEG-7.0.patch @@ -125,14 +125,6 @@ index 6af88a5629..5df0c590c0 100644 global GEN_TO_ENCODER encoder = GEN_TO_ENCODER.get( opaque) #log.warn("write_packet(%#x, %#x, %#x) encoder=%s", opaque, buf, buf_size, type(encoder)) -@@ -1146,6 +1158,7 @@ cdef int write_packet(void *opaque, uint8_t *buf, int buf_size) except 0: - return -1 - return encoder.write_packet( buf, buf_size) - -+ - MAX_WIDTH, MAX_HEIGHT = (4096, 4096) - def get_specs(encoding, colorspace): - assert encoding in get_encodings(), "invalid encoding: %s (must be one of %s" % (encoding, get_encodings()) @@ -1504,7 +1517,7 @@ cdef class Encoder: self.audio_ctx.time_base.num = 1 self.audio_ctx.bit_rate = 64000 @@ -162,6 +154,3 @@ index 6af88a5629..5df0c590c0 100644 return buf_size -- 2.44.0 - ---- xpra/codecs/ffmpeg/decoder.pyx.orig 2024-10-11 13:55:29.562576235 +0100 -+++ xpra/codecs/ffmpeg/decoder.pyx 2024-10-11 14:00:42.835059698 +0100 diff --git a/xpra.spec b/xpra.spec index 7d8f4db..89c4b46 100644 --- a/xpra.spec +++ b/xpra.spec @@ -182,7 +182,12 @@ Xpra is usable over reasonably slow links and does its best to adapt to changing network bandwidth constraints. %prep -%autosetup -p1 -n %{name}-%{version} +%setup -q -n %{name}-%{version} + +%patch -P1 -p1 +%if 0%{?fedora} >= 41 +%patch -P2 -p1 +%endif # cc1: error: unrecognized compiler option ‘-mfpmath=387’ %ifarch %{arm} From 7c57f6a49641fe5f8bb3b4a154625f640727ec02 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:14:48 +0000 Subject: [PATCH 227/267] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 3505b50839397d0310f7129057fefe698fee14fb Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Wed, 22 Jan 2025 19:47:41 +0100 Subject: [PATCH 228/267] Fix GCC15 builds --- xpra.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xpra.spec b/xpra.spec index 89c4b46..23a1b17 100644 --- a/xpra.spec +++ b/xpra.spec @@ -196,6 +196,7 @@ sed -i 's|-mfpmath=387|-mfloat-abi=hard|' setup.py %build %set_build_flags +export CFLAGS="%{optflags} -I%{_includedir}/security" %py3_build -- \ --without-nvidia --without-pandoc_lua \ --with-verbose \ From d67327a2cfe3de615ebb91a2c766cb8630e392d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 17:03:13 +0100 Subject: [PATCH 229/267] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- xpra.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/xpra.spec b/xpra.spec index 23a1b17..280863c 100644 --- a/xpra.spec +++ b/xpra.spec @@ -160,7 +160,6 @@ Requires: js-jquery #%%{?fedora:Requires: python3-opencv} # Needed to create the xpra group -Requires(pre): shadow-utils # xpra-html5 is now separately provided Obsoletes: xpra-html5 < 0:4.1-1 @@ -194,6 +193,11 @@ network bandwidth constraints. sed -i 's|-mfpmath=387|-mfloat-abi=hard|' setup.py %endif +# Create a sysusers.d config file +cat >xpra.sysusers.conf </dev/null || groupadd -r xpra %files %license COPYING @@ -323,6 +327,7 @@ getent group xpra >/dev/null || groupadd -r xpra %{_unitdir}/xpra.service %{_unitdir}/xpra.socket %{_udevrulesdir}/71-xpra-virtual-pointer.rules +%{_sysusersdir}/xpra.conf %changelog %autochangelog From afb4968a110ad7464f230b58e28b86cbdef74785 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 14:09:14 +0200 Subject: [PATCH 230/267] Rebuilt for Python 3.14 From f28bdb37bcbe8df53f82caddfac8e408b111e860 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Wed, 11 Jun 2025 21:39:48 +0200 Subject: [PATCH 231/267] Release 5.1 (rhbz#2350289) --- .gitignore | 1 + ignore_assert_pandoc.patch | 41 -------------------------------------- sources | 2 +- xpra.spec | 8 ++------ 4 files changed, 4 insertions(+), 48 deletions(-) delete mode 100644 ignore_assert_pandoc.patch diff --git a/.gitignore b/.gitignore index 2d3c94c..805a493 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,4 @@ /xpra-5.0.3.tar.gz /xpra-5.0.6.tar.gz /xpra-5.0.10.tar.gz +/xpra-5.1.tar.gz diff --git a/ignore_assert_pandoc.patch b/ignore_assert_pandoc.patch deleted file mode 100644 index 81f654e..0000000 --- a/ignore_assert_pandoc.patch +++ /dev/null @@ -1,41 +0,0 @@ -only on ppc64le pandoc returns -11 - - Debian.md -> Debian.html -Traceback (most recent call last): - File "/builddir/build/BUILD/xpra-4.4.4/setup.py", line 2384, in - main() - File "/builddir/build/BUILD/xpra-4.4.4/setup.py", line 2380, in main - setup(**setup_options) - File "/usr/lib64/python3.11/distutils/core.py", line 148, in setup - dist.run_commands() - File "/usr/lib64/python3.11/distutils/dist.py", line 966, in run_commands - self.run_command(cmd) - File "/usr/lib64/python3.11/distutils/dist.py", line 985, in run_command - cmd_obj.run() - File "/usr/lib64/python3.11/distutils/command/install.py", line 584, in run - self.run_command(cmd_name) - File "/usr/lib64/python3.11/distutils/cmd.py", line 313, in run_command - self.distribution.run_command(command) - File "/usr/lib64/python3.11/distutils/dist.py", line 985, in run_command - cmd_obj.run() - File "/builddir/build/BUILD/xpra-4.4.4/setup.py", line 1810, in run - convert_doc_dir("./docs", doc_dir) - File "/builddir/build/BUILD/xpra-4.4.4/setup.py", line 423, in convert_doc_dir - convert_doc_dir(fsrc, fdst, fmt, force) - File "/builddir/build/BUILD/xpra-4.4.4/setup.py", line 426, in convert_doc_dir - convert_doc(fsrc, fdst, fmt, force) - File "/builddir/build/BUILD/xpra-4.4.4/setup.py", line 413, in convert_doc - assert r==0, "'%s' returned %s" % (" ".join(cmd), r) - ^^^^ -AssertionError: 'pandoc --from markdown --to html -o /builddir/build/BUILDROOT/xpra-4.4.4-1.fc38.ppc64le/usr/share/doc/xpra/Build/Debian.html ./docs/Build/Debian.md --lua-filter ./fs/bin/links-to-html.lua' returned -11 ---- ./setup.py.orig 2024-10-11 13:20:23.798168651 +0100 -+++ ./setup.py 2024-10-11 13:23:23.220858810 +0100 -@@ -514,7 +514,7 @@ def convert_doc(fsrc, fdst, fmt="html", - else: - cmd += ["--lua-filter", "./fs/bin/links-to-html.lua"] - r = subprocess.Popen(cmd).wait(TIMEOUT) -- assert r==0, "'%s' returned %s" % (" ".join(cmd), r) -+ #assert r==0, "'%s' returned %s" % (" ".join(cmd), r) - - def convert_doc_dir(src, dst, fmt="html", force=False): - print("%-20s -> %s" % (src, dst)) diff --git a/sources b/sources index ede007b..ec6110c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-5.0.10.tar.gz) = e1b01eb1d36351db460d7631dd33efd24e68d374784d803fcd8ad6774b25509dcd42c2d62fd00999ec513265745a3be17dde611a61c07fa70136f319a9a4eaca +SHA512 (xpra-5.1.tar.gz) = dd35e17870e2c1da63ccf2d771c265c950289a88cfd8af572e75e98da3f7869a30b24399210689abf0bbd8b28a565c9ded5591c9b3d01c82758c7c213cfefa12 diff --git a/xpra.spec b/xpra.spec index 280863c..b5d8719 100644 --- a/xpra.spec +++ b/xpra.spec @@ -49,7 +49,7 @@ %endif Name: xpra -Version: 5.0.10 +Version: 5.1 Release: %autorelease Summary: Remote display server for applications and desktops # Automatically converted from old format: GPLv2+ and BSD and LGPLv3+ and MIT - review is highly recommended. @@ -58,7 +58,6 @@ URL: https://www.xpra.org/ Source0: https://github.com/Xpra-org/xpra/archive/refs/tags/v%{version}/%{name}-%{version}.tar.gz # Appdata file for Fedora Source1: %{name}.appdata.xml -Patch1: ignore_assert_pandoc.patch # Add compatibility with FFMPEG 7.0 # https://github.com/Xpra-org/xpra/pull/4216 Patch2: 0001-Add-compatibility-with-FFMPEG-7.0.patch @@ -181,12 +180,9 @@ Xpra is usable over reasonably slow links and does its best to adapt to changing network bandwidth constraints. %prep -%setup -q -n %{name}-%{version} +%autosetup -N -n %{name}-%{version} -%patch -P1 -p1 -%if 0%{?fedora} >= 41 %patch -P2 -p1 -%endif # cc1: error: unrecognized compiler option ‘-mfpmath=387’ %ifarch %{arm} From f0726afea1575bd8f2880c6940916f204660ea4f Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sun, 13 Jul 2025 21:25:15 +0200 Subject: [PATCH 232/267] Release 5.1.1 (rhbz#2378508) (rhbz#2377058) --- .gitignore | 1 + sources | 2 +- xpra.spec | 82 +++++++++++++----------------------------------------- 3 files changed, 21 insertions(+), 64 deletions(-) diff --git a/.gitignore b/.gitignore index 805a493..39816ea 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,4 @@ /xpra-5.0.6.tar.gz /xpra-5.0.10.tar.gz /xpra-5.1.tar.gz +/xpra-5.1.1.tar.gz diff --git a/sources b/sources index ec6110c..a391340 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-5.1.tar.gz) = dd35e17870e2c1da63ccf2d771c265c950289a88cfd8af572e75e98da3f7869a30b24399210689abf0bbd8b28a565c9ded5591c9b3d01c82758c7c213cfefa12 +SHA512 (xpra-5.1.1.tar.gz) = 02c25931668cf655184eb4042e1d693a62bfd51318f0a3353c97c1b7372dab1b3e00eff42bd579c0ccf7c95ddba161a75435348700424b6c9505abe3d3131472 diff --git a/xpra.spec b/xpra.spec index b5d8719..02c51f0 100644 --- a/xpra.spec +++ b/xpra.spec @@ -1,42 +1,9 @@ -%bcond_with enc_x264 -%bcond_with enc_x265 -# Theses settings requires 64bit -%if 0%{?__isa_bits} == 64 -%bcond_without dec_avcodec2 -%bcond_without csc_swscale -%else -%bcond_with dec_avcodec2 -%bcond_with csc_swscale -%endif - # For debugging only %bcond_with debug -%if %{with debug} -%global _with_debug --with-debug -%endif # %global __js_jquery_latest %{_datadir}/javascript/jquery/latest/ -# These are necessary as the _with_foo is *not* defined if the -# --with flag isn't specifed, and we need to have the --without -# specified option in that case. -%if %{without enc_x264} -%global _with_enc_x264 --without-enc_x264 -%endif - -%if %{with enc_x265} -%global _with_enc_x265 --with-enc_x265 -%endif - -%if %{without dec_avcodec2} -%global _with_dec_avcodec2 --without-dec_avcodec2 -%endif - -%if %{without csc_swscale} -%global _with_csc_swscale --without-csc_swscale -%endif - # Remove private provides from .so files in the python3_sitearch directory %global __provides_exclude_from ^%{python3_sitearch}/.*\\.so$ @@ -49,11 +16,10 @@ %endif Name: xpra -Version: 5.1 +Version: 5.1.1 Release: %autorelease Summary: Remote display server for applications and desktops -# Automatically converted from old format: GPLv2+ and BSD and LGPLv3+ and MIT - review is highly recommended. -License: GPL-2.0-or-later AND LicenseRef-Callaway-BSD AND LGPL-3.0-or-later AND LicenseRef-Callaway-MIT +License: GPL-2.0-or-later AND BSD-2-Clause AND LGPL-3.0-or-later AND BSD-3-Clause URL: https://www.xpra.org/ Source0: https://github.com/Xpra-org/xpra/archive/refs/tags/v%{version}/%{name}-%{version}.tar.gz # Appdata file for Fedora @@ -97,6 +63,7 @@ BuildRequires: pygobject3-devel BuildRequires: python3-gobject-devel %endif BuildRequires: libappstream-glib +BuildRequires: libasan BuildRequires: python3-cairo-devel BuildRequires: xorg-x11-server-Xorg BuildRequires: xorg-x11-drv-dummy @@ -194,30 +161,21 @@ cat >xpra.sysusers.conf < Date: Fri, 25 Jul 2025 21:03:00 +0000 Subject: [PATCH 233/267] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 2a65a0b84092fe4042490337a3cd4426396fd3f2 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Fri, 1 Aug 2025 21:51:38 +0200 Subject: [PATCH 234/267] enable OpenH264 codec --- xpra.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 02c51f0..957adb5 100644 --- a/xpra.spec +++ b/xpra.spec @@ -2,6 +2,12 @@ %bcond_with debug # +%if 0%{?fedora} +%bcond_without openh264 +%else +%bcond_with openh264 +%endif + %global __js_jquery_latest %{_datadir}/javascript/jquery/latest/ # Remove private provides from .so files in the python3_sitearch directory @@ -84,6 +90,9 @@ BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libswscale) #endif +%if %{with openh264} +BuildRequires: noopenh264-devel +%endif Requires: python3-pillow Requires: python3-cups @@ -166,7 +175,7 @@ EOF %build export CFLAGS="%{optflags} -I%{_includedir}/security" -%pyproject_wheel -C--global-option=--without-nvidia -C--global-option=--without-pandoc_lua -C--global-option=--with-verbose -C--global-option=--with-Xdummy -C--global-option=--with-Xdummy_wrapper -C--global-option=--without-strict -C--global-option=--with-enc_ffmpeg -C--global-option=--with-vpx -C--global-option=--with-dec_avcodec2 -C--global-option=--with-csc_swscale -C--global-option=--with-debug +%pyproject_wheel -C--global-option=--without-nvidia -C--global-option=--without-pandoc_lua -C--global-option=--with-verbose -C--global-option=--with-Xdummy -C--global-option=--with-Xdummy_wrapper -C--global-option=--without-strict -C--global-option=--with-enc_ffmpeg -C--global-option=--with-vpx -C--global-option=--with-dec_avcodec2 -C--global-option=--with-csc_swscale -C--global-option=--with-debug -C--global-option=--with-openh264 -C--global-option=--with-openh264_decoder -C--global-option=--with-openh264_encoder %install %pyproject_install From 912f50d33e2ceae7c63b25b069b0b9f63026f5e3 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:23:26 +0200 Subject: [PATCH 235/267] Rebuilt for Python 3.14.0rc2 bytecode From b98426abb3501350a69d3fa923cb39861d479ce5 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 15:04:01 +0200 Subject: [PATCH 236/267] Rebuilt for Python 3.14.0rc3 bytecode From 661277ad120c51e23912b80ac1a1d9a93d5bb236 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 15 Oct 2025 10:45:29 +0200 Subject: [PATCH 237/267] Fixed build with FFmpeg 8 --- xpra-ffmpeg8.patch | 212 +++++++++++++++++++++++++++++++++++++++++++++ xpra.spec | 3 + 2 files changed, 215 insertions(+) create mode 100644 xpra-ffmpeg8.patch diff --git a/xpra-ffmpeg8.patch b/xpra-ffmpeg8.patch new file mode 100644 index 0000000..90e960e --- /dev/null +++ b/xpra-ffmpeg8.patch @@ -0,0 +1,212 @@ +diff -up xpra-5.1.1/xpra/codecs/ffmpeg/decoder.pyx.ffmpeg8 xpra-5.1.1/xpra/codecs/ffmpeg/decoder.pyx +--- xpra-5.1.1/xpra/codecs/ffmpeg/decoder.pyx.ffmpeg8 2025-10-19 10:39:15.728402019 +0200 ++++ xpra-5.1.1/xpra/codecs/ffmpeg/decoder.pyx 2025-10-19 10:40:43.019264310 +0200 +@@ -294,7 +294,6 @@ cdef extern from "libavcodec/avcodec.h": + int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options) + AVFrame* av_frame_alloc() + void av_frame_free(AVFrame **frame) +- int avcodec_close(AVCodecContext *avctx) + + #actual decoding: + AVPacket *av_packet_alloc() nogil +@@ -816,11 +815,7 @@ cdef class Decoder: + if not img.freed: + img.clone_pixel_data() + log("clean_decoder() freeing AVCodecContext: %#x", self.codec_ctx) +- if self.codec_ctx!=NULL: +- r = avcodec_close(self.codec_ctx) +- if r!=0: +- log.error("Error: failed to close decoder context %#x:", self.codec_ctx) +- log.error(" %s", av_error_str(r)) ++ avcodec_free_context(&self.codec_ctx) + f = self.file + if f: + self.file = None +diff -up xpra-5.1.1/xpra/codecs/ffmpeg/encoder.pyx.ffmpeg8 xpra-5.1.1/xpra/codecs/ffmpeg/encoder.pyx +--- xpra-5.1.1/xpra/codecs/ffmpeg/encoder.pyx.ffmpeg8 2025-10-19 10:39:15.728768966 +0200 ++++ xpra-5.1.1/xpra/codecs/ffmpeg/encoder.pyx 2025-10-20 11:29:30.696347049 +0200 +@@ -144,28 +144,28 @@ cdef extern from "libavcodec/avcodec.h": + int FF_THREAD_SLICE #allow more than one thread per frame + int FF_THREAD_FRAME #Decode more than one frame at once + +- int FF_PROFILE_H264_CONSTRAINED +- int FF_PROFILE_H264_INTRA +- int FF_PROFILE_H264_BASELINE +- int FF_PROFILE_H264_CONSTRAINED_BASELINE +- int FF_PROFILE_H264_MAIN +- int FF_PROFILE_H264_EXTENDED +- int FF_PROFILE_H264_HIGH +- int FF_PROFILE_H264_HIGH_10 +- int FF_PROFILE_H264_HIGH_10_INTRA +- int FF_PROFILE_H264_MULTIVIEW_HIGH +- int FF_PROFILE_H264_HIGH_422 +- int FF_PROFILE_H264_HIGH_422_INTRA +- int FF_PROFILE_H264_STEREO_HIGH +- int FF_PROFILE_H264_HIGH_444 +- int FF_PROFILE_H264_HIGH_444_PREDICTIVE +- int FF_PROFILE_H264_HIGH_444_INTRA +- int FF_PROFILE_H264_CAVLC_444 +- +- int FF_PROFILE_HEVC_MAIN +- int FF_PROFILE_HEVC_MAIN_10 +- int FF_PROFILE_HEVC_MAIN_STILL_PICTURE +- int FF_PROFILE_HEVC_REXT ++ int AV_PROFILE_H264_CONSTRAINED ++ int AV_PROFILE_H264_INTRA ++ int AV_PROFILE_H264_BASELINE ++ int AV_PROFILE_H264_CONSTRAINED_BASELINE ++ int AV_PROFILE_H264_MAIN ++ int AV_PROFILE_H264_EXTENDED ++ int AV_PROFILE_H264_HIGH ++ int AV_PROFILE_H264_HIGH_10 ++ int AV_PROFILE_H264_HIGH_10_INTRA ++ int AV_PROFILE_H264_MULTIVIEW_HIGH ++ int AV_PROFILE_H264_HIGH_422 ++ int AV_PROFILE_H264_HIGH_422_INTRA ++ int AV_PROFILE_H264_STEREO_HIGH ++ int AV_PROFILE_H264_HIGH_444 ++ int AV_PROFILE_H264_HIGH_444_PREDICTIVE ++ int AV_PROFILE_H264_HIGH_444_INTRA ++ int AV_PROFILE_H264_CAVLC_444 ++ ++ int AV_PROFILE_HEVC_MAIN ++ int AV_PROFILE_HEVC_MAIN_10 ++ int AV_PROFILE_HEVC_MAIN_STILL_PICTURE ++ int AV_PROFILE_HEVC_REXT + + int AV_CODEC_FLAG_UNALIGNED + int AV_CODEC_FLAG_QSCALE +@@ -187,7 +187,6 @@ cdef extern from "libavcodec/avcodec.h": + #int AV_CODEC_CAP_TRUNCATED + int AV_CODEC_CAP_DELAY + int AV_CODEC_CAP_SMALL_LAST_FRAME +- int AV_CODEC_CAP_SUBFRAMES + int AV_CODEC_CAP_EXPERIMENTAL + int AV_CODEC_CAP_CHANNEL_CONF + int AV_CODEC_CAP_FRAME_THREADS +@@ -468,7 +467,6 @@ cdef extern from "libavcodec/avcodec.h": + + AVFrame* av_frame_alloc() + void av_frame_free(AVFrame **frame) +- int avcodec_close(AVCodecContext *avctx) + void av_frame_unref(AVFrame *frame) nogil + + AVPacket *av_packet_alloc() nogil +@@ -562,7 +560,6 @@ cdef extern from "libavformat/avformat.h + int AVFMT_NOBINSEARCH #Format does not allow to fall back on binary search via read_timestamp + int AVFMT_NOGENSEARCH #Format does not allow to fall back on generic search + int AVFMT_NO_BYTE_SEEK #Format does not allow seeking by bytes +- int AVFMT_ALLOW_FLUSH #Format allows flushing. If not set, the muxer will not receive a NULL packet in the write_packet function + int AVFMT_TS_NONSTRICT #Format does not require strictly increasing timestamps, but they must still be monotonic + int AVFMT_TS_NEGATIVE #Format allows muxing negative timestamps. + int AVFMT_SEEK_TO_PTS #Seeking is based on PTS +@@ -587,7 +584,7 @@ cdef extern from "libavformat/avformat.h + AVCodecID audio_codec + AVCodecID video_codec + AVCodecID subtitle_codec +- int flags #AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_GLOBALHEADER, AVFMT_NOTIMESTAMPS, AVFMT_VARIABLE_FPS, AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS, AVFMT_ALLOW_FLUSH, AVFMT_TS_NONSTRICT, AVFMT_TS_NEGATIVE More... ++ int flags #AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_GLOBALHEADER, AVFMT_NOTIMESTAMPS, AVFMT_VARIABLE_FPS, AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS, AVFMT_TS_NONSTRICT, AVFMT_TS_NEGATIVE More... + int (*query_codec)(AVCodecID id, int std_compliance) + + const AVOutputFormat *av_muxer_iterate(void **opaque) +@@ -641,31 +638,31 @@ cdef extern from "libavutil/hwcontext.h" + + + H264_PROFILE_NAMES = { +- FF_PROFILE_H264_CONSTRAINED : "constrained", +- FF_PROFILE_H264_INTRA : "intra", +- FF_PROFILE_H264_BASELINE : "baseline", +- FF_PROFILE_H264_CONSTRAINED_BASELINE : "constrained baseline", +- FF_PROFILE_H264_MAIN : "main", +- FF_PROFILE_H264_EXTENDED : "extended", +- FF_PROFILE_H264_HIGH : "high", +- FF_PROFILE_H264_HIGH_10 : "high10", +- FF_PROFILE_H264_HIGH_10_INTRA : "high10 intra", +- FF_PROFILE_H264_MULTIVIEW_HIGH : "multiview high", +- FF_PROFILE_H264_HIGH_422 : "high422", +- FF_PROFILE_H264_HIGH_422_INTRA : "high422 intra", +- FF_PROFILE_H264_STEREO_HIGH : "stereo high", +- FF_PROFILE_H264_HIGH_444 : "high444", +- FF_PROFILE_H264_HIGH_444_PREDICTIVE : "high444 predictive", +- FF_PROFILE_H264_HIGH_444_INTRA : "high444 intra", +- FF_PROFILE_H264_CAVLC_444 : "cavlc 444", ++ AV_PROFILE_H264_CONSTRAINED : "constrained", ++ AV_PROFILE_H264_INTRA : "intra", ++ AV_PROFILE_H264_BASELINE : "baseline", ++ AV_PROFILE_H264_CONSTRAINED_BASELINE : "constrained baseline", ++ AV_PROFILE_H264_MAIN : "main", ++ AV_PROFILE_H264_EXTENDED : "extended", ++ AV_PROFILE_H264_HIGH : "high", ++ AV_PROFILE_H264_HIGH_10 : "high10", ++ AV_PROFILE_H264_HIGH_10_INTRA : "high10 intra", ++ AV_PROFILE_H264_MULTIVIEW_HIGH : "multiview high", ++ AV_PROFILE_H264_HIGH_422 : "high422", ++ AV_PROFILE_H264_HIGH_422_INTRA : "high422 intra", ++ AV_PROFILE_H264_STEREO_HIGH : "stereo high", ++ AV_PROFILE_H264_HIGH_444 : "high444", ++ AV_PROFILE_H264_HIGH_444_PREDICTIVE : "high444 predictive", ++ AV_PROFILE_H264_HIGH_444_INTRA : "high444 intra", ++ AV_PROFILE_H264_CAVLC_444 : "cavlc 444", + } + H264_PROFILES = reverse_dict(H264_PROFILE_NAMES) + + HEVC_PROFILE_NAMES = { +- FF_PROFILE_HEVC_MAIN : "main", +- FF_PROFILE_HEVC_MAIN_10 : "main10", +- FF_PROFILE_HEVC_MAIN_STILL_PICTURE : "picture", +- FF_PROFILE_HEVC_REXT : "rext", ++ AV_PROFILE_HEVC_MAIN : "main", ++ AV_PROFILE_HEVC_MAIN_10 : "main10", ++ AV_PROFILE_HEVC_MAIN_STILL_PICTURE : "picture", ++ AV_PROFILE_HEVC_REXT : "rext", + } + HEVC_PROFILES = reverse_dict(HEVC_PROFILE_NAMES) + +@@ -762,7 +759,6 @@ AVFMT = { + AVFMT_NOBINSEARCH : "NOBINSEARCH", + AVFMT_NOGENSEARCH : "NOGENSEARCH", + AVFMT_NO_BYTE_SEEK : "NO_BYTE_SEEK", +- AVFMT_ALLOW_FLUSH : "ALLOW_FLUSH", + AVFMT_TS_NONSTRICT : "TS_NONSTRICT", + AVFMT_TS_NEGATIVE : "TS_NEGATIVE", + AVFMT_SEEK_TO_PTS : "SEEK_TO_PTS", +@@ -775,7 +771,6 @@ CAPS = { + #AV_CODEC_CAP_TRUNCATED : "TRUNCATED", + AV_CODEC_CAP_DELAY : "DELAY", + AV_CODEC_CAP_SMALL_LAST_FRAME : "SMALL_LAST_FRAME", +- AV_CODEC_CAP_SUBFRAMES : "SUBFRAMES", + AV_CODEC_CAP_EXPERIMENTAL : "EXPERIMENTAL", + AV_CODEC_CAP_CHANNEL_CONF : "CHANNEL_CONF", + AV_CODEC_CAP_FRAME_THREADS : "FRAME_THREADS", +@@ -1316,8 +1311,6 @@ cdef class Encoder: + raise ValueError(f"libavformat does not support {self.muxer_format}") + log("init_muxer(%i) AVOutputFormat(%s)=%#x, flags=%s", + gen, self.muxer_format, oformat, flagscsv(AVFMT, oformat.flags)) +- if oformat.flags & AVFMT_ALLOW_FLUSH==0: +- raise RuntimeError("AVOutputFormat(%s) does not support flushing!" % self.muxer_format) + r = avformat_alloc_output_context2(&self.muxer_ctx, oformat, strtobytes(self.muxer_format), NULL) + if r!=0: + msg = av_error_str(r) +@@ -1574,20 +1567,8 @@ cdef class Encoder: + av_free(self.buffer) + self.buffer = NULL + log("clean_encoder() freeing AVCodecContext: %#x", self.video_ctx) +- if self.video_ctx: +- r = avcodec_close(self.video_ctx) +- if r!=0: +- log.error("Error: failed to close video encoder context %#x", self.video_ctx) +- log.error(" %s", av_error_str(r)) +- av_free(self.video_ctx) +- self.video_ctx = NULL +- if self.audio_ctx: +- r = avcodec_close(self.audio_ctx) +- if r!=0: +- log.error("Error: failed to close audio encoder context %#x", self.audio_ctx) +- log.error(" %s", av_error_str(r)) +- av_free(self.audio_ctx) +- self.audio_ctx = NULL ++ avcodec_free_context(&self.video_ctx) ++ avcodec_free_context(&self.audio_ctx) + if self.hw_device_ctx: + av_buffer_unref(&self.hw_device_ctx) + log("clean_encoder() done") diff --git a/xpra.spec b/xpra.spec index 957adb5..03d219f 100644 --- a/xpra.spec +++ b/xpra.spec @@ -33,6 +33,8 @@ Source1: %{name}.appdata.xml # Add compatibility with FFMPEG 7.0 # https://github.com/Xpra-org/xpra/pull/4216 Patch2: 0001-Add-compatibility-with-FFMPEG-7.0.patch +# Fix build with FFmpeg 8.0 +Patch3: xpra-ffmpeg8.patch BuildRequires: python3-devel BuildRequires: gtk3-devel @@ -159,6 +161,7 @@ network bandwidth constraints. %autosetup -N -n %{name}-%{version} %patch -P2 -p1 +%patch -P3 -p1 -b .ffmpeg8 # cc1: error: unrecognized compiler option ‘-mfpmath=387’ %ifarch %{arm} From 6d45e7c80c7287682fc93228cb37ed1ddc278890 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Mon, 27 Oct 2025 22:40:40 +0100 Subject: [PATCH 238/267] Release 6.3.4 (rhbz#2266632) --- .gitignore | 1 + 0001-Add-compatibility-with-FFMPEG-7.0.patch | 156 -------------- sources | 2 +- xpra-ffmpeg8.patch | 212 ------------------- xpra.spec | 125 ++++++----- 5 files changed, 74 insertions(+), 422 deletions(-) delete mode 100644 0001-Add-compatibility-with-FFMPEG-7.0.patch delete mode 100644 xpra-ffmpeg8.patch diff --git a/.gitignore b/.gitignore index 39816ea..eaa5b82 100644 --- a/.gitignore +++ b/.gitignore @@ -91,3 +91,4 @@ /xpra-5.0.10.tar.gz /xpra-5.1.tar.gz /xpra-5.1.1.tar.gz +/xpra-6.3.4.tar.gz diff --git a/0001-Add-compatibility-with-FFMPEG-7.0.patch b/0001-Add-compatibility-with-FFMPEG-7.0.patch deleted file mode 100644 index d01a792..0000000 --- a/0001-Add-compatibility-with-FFMPEG-7.0.patch +++ /dev/null @@ -1,156 +0,0 @@ -From 6722df9aeb90857bc1c979c92d47e57903e0ebd6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= -Date: Tue, 7 May 2024 07:23:07 +0200 -Subject: [PATCH] Add compatibility with FFMPEG 7.0 - -channel_layout has been replaced with ch_layout - -avcodec_close has been deprecated in favor of avcodec_free_context - -avio: Constify data pointees of write callbacks - -FF_API_FRAME_PICTURE_NUMBER has been deprecated - -AV_PIX_FMT_XVMC has been deprecated ---- - xpra/codecs/ffmpeg/decoder.pyx | 9 ++------- - xpra/codecs/ffmpeg/encoder.pyx | 37 ++++++++++++++++++++++------------ - 2 files changed, 26 insertions(+), 20 deletions(-) - -diff --git a/xpra/codecs/ffmpeg/decoder.pyx b/xpra/codecs/ffmpeg/decoder.pyx -index 4f71b5bf1f..f1df36a85a 100644 ---- a/xpra/codecs/ffmpeg/decoder.pyx -+++ b/xpra/codecs/ffmpeg/decoder.pyx -@@ -295,6 +295,7 @@ cdef extern from "libavcodec/avcodec.h": - int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options) - AVFrame* av_frame_alloc() - void av_frame_free(AVFrame **frame) -+ int avcodec_close(AVCodecContext *avctx) - - #actual decoding: - AVPacket *av_packet_alloc() nogil -@@ -818,7 +819,10 @@ cdef class Decoder: - img.clone_pixel_data() - log("clean_decoder() freeing AVCodecContext: %#x", self.codec_ctx) - if self.codec_ctx!=NULL: -- avcodec_free_context(&self.codec_ctx) -+ r = avcodec_close(self.codec_ctx) -+ if r!=0: -+ log.error("Error: failed to close decoder context %#x:", self.codec_ctx) -+ log.error(" %s", av_error_str(r)) - f = self.file - if f: - self.file = None -diff --git a/xpra/codecs/ffmpeg/encoder.pyx b/xpra/codecs/ffmpeg/encoder.pyx -index 6af88a5629..5df0c590c0 100644 ---- a/xpra/codecs/ffmpeg/encoder.pyx -+++ b/xpra/codecs/ffmpeg/encoder.pyx -@@ -120,10 +120,26 @@ cdef extern from "libavformat/avio.h": - AVIOContext *avio_alloc_context(unsigned char *buffer, int buffer_size, int write_flag, - void *opaque, - int (*read_packet)(void *opaque, uint8_t *buf, int buf_size), -- int (*write_packet)(void *opaque, uint8_t *buf, int buf_size) except 0, -+ int (*write_packet)(void *opaque, const uint8_t *buf, int buf_size) except 0, - int64_t (*seek)(void *opaque, int64_t offset, int whence)) - - -+cdef extern from "libavutil/channel_layout.h": -+ ctypedef int AVChannelOrder -+ ctypedef int AVChannel -+ ctypedef struct AVChannelCustom: -+ AVChannel id -+ char name[16] -+ void *opaque -+ ctypedef union ChannelUnion: -+ uint64_t mask -+ AVChannelCustom* map -+ ctypedef struct AVChannelLayout: -+ AVChannelOrder order -+ int nb_channels -+ ChannelUnion u -+ void *opaque -+ - cdef extern from "libavcodec/avcodec.h": - int FF_THREAD_SLICE #allow more than one thread per frame - int FF_THREAD_FRAME #Decode more than one frame at once -@@ -190,8 +206,6 @@ cdef extern from "libavcodec/avcodec.h": - int format - int key_frame - int64_t pts -- int coded_picture_number -- int display_picture_number - int quality - void *opaque - AVPictureType pict_type -@@ -288,14 +302,12 @@ cdef extern from "libavcodec/avcodec.h": - #skipped: AVColor* - int slices - int sample_rate -- int channels - AVSampleFormat sample_fmt -+ AVChannelLayout ch_layout - int frame_size - int frame_number - int block_align - int cutoff -- uint64_t channel_layout -- uint64_t request_channel_layout - #skipped: AVAudioServiceType - # AVSampleFormat - int refcounted_frames -@@ -483,7 +495,7 @@ cdef extern from "libavutil/opt.h": - AVOptionType AV_OPT_TYPE_VIDEO_RATE - AVOptionType AV_OPT_TYPE_DURATION - AVOptionType AV_OPT_TYPE_COLOR -- AVOptionType AV_OPT_TYPE_CHANNEL_LAYOUT -+ AVOptionType AV_OPT_TYPE_CHLAYOUT - AVOptionType AV_OPT_TYPE_BOOL - - int AV_OPT_SEARCH_CHILDREN -@@ -686,7 +698,7 @@ AV_OPT_TYPES = { - AV_OPT_TYPE_VIDEO_RATE : "VIDEO_RATE", - AV_OPT_TYPE_DURATION : "DURATION", - AV_OPT_TYPE_COLOR : "COLOR", -- AV_OPT_TYPE_CHANNEL_LAYOUT : "CHANNEL_LAYOUT", -+ AV_OPT_TYPE_CHLAYOUT : "CHANNEL_LAYOUT", - AV_OPT_TYPE_BOOL : "BOOL", - } - -@@ -1137,7 +1149,7 @@ cdef list_options(void *obj, const AVClass *av_class, int skip=1): - list_options(child, child_class, skip-1) - - --cdef int write_packet(void *opaque, uint8_t *buf, int buf_size) except 0: -+cdef int write_packet(void *opaque, const uint8_t *buf, int buf_size) except 0: - global GEN_TO_ENCODER - encoder = GEN_TO_ENCODER.get( opaque) - #log.warn("write_packet(%#x, %#x, %#x) encoder=%s", opaque, buf, buf_size, type(encoder)) -@@ -1504,7 +1517,7 @@ cdef class Encoder: - self.audio_ctx.time_base.num = 1 - self.audio_ctx.bit_rate = 64000 - self.audio_ctx.sample_rate = 44100 -- self.audio_ctx.channels = 2 -+ self.audio_ctx.ch_layout.nb_channels = 2 - #if audio_codec.capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE: - # pass - #cdef AVDictionary *opts = NULL -@@ -1689,8 +1702,6 @@ cdef class Encoder: - self.av_frame.height = self.height - self.av_frame.format = self.pix_fmt - self.av_frame.pts = self.frames+1 -- self.av_frame.coded_picture_number = self.frames+1 -- self.av_frame.display_picture_number = self.frames+1 - #if self.frames==0: - self.av_frame.pict_type = AV_PICTURE_TYPE_I - #self.av_frame.key_frame = 1 -@@ -1823,7 +1834,7 @@ cdef class Encoder: - - def write_packet(self, uintptr_t buf, int buf_size): - log("write_packet(%#x, %#x)", buf, buf_size) -- cdef uint8_t *cbuf = buf -+ cdef const uint8_t *cbuf = buf - buffer = cbuf[:buf_size] - self.buffers.append(buffer) - return buf_size --- -2.44.0 diff --git a/sources b/sources index a391340..7c3a737 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-5.1.1.tar.gz) = 02c25931668cf655184eb4042e1d693a62bfd51318f0a3353c97c1b7372dab1b3e00eff42bd579c0ccf7c95ddba161a75435348700424b6c9505abe3d3131472 +SHA512 (xpra-6.3.4.tar.gz) = f161bd9142d352c0d31ac64a55be9516c7fbc0f2e9021382a3444a1295436ecf977b693baec9b2a98816c0fa4e590ebcfc1a4f7f1433758113bbb99db932061c diff --git a/xpra-ffmpeg8.patch b/xpra-ffmpeg8.patch deleted file mode 100644 index 90e960e..0000000 --- a/xpra-ffmpeg8.patch +++ /dev/null @@ -1,212 +0,0 @@ -diff -up xpra-5.1.1/xpra/codecs/ffmpeg/decoder.pyx.ffmpeg8 xpra-5.1.1/xpra/codecs/ffmpeg/decoder.pyx ---- xpra-5.1.1/xpra/codecs/ffmpeg/decoder.pyx.ffmpeg8 2025-10-19 10:39:15.728402019 +0200 -+++ xpra-5.1.1/xpra/codecs/ffmpeg/decoder.pyx 2025-10-19 10:40:43.019264310 +0200 -@@ -294,7 +294,6 @@ cdef extern from "libavcodec/avcodec.h": - int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options) - AVFrame* av_frame_alloc() - void av_frame_free(AVFrame **frame) -- int avcodec_close(AVCodecContext *avctx) - - #actual decoding: - AVPacket *av_packet_alloc() nogil -@@ -816,11 +815,7 @@ cdef class Decoder: - if not img.freed: - img.clone_pixel_data() - log("clean_decoder() freeing AVCodecContext: %#x", self.codec_ctx) -- if self.codec_ctx!=NULL: -- r = avcodec_close(self.codec_ctx) -- if r!=0: -- log.error("Error: failed to close decoder context %#x:", self.codec_ctx) -- log.error(" %s", av_error_str(r)) -+ avcodec_free_context(&self.codec_ctx) - f = self.file - if f: - self.file = None -diff -up xpra-5.1.1/xpra/codecs/ffmpeg/encoder.pyx.ffmpeg8 xpra-5.1.1/xpra/codecs/ffmpeg/encoder.pyx ---- xpra-5.1.1/xpra/codecs/ffmpeg/encoder.pyx.ffmpeg8 2025-10-19 10:39:15.728768966 +0200 -+++ xpra-5.1.1/xpra/codecs/ffmpeg/encoder.pyx 2025-10-20 11:29:30.696347049 +0200 -@@ -144,28 +144,28 @@ cdef extern from "libavcodec/avcodec.h": - int FF_THREAD_SLICE #allow more than one thread per frame - int FF_THREAD_FRAME #Decode more than one frame at once - -- int FF_PROFILE_H264_CONSTRAINED -- int FF_PROFILE_H264_INTRA -- int FF_PROFILE_H264_BASELINE -- int FF_PROFILE_H264_CONSTRAINED_BASELINE -- int FF_PROFILE_H264_MAIN -- int FF_PROFILE_H264_EXTENDED -- int FF_PROFILE_H264_HIGH -- int FF_PROFILE_H264_HIGH_10 -- int FF_PROFILE_H264_HIGH_10_INTRA -- int FF_PROFILE_H264_MULTIVIEW_HIGH -- int FF_PROFILE_H264_HIGH_422 -- int FF_PROFILE_H264_HIGH_422_INTRA -- int FF_PROFILE_H264_STEREO_HIGH -- int FF_PROFILE_H264_HIGH_444 -- int FF_PROFILE_H264_HIGH_444_PREDICTIVE -- int FF_PROFILE_H264_HIGH_444_INTRA -- int FF_PROFILE_H264_CAVLC_444 -- -- int FF_PROFILE_HEVC_MAIN -- int FF_PROFILE_HEVC_MAIN_10 -- int FF_PROFILE_HEVC_MAIN_STILL_PICTURE -- int FF_PROFILE_HEVC_REXT -+ int AV_PROFILE_H264_CONSTRAINED -+ int AV_PROFILE_H264_INTRA -+ int AV_PROFILE_H264_BASELINE -+ int AV_PROFILE_H264_CONSTRAINED_BASELINE -+ int AV_PROFILE_H264_MAIN -+ int AV_PROFILE_H264_EXTENDED -+ int AV_PROFILE_H264_HIGH -+ int AV_PROFILE_H264_HIGH_10 -+ int AV_PROFILE_H264_HIGH_10_INTRA -+ int AV_PROFILE_H264_MULTIVIEW_HIGH -+ int AV_PROFILE_H264_HIGH_422 -+ int AV_PROFILE_H264_HIGH_422_INTRA -+ int AV_PROFILE_H264_STEREO_HIGH -+ int AV_PROFILE_H264_HIGH_444 -+ int AV_PROFILE_H264_HIGH_444_PREDICTIVE -+ int AV_PROFILE_H264_HIGH_444_INTRA -+ int AV_PROFILE_H264_CAVLC_444 -+ -+ int AV_PROFILE_HEVC_MAIN -+ int AV_PROFILE_HEVC_MAIN_10 -+ int AV_PROFILE_HEVC_MAIN_STILL_PICTURE -+ int AV_PROFILE_HEVC_REXT - - int AV_CODEC_FLAG_UNALIGNED - int AV_CODEC_FLAG_QSCALE -@@ -187,7 +187,6 @@ cdef extern from "libavcodec/avcodec.h": - #int AV_CODEC_CAP_TRUNCATED - int AV_CODEC_CAP_DELAY - int AV_CODEC_CAP_SMALL_LAST_FRAME -- int AV_CODEC_CAP_SUBFRAMES - int AV_CODEC_CAP_EXPERIMENTAL - int AV_CODEC_CAP_CHANNEL_CONF - int AV_CODEC_CAP_FRAME_THREADS -@@ -468,7 +467,6 @@ cdef extern from "libavcodec/avcodec.h": - - AVFrame* av_frame_alloc() - void av_frame_free(AVFrame **frame) -- int avcodec_close(AVCodecContext *avctx) - void av_frame_unref(AVFrame *frame) nogil - - AVPacket *av_packet_alloc() nogil -@@ -562,7 +560,6 @@ cdef extern from "libavformat/avformat.h - int AVFMT_NOBINSEARCH #Format does not allow to fall back on binary search via read_timestamp - int AVFMT_NOGENSEARCH #Format does not allow to fall back on generic search - int AVFMT_NO_BYTE_SEEK #Format does not allow seeking by bytes -- int AVFMT_ALLOW_FLUSH #Format allows flushing. If not set, the muxer will not receive a NULL packet in the write_packet function - int AVFMT_TS_NONSTRICT #Format does not require strictly increasing timestamps, but they must still be monotonic - int AVFMT_TS_NEGATIVE #Format allows muxing negative timestamps. - int AVFMT_SEEK_TO_PTS #Seeking is based on PTS -@@ -587,7 +584,7 @@ cdef extern from "libavformat/avformat.h - AVCodecID audio_codec - AVCodecID video_codec - AVCodecID subtitle_codec -- int flags #AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_GLOBALHEADER, AVFMT_NOTIMESTAMPS, AVFMT_VARIABLE_FPS, AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS, AVFMT_ALLOW_FLUSH, AVFMT_TS_NONSTRICT, AVFMT_TS_NEGATIVE More... -+ int flags #AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_GLOBALHEADER, AVFMT_NOTIMESTAMPS, AVFMT_VARIABLE_FPS, AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS, AVFMT_TS_NONSTRICT, AVFMT_TS_NEGATIVE More... - int (*query_codec)(AVCodecID id, int std_compliance) - - const AVOutputFormat *av_muxer_iterate(void **opaque) -@@ -641,31 +638,31 @@ cdef extern from "libavutil/hwcontext.h" - - - H264_PROFILE_NAMES = { -- FF_PROFILE_H264_CONSTRAINED : "constrained", -- FF_PROFILE_H264_INTRA : "intra", -- FF_PROFILE_H264_BASELINE : "baseline", -- FF_PROFILE_H264_CONSTRAINED_BASELINE : "constrained baseline", -- FF_PROFILE_H264_MAIN : "main", -- FF_PROFILE_H264_EXTENDED : "extended", -- FF_PROFILE_H264_HIGH : "high", -- FF_PROFILE_H264_HIGH_10 : "high10", -- FF_PROFILE_H264_HIGH_10_INTRA : "high10 intra", -- FF_PROFILE_H264_MULTIVIEW_HIGH : "multiview high", -- FF_PROFILE_H264_HIGH_422 : "high422", -- FF_PROFILE_H264_HIGH_422_INTRA : "high422 intra", -- FF_PROFILE_H264_STEREO_HIGH : "stereo high", -- FF_PROFILE_H264_HIGH_444 : "high444", -- FF_PROFILE_H264_HIGH_444_PREDICTIVE : "high444 predictive", -- FF_PROFILE_H264_HIGH_444_INTRA : "high444 intra", -- FF_PROFILE_H264_CAVLC_444 : "cavlc 444", -+ AV_PROFILE_H264_CONSTRAINED : "constrained", -+ AV_PROFILE_H264_INTRA : "intra", -+ AV_PROFILE_H264_BASELINE : "baseline", -+ AV_PROFILE_H264_CONSTRAINED_BASELINE : "constrained baseline", -+ AV_PROFILE_H264_MAIN : "main", -+ AV_PROFILE_H264_EXTENDED : "extended", -+ AV_PROFILE_H264_HIGH : "high", -+ AV_PROFILE_H264_HIGH_10 : "high10", -+ AV_PROFILE_H264_HIGH_10_INTRA : "high10 intra", -+ AV_PROFILE_H264_MULTIVIEW_HIGH : "multiview high", -+ AV_PROFILE_H264_HIGH_422 : "high422", -+ AV_PROFILE_H264_HIGH_422_INTRA : "high422 intra", -+ AV_PROFILE_H264_STEREO_HIGH : "stereo high", -+ AV_PROFILE_H264_HIGH_444 : "high444", -+ AV_PROFILE_H264_HIGH_444_PREDICTIVE : "high444 predictive", -+ AV_PROFILE_H264_HIGH_444_INTRA : "high444 intra", -+ AV_PROFILE_H264_CAVLC_444 : "cavlc 444", - } - H264_PROFILES = reverse_dict(H264_PROFILE_NAMES) - - HEVC_PROFILE_NAMES = { -- FF_PROFILE_HEVC_MAIN : "main", -- FF_PROFILE_HEVC_MAIN_10 : "main10", -- FF_PROFILE_HEVC_MAIN_STILL_PICTURE : "picture", -- FF_PROFILE_HEVC_REXT : "rext", -+ AV_PROFILE_HEVC_MAIN : "main", -+ AV_PROFILE_HEVC_MAIN_10 : "main10", -+ AV_PROFILE_HEVC_MAIN_STILL_PICTURE : "picture", -+ AV_PROFILE_HEVC_REXT : "rext", - } - HEVC_PROFILES = reverse_dict(HEVC_PROFILE_NAMES) - -@@ -762,7 +759,6 @@ AVFMT = { - AVFMT_NOBINSEARCH : "NOBINSEARCH", - AVFMT_NOGENSEARCH : "NOGENSEARCH", - AVFMT_NO_BYTE_SEEK : "NO_BYTE_SEEK", -- AVFMT_ALLOW_FLUSH : "ALLOW_FLUSH", - AVFMT_TS_NONSTRICT : "TS_NONSTRICT", - AVFMT_TS_NEGATIVE : "TS_NEGATIVE", - AVFMT_SEEK_TO_PTS : "SEEK_TO_PTS", -@@ -775,7 +771,6 @@ CAPS = { - #AV_CODEC_CAP_TRUNCATED : "TRUNCATED", - AV_CODEC_CAP_DELAY : "DELAY", - AV_CODEC_CAP_SMALL_LAST_FRAME : "SMALL_LAST_FRAME", -- AV_CODEC_CAP_SUBFRAMES : "SUBFRAMES", - AV_CODEC_CAP_EXPERIMENTAL : "EXPERIMENTAL", - AV_CODEC_CAP_CHANNEL_CONF : "CHANNEL_CONF", - AV_CODEC_CAP_FRAME_THREADS : "FRAME_THREADS", -@@ -1316,8 +1311,6 @@ cdef class Encoder: - raise ValueError(f"libavformat does not support {self.muxer_format}") - log("init_muxer(%i) AVOutputFormat(%s)=%#x, flags=%s", - gen, self.muxer_format, oformat, flagscsv(AVFMT, oformat.flags)) -- if oformat.flags & AVFMT_ALLOW_FLUSH==0: -- raise RuntimeError("AVOutputFormat(%s) does not support flushing!" % self.muxer_format) - r = avformat_alloc_output_context2(&self.muxer_ctx, oformat, strtobytes(self.muxer_format), NULL) - if r!=0: - msg = av_error_str(r) -@@ -1574,20 +1567,8 @@ cdef class Encoder: - av_free(self.buffer) - self.buffer = NULL - log("clean_encoder() freeing AVCodecContext: %#x", self.video_ctx) -- if self.video_ctx: -- r = avcodec_close(self.video_ctx) -- if r!=0: -- log.error("Error: failed to close video encoder context %#x", self.video_ctx) -- log.error(" %s", av_error_str(r)) -- av_free(self.video_ctx) -- self.video_ctx = NULL -- if self.audio_ctx: -- r = avcodec_close(self.audio_ctx) -- if r!=0: -- log.error("Error: failed to close audio encoder context %#x", self.audio_ctx) -- log.error(" %s", av_error_str(r)) -- av_free(self.audio_ctx) -- self.audio_ctx = NULL -+ avcodec_free_context(&self.video_ctx) -+ avcodec_free_context(&self.audio_ctx) - if self.hw_device_ctx: - av_buffer_unref(&self.hw_device_ctx) - log("clean_encoder() done") diff --git a/xpra.spec b/xpra.spec index 03d219f..19003f5 100644 --- a/xpra.spec +++ b/xpra.spec @@ -8,8 +8,6 @@ %bcond_with openh264 %endif -%global __js_jquery_latest %{_datadir}/javascript/jquery/latest/ - # Remove private provides from .so files in the python3_sitearch directory %global __provides_exclude_from ^%{python3_sitearch}/.*\\.so$ @@ -21,20 +19,21 @@ %global cupslibdir %(cups-config --serverbin 2> /dev/null || echo "/usr/lib/cups") %endif +%global gnome_shell_extension input-source-manager@xpra_org + +%global build_opts -C--global-option=--without-nvidia -C--global-option=--without-pandoc_lua -C--global-option=--with-verbose -C--global-option=--with-Xdummy -C--global-option=--with-Xdummy_wrapper -C--global-option=--without-strict -C--global-option=--with-vpx %{?with_debug:-C--global-option=--with-debug} %{?with_openh264:-C--global-option=--with-openh264} -C--global-option=--without-cuda_rebuild -C--global-option=--with-client -C--global-option=--without-qt6_client -C--global-option=--without-pyglet_client -C--global-option=--without-enc_x264 + Name: xpra -Version: 5.1.1 +Version: 6.3.4 Release: %autorelease +Epoch: 1 Summary: Remote display server for applications and desktops License: GPL-2.0-or-later AND BSD-2-Clause AND LGPL-3.0-or-later AND BSD-3-Clause URL: https://www.xpra.org/ Source0: https://github.com/Xpra-org/xpra/archive/refs/tags/v%{version}/%{name}-%{version}.tar.gz + # Appdata file for Fedora Source1: %{name}.appdata.xml -# Add compatibility with FFMPEG 7.0 -# https://github.com/Xpra-org/xpra/pull/4216 -Patch2: 0001-Add-compatibility-with-FFMPEG-7.0.patch -# Fix build with FFmpeg 8.0 -Patch3: xpra-ffmpeg8.patch BuildRequires: python3-devel BuildRequires: gtk3-devel @@ -54,8 +53,11 @@ BuildRequires: python3-rpm-macros BuildRequires: gcc-c++ BuildRequires: pam-devel BuildRequires: pandoc + # needs by setup.py to detect systemd `sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd")` BuildRequires: systemd-devel + +BuildRequires: systemd-rpm-macros %if 0%{?fedora} BuildRequires: procps-ng-devel %endif @@ -63,53 +65,29 @@ BuildRequires: pkgconfig(libavif) BuildRequires: pkgconfig(libqrencode) BuildRequires: libdrm-devel BuildRequires: pkgconfig(libwebp) -%if 0%{?el8} -#BuildRequires: xorg-x11-server-Xvfb -#BuildRequires: cairo-devel -BuildRequires: pygobject3-devel -%else BuildRequires: python3-gobject-devel -%endif BuildRequires: libappstream-glib BuildRequires: libasan BuildRequires: python3-cairo-devel BuildRequires: xorg-x11-server-Xorg BuildRequires: xorg-x11-drv-dummy BuildRequires: xorg-x11-xauth +BuildRequires: xxhash-devel BuildRequires: xkbcomp BuildRequires: setxkbmap %if %{with debug} BuildRequires: libasan %endif - -%if %{with enc_x264} -BuildRequires: x264-devel -%endif -# While ffmpeg-devel should only be needed in theses conditions, setup.py requires it anyway -#if %%{with dec_avcodec2} || %%{with csc_swscale} BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libswscale) -#endif %if %{with openh264} BuildRequires: noopenh264-devel %endif Requires: python3-pillow -Requires: python3-cups -Requires: python3-pyopengl -Requires: python3-gobject -Requires: python3-inotify Requires: python3-lz4 -Requires: python3-ldap3 -Requires: python3-rencode -Requires: python3-netifaces -Requires: python3-dbus -Requires: python3-numpy -%if 0%{?fedora} -Requires: python3-zeroconf -%endif Requires: dbus-x11 Requires: xmodmap Requires: xrandr @@ -129,21 +107,7 @@ Requires: pulseaudio-utils%{?_isa} %endif Requires: cups-filesystem Requires: shared-mime-info%{?_isa} -Requires: js-jquery - -# python3-opencv is required for webcam forwarding support, client-side only. -# Available on Fedora only. -# https://github.com/Xpra-org/xpra/issues/4035#issuecomment-2405430577 -#%%{?fedora:Requires: python3-opencv} - -# Needed to create the xpra group - -# xpra-html5 is now separately provided -Obsoletes: xpra-html5 < 0:4.1-1 - Requires: systemd-udev%{?_isa} -Obsoletes: xpra-udev < %{version}-%{release} -Provides: xpra-udev = %{version}-%{release} %description Xpra is "screen for X": it allows you to run X programs, usually on a remote @@ -157,11 +121,28 @@ Sessions can be accessed over SSH, or password protected over plain TCP sockets. Xpra is usable over reasonably slow links and does its best to adapt to changing network bandwidth constraints. -%prep -%autosetup -N -n %{name}-%{version} +%package -n %{name}-client-gnome +Summary: Gnome integration for the xpra client +Requires: %{name}-client-gtk3 = 1:%{version}-%{release} +Requires: gnome-shell-extension-appindicator -%patch -P2 -p1 -%patch -P3 -p1 -b .ffmpeg8 +%description -n %{name}-client-gnome +This package installs the GNOME Shell extensions +that can help in restoring the system tray functionality. +It also includes the gnome_shell_extension extension which +is required for querying and activating keyboard input sources. + +%package -n %{name}-client-gtk3 +Summary: GTK3 xpra client +BuildRequires: xclip + +%description -n %{name}-client-gtk3 +This package contains the GTK3 xpra client. + +%prep +%autosetup -n %{name}-%{version} + +rm -rf *.egg-info # cc1: error: unrecognized compiler option ‘-mfpmath=387’ %ifarch %{arm} @@ -178,7 +159,7 @@ EOF %build export CFLAGS="%{optflags} -I%{_includedir}/security" -%pyproject_wheel -C--global-option=--without-nvidia -C--global-option=--without-pandoc_lua -C--global-option=--with-verbose -C--global-option=--with-Xdummy -C--global-option=--with-Xdummy_wrapper -C--global-option=--without-strict -C--global-option=--with-enc_ffmpeg -C--global-option=--with-vpx -C--global-option=--with-dec_avcodec2 -C--global-option=--with-csc_swscale -C--global-option=--with-debug -C--global-option=--with-openh264 -C--global-option=--with-openh264_decoder -C--global-option=--with-openh264_encoder +%pyproject_wheel %{build_opts} %install %pyproject_install @@ -245,6 +226,20 @@ install -pm 644 README.md %{buildroot}%{_docdir}/xpra/ install -m0644 -D xpra.sysusers.conf %{buildroot}%{_sysusersdir}/xpra.conf +%post +%systemd_post xpra-encoder.service +%systemd_post xpra.service +# Suggested by 'rpmlint -e post-without-tmpfile-creation' +%tmpfiles_create %{_tmpfilesdir}/xpra.conf + +%preun +%systemd_preun xpra-encoder.service +%systemd_preun xpra.service + +%postun +%systemd_postun_with_restart xpra-encoder.service +%systemd_postun_with_restart xpra.service + %check %{?fedora:appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/xpra.appdata.xml} desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop @@ -254,6 +249,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %license COPYING %dir %{_sysconfdir}/xpra %dir %{_sysconfdir}/xpra/conf.d +%dir %{_sysconfdir}/xpra/content-type +%dir %{_sysconfdir}/xpra/pulse +%dir %{_rundir}/xpra +%config(noreplace) %{_sysconfdir}/xpra/pulse/xpra.pa %config(noreplace) %{_sysconfdir}/xpra/*.conf %config(noreplace) %{_sysconfdir}/xpra/nvenc.keys %config(noreplace) %{_sysconfdir}/xpra/conf.d/*.conf @@ -267,8 +266,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %config(noreplace) %{_sysconfdir}/xpra/content-type/30_title.conf %config(noreplace) %{_sysconfdir}/xpra/content-type/50_class.conf %config(noreplace) %{_sysconfdir}/xpra/content-type/70_commands.conf +%config(noreplace) %{_sysconfdir}/xpra/content-type/90_fallback.conf %config(noreplace) %{_sysconfdir}/xpra/http-headers/00_nocache.txt %config(noreplace) %{_sysconfdir}/xpra/http-headers/10_content_security_policy.txt +%ghost %{_rundir}/xpra/proxy %{_libexecdir}/xpra/ %{_bindir}/xpra %{_bindir}/xpra_launcher @@ -286,12 +287,30 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_datadir}/xpra/ %{cupslibdir}/backend/xpraforwarder %{_tmpfilesdir}/xpra.conf -%dir %{_rundir}/xpra %{_docdir}/xpra %{_unitdir}/xpra.service +%{_unitdir}/xpra-encoder.service %{_unitdir}/xpra.socket +%{_unitdir}/xpra-encoder.socket %{_udevrulesdir}/71-xpra-virtual-pointer.rules %{_sysusersdir}/xpra.conf +%files -n %{name}-client-gtk3 +%{python3_sitearch}/xpra/client/gui/ +%{python3_sitearch}/xpra/client/gtk3/ +%{python3_sitearch}/xpra/client/mixins/ +%{_libexecdir}/xpra/xpra_signal_listener +%{_datadir}/applications/xpra-launcher.desktop +%{_datadir}/applications/xpra-gui.desktop +%{_datadir}/applications/xpra.desktop +%{_datadir}/mime/packages/application-x-xpraconfig.xml +%{_datadir}/xpra/autostart.desktop + +%files -n %{name}-client-gnome +%{_datadir}/gnome-shell/extensions/%{gnome_shell_extension}/COPYING +%{_datadir}/gnome-shell/extensions/%{gnome_shell_extension}/README.md +%{_datadir}/gnome-shell/extensions/%{gnome_shell_extension}/extension.js +%{_datadir}/gnome-shell/extensions/%{gnome_shell_extension}/metadata.json + %changelog %autochangelog From 0d4804da3977b90c0942197a5c77b67adf9b3fa7 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Wed, 5 Nov 2025 21:22:30 +0100 Subject: [PATCH 239/267] Release 6.3.5 --- .gitignore | 1 + sources | 2 +- xpra.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index eaa5b82..6f7ffb8 100644 --- a/.gitignore +++ b/.gitignore @@ -92,3 +92,4 @@ /xpra-5.1.tar.gz /xpra-5.1.1.tar.gz /xpra-6.3.4.tar.gz +/xpra-6.3.5.tar.gz diff --git a/sources b/sources index 7c3a737..07c5cad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-6.3.4.tar.gz) = f161bd9142d352c0d31ac64a55be9516c7fbc0f2e9021382a3444a1295436ecf977b693baec9b2a98816c0fa4e590ebcfc1a4f7f1433758113bbb99db932061c +SHA512 (xpra-6.3.5.tar.gz) = 837e747700f909846297fd5e548ebd8439093997b7dcb9d590d2a8761661c3ffd3a5d19ef0e3cc0faa8dd2e79b07cdf3829a349f1325690a2b750e7e0886ceaf diff --git a/xpra.spec b/xpra.spec index 19003f5..8c1f99b 100644 --- a/xpra.spec +++ b/xpra.spec @@ -24,7 +24,7 @@ %global build_opts -C--global-option=--without-nvidia -C--global-option=--without-pandoc_lua -C--global-option=--with-verbose -C--global-option=--with-Xdummy -C--global-option=--with-Xdummy_wrapper -C--global-option=--without-strict -C--global-option=--with-vpx %{?with_debug:-C--global-option=--with-debug} %{?with_openh264:-C--global-option=--with-openh264} -C--global-option=--without-cuda_rebuild -C--global-option=--with-client -C--global-option=--without-qt6_client -C--global-option=--without-pyglet_client -C--global-option=--without-enc_x264 Name: xpra -Version: 6.3.4 +Version: 6.3.5 Release: %autorelease Epoch: 1 Summary: Remote display server for applications and desktops From 86f820622b6d882159de08dfd89655da4f6e04dc Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sun, 9 Nov 2025 15:56:32 +0100 Subject: [PATCH 240/267] Release 6.3.6 --- .gitignore | 1 + sources | 2 +- xpra-fix_audio.patch | 11 +++++++++++ xpra.spec | 21 +++++++++++++++++++-- 4 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 xpra-fix_audio.patch diff --git a/.gitignore b/.gitignore index 6f7ffb8..b8204c4 100644 --- a/.gitignore +++ b/.gitignore @@ -93,3 +93,4 @@ /xpra-5.1.1.tar.gz /xpra-6.3.4.tar.gz /xpra-6.3.5.tar.gz +/xpra-6.3.6.tar.gz diff --git a/sources b/sources index 07c5cad..7a53cf7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-6.3.5.tar.gz) = 837e747700f909846297fd5e548ebd8439093997b7dcb9d590d2a8761661c3ffd3a5d19ef0e3cc0faa8dd2e79b07cdf3829a349f1325690a2b750e7e0886ceaf +SHA512 (xpra-6.3.6.tar.gz) = 9c635645c7902d80d841ec50476e409a1c07d7e7a7bcbe5be56655187bf5729068a944211773a1a5f1a462462f81a79623d20d65c2a737494cf5407531d5286c diff --git a/xpra-fix_audio.patch b/xpra-fix_audio.patch new file mode 100644 index 0000000..5dab7ab --- /dev/null +++ b/xpra-fix_audio.patch @@ -0,0 +1,11 @@ +--- a/fs/etc/xpra/xpra.orig.conf 2025-11-02 12:49:06.000000000 +0100 ++++ b/fs/etc/xpra/xpra.conf 2025-11-09 15:18:11.280317871 +0100 +@@ -20,3 +20,8 @@ + # may just be specified multiple times. + # - You may break a long line into multiple lines + # by ending each line with a backslash '\'. ++ ++xvfb = Xvfb -screen 0 1920x1100x24 -nolisten tcp -noreset ++ ++# Use PipeWire's PulseAudio socket, do NOT spawn pulseaudio ++pulseaudio = no diff --git a/xpra.spec b/xpra.spec index 8c1f99b..9888cdd 100644 --- a/xpra.spec +++ b/xpra.spec @@ -24,7 +24,7 @@ %global build_opts -C--global-option=--without-nvidia -C--global-option=--without-pandoc_lua -C--global-option=--with-verbose -C--global-option=--with-Xdummy -C--global-option=--with-Xdummy_wrapper -C--global-option=--without-strict -C--global-option=--with-vpx %{?with_debug:-C--global-option=--with-debug} %{?with_openh264:-C--global-option=--with-openh264} -C--global-option=--without-cuda_rebuild -C--global-option=--with-client -C--global-option=--without-qt6_client -C--global-option=--without-pyglet_client -C--global-option=--without-enc_x264 Name: xpra -Version: 6.3.5 +Version: 6.3.6 Release: %autorelease Epoch: 1 Summary: Remote display server for applications and desktops @@ -35,6 +35,10 @@ Source0: https://github.com/Xpra-org/xpra/archive/refs/tags/v%{version}/% # Appdata file for Fedora Source1: %{name}.appdata.xml +# Suggested from update testing +# https://bodhi.fedoraproject.org/updates/FEDORA-2025-0882918c25#comment-4407961 +Patch0: %{name}-fix_audio.patch + BuildRequires: python3-devel BuildRequires: gtk3-devel BuildRequires: libXtst-devel @@ -71,6 +75,7 @@ BuildRequires: libasan BuildRequires: python3-cairo-devel BuildRequires: xorg-x11-server-Xorg BuildRequires: xorg-x11-drv-dummy +BuildRequires: xorg-x11-server-Xvfb BuildRequires: xorg-x11-xauth BuildRequires: xxhash-devel BuildRequires: xkbcomp @@ -140,7 +145,11 @@ BuildRequires: xclip This package contains the GTK3 xpra client. %prep -%autosetup -n %{name}-%{version} +%autosetup -n %{name}-%{version} -N + +%if 0%{?fedora} || 0%{?rhel} >= 9 +%patch -P 0 -p1 -b .backup +%endif rm -rf *.egg-info @@ -154,6 +163,12 @@ cat >xpra.sysusers.conf <Xwrapper.config < Date: Wed, 3 Dec 2025 11:54:14 +0100 Subject: [PATCH 241/267] Fix rhbz#2417964 --- xpra-bug4724.patch | 59 ++++++++++++++++++++++++++++++++++++++++++++++ xpra.spec | 4 ++++ 2 files changed, 63 insertions(+) create mode 100644 xpra-bug4724.patch diff --git a/xpra-bug4724.patch b/xpra-bug4724.patch new file mode 100644 index 0000000..d9feb32 --- /dev/null +++ b/xpra-bug4724.patch @@ -0,0 +1,59 @@ +From 64d76c103d8d6534da22e52ff3c412548e622164 Mon Sep 17 00:00:00 2001 +From: ndias +Date: Tue, 2 Dec 2025 17:54:00 +0000 +Subject: [PATCH 1/2] Update extension.js + +Update extension to work with gnome-shell 49 +--- + .../extensions/input-source-manager@xpra_org/extension.js | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/fs/share/gnome-shell/extensions/input-source-manager@xpra_org/extension.js b/fs/share/gnome-shell/extensions/input-source-manager@xpra_org/extension.js +index 870927dbed..7b8478bdce 100644 +--- a/fs/share/gnome-shell/extensions/input-source-manager@xpra_org/extension.js ++++ b/fs/share/gnome-shell/extensions/input-source-manager@xpra_org/extension.js +@@ -18,8 +18,8 @@ + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +-const { Gio } = imports.gi; +-const { getInputSourceManager } = imports.ui.status.keyboard; ++import Gio from 'gi://Gio'; ++import * as getInputSourceManager from 'resource:///org/gnome/shell/ui/status/keyboard.js'; + + const XMLInterface = ` + +@@ -40,7 +40,7 @@ function init(meta) { + return new InputSourceManagerInterface(); + } + +-class InputSourceManagerInterface { ++export default class InputSourceManagerInterface { + enable() { + this._ism = new ISMWrapper(); + this._dbusObj= Gio.DBusExportedObject.wrapJSObject(XMLInterface, this._ism); + +From 4e7e4b54b37d4701c90ac2d6603d84b64e00e49b Mon Sep 17 00:00:00 2001 +From: ndias +Date: Tue, 2 Dec 2025 17:56:34 +0000 +Subject: [PATCH 2/2] Update metadata.json + +Update to work with gnome-shell 49 +--- + .../extensions/input-source-manager@xpra_org/metadata.json | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/fs/share/gnome-shell/extensions/input-source-manager@xpra_org/metadata.json b/fs/share/gnome-shell/extensions/input-source-manager@xpra_org/metadata.json +index c99d8362d9..cfc3c822c2 100644 +--- a/fs/share/gnome-shell/extensions/input-source-manager@xpra_org/metadata.json ++++ b/fs/share/gnome-shell/extensions/input-source-manager@xpra_org/metadata.json +@@ -9,7 +9,8 @@ + "41", + "42", + "43", +- "44" ++ "44", ++ "49" + ], + "url": "https://github.com/Xpra-org/xpra/", + "uuid": "input-source-manager@xpra_org", diff --git a/xpra.spec b/xpra.spec index 9888cdd..2c9c8cb 100644 --- a/xpra.spec +++ b/xpra.spec @@ -39,6 +39,9 @@ Source1: %{name}.appdata.xml # https://bodhi.fedoraproject.org/updates/FEDORA-2025-0882918c25#comment-4407961 Patch0: %{name}-fix_audio.patch +# Fix rhbz#2417964 +Patch1: %{name}-bug4724.patch + BuildRequires: python3-devel BuildRequires: gtk3-devel BuildRequires: libXtst-devel @@ -150,6 +153,7 @@ This package contains the GTK3 xpra client. %if 0%{?fedora} || 0%{?rhel} >= 9 %patch -P 0 -p1 -b .backup %endif +%patch -P 1 -p1 -b .backup rm -rf *.egg-info From 17859a7cbc34cfdd157753f1d39927345a9f0e60 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Wed, 3 Dec 2025 12:06:27 +0100 Subject: [PATCH 242/267] Avoid backup of patched file --- xpra.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 2c9c8cb..e80ad9a 100644 --- a/xpra.spec +++ b/xpra.spec @@ -153,7 +153,7 @@ This package contains the GTK3 xpra client. %if 0%{?fedora} || 0%{?rhel} >= 9 %patch -P 0 -p1 -b .backup %endif -%patch -P 1 -p1 -b .backup +%patch -P 1 -p1 rm -rf *.egg-info From 5edd0f38c94b76b4ea72b366b5930c1d16789197 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Mon, 8 Dec 2025 16:04:36 +0100 Subject: [PATCH 243/267] Release 6.4 --- .gitignore | 1 + sources | 2 +- xpra.spec | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b8204c4..7689e96 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,4 @@ /xpra-6.3.4.tar.gz /xpra-6.3.5.tar.gz /xpra-6.3.6.tar.gz +/xpra-6.4.tar.gz diff --git a/sources b/sources index 7a53cf7..a030efb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-6.3.6.tar.gz) = 9c635645c7902d80d841ec50476e409a1c07d7e7a7bcbe5be56655187bf5729068a944211773a1a5f1a462462f81a79623d20d65c2a737494cf5407531d5286c +SHA512 (xpra-6.4.tar.gz) = c82010f635e2446e98ea68ebd330686d48362843205e164818f7a9d84d444800388ae485982a803ee2ef508d940f25da5e40462b52d7d4b591c308fc83946c85 diff --git a/xpra.spec b/xpra.spec index e80ad9a..c74f837 100644 --- a/xpra.spec +++ b/xpra.spec @@ -24,7 +24,7 @@ %global build_opts -C--global-option=--without-nvidia -C--global-option=--without-pandoc_lua -C--global-option=--with-verbose -C--global-option=--with-Xdummy -C--global-option=--with-Xdummy_wrapper -C--global-option=--without-strict -C--global-option=--with-vpx %{?with_debug:-C--global-option=--with-debug} %{?with_openh264:-C--global-option=--with-openh264} -C--global-option=--without-cuda_rebuild -C--global-option=--with-client -C--global-option=--without-qt6_client -C--global-option=--without-pyglet_client -C--global-option=--without-enc_x264 Name: xpra -Version: 6.3.6 +Version: 6.4 Release: %autorelease Epoch: 1 Summary: Remote display server for applications and desktops @@ -319,7 +319,6 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %files -n %{name}-client-gtk3 %{python3_sitearch}/xpra/client/gui/ %{python3_sitearch}/xpra/client/gtk3/ -%{python3_sitearch}/xpra/client/mixins/ %{_libexecdir}/xpra/xpra_signal_listener %{_datadir}/applications/xpra-launcher.desktop %{_datadir}/applications/xpra-gui.desktop From 2c5f1a286fe6de36763f2aff0d61d7352022cd9c Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Fri, 19 Dec 2025 17:01:21 +0100 Subject: [PATCH 244/267] Remove Xwrapper.config| Remove invalid paths (rhbz#2413528#c10) --- xpra.spec | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/xpra.spec b/xpra.spec index c74f837..172ab3b 100644 --- a/xpra.spec +++ b/xpra.spec @@ -167,12 +167,6 @@ cat >xpra.sysusers.conf <Xwrapper.config < Date: Fri, 19 Dec 2025 21:41:47 +0100 Subject: [PATCH 245/267] Set permmissions of /run/xpra/proxy directory --- xpra.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/xpra.spec b/xpra.spec index 172ab3b..febcea0 100644 --- a/xpra.spec +++ b/xpra.spec @@ -94,8 +94,6 @@ BuildRequires: pkgconfig(libswscale) BuildRequires: noopenh264-devel %endif -Requires: python3-pillow -Requires: python3-lz4 Requires: dbus-x11 Requires: xmodmap Requires: xrandr @@ -285,7 +283,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %config(noreplace) %{_sysconfdir}/xpra/content-type/90_fallback.conf %config(noreplace) %{_sysconfdir}/xpra/http-headers/00_nocache.txt %config(noreplace) %{_sysconfdir}/xpra/http-headers/10_content_security_policy.txt -%ghost %{_rundir}/xpra/proxy +%ghost %attr(1700,-,xpra) %{_rundir}/xpra/proxy %{_libexecdir}/xpra/ %{_bindir}/xpra %{_bindir}/xpra_launcher From 6b45e0bfebc0b6c60b1de324a2a0cd3b250e2da9 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Fri, 19 Dec 2025 22:02:28 +0100 Subject: [PATCH 246/267] Restore Requires packages --- xpra.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xpra.spec b/xpra.spec index febcea0..a2f8c25 100644 --- a/xpra.spec +++ b/xpra.spec @@ -94,6 +94,8 @@ BuildRequires: pkgconfig(libswscale) BuildRequires: noopenh264-devel %endif +Requires: python3-pillow +Requires: python3-lz4 Requires: dbus-x11 Requires: xmodmap Requires: xrandr From 441a7ed6a749485a78c0825ede44f5c2cc88d8cb Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Fri, 2 Jan 2026 13:56:03 +0100 Subject: [PATCH 247/267] Fix rhbz#2425762 --- xpra-6.4-fix_clipboard_on_wayland.patch | 31 +++++++++++++++++++++++++ xpra.spec | 4 ++++ 2 files changed, 35 insertions(+) create mode 100644 xpra-6.4-fix_clipboard_on_wayland.patch diff --git a/xpra-6.4-fix_clipboard_on_wayland.patch b/xpra-6.4-fix_clipboard_on_wayland.patch new file mode 100644 index 0000000..7fd7d91 --- /dev/null +++ b/xpra-6.4-fix_clipboard_on_wayland.patch @@ -0,0 +1,31 @@ +From 6fd2cd83ad2f69159287f6549032b30f3feb4696 Mon Sep 17 00:00:00 2001 +From: Antoine Martin +Date: Fri, 5 Dec 2025 20:15:41 +0700 +Subject: [PATCH] #4728 match older function location + +--- + xpra/gtk/clipboard.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/xpra/gtk/clipboard.py b/xpra/gtk/clipboard.py +index 586e4d740c..b1427c6129 100644 +--- a/xpra/gtk/clipboard.py ++++ b/xpra/gtk/clipboard.py +@@ -8,7 +8,7 @@ + from xpra.util.gobject import n_arg_signal, one_arg_signal + from xpra.clipboard.common import ClipboardCallback + from xpra.clipboard.targets import TEXT_TARGETS +-from xpra.clipboard.proxy import ClipboardProxyCore, filter_data ++from xpra.clipboard.proxy import ClipboardProxyCore + from xpra.clipboard.timeout import ClipboardTimeoutHelper + from xpra.os_util import gi_import + from xpra.util.str_fn import Ellipsizer +@@ -163,7 +163,7 @@ def get_targets(): + if sel: + data = sel.get_data() + if target in ("image/png", "image/jpeg"): +- data = filter_data(dtype=target, dformat=8, data=data) ++ data = self.filter_data(dtype=target, dformat=8, data=data) + got_contents(target, 8, data) + return + log.warn("Warning: can't find request target atom {target}") diff --git a/xpra.spec b/xpra.spec index a2f8c25..18b643d 100644 --- a/xpra.spec +++ b/xpra.spec @@ -42,6 +42,9 @@ Patch0: %{name}-fix_audio.patch # Fix rhbz#2417964 Patch1: %{name}-bug4724.patch +# Fix rhbz#2425762 +Patch2: %{name}-%{version}-fix_clipboard_on_wayland.patch + BuildRequires: python3-devel BuildRequires: gtk3-devel BuildRequires: libXtst-devel @@ -154,6 +157,7 @@ This package contains the GTK3 xpra client. %patch -P 0 -p1 -b .backup %endif %patch -P 1 -p1 +%patch -P 2 -p1 rm -rf *.egg-info From 1d31ac32bef50a6c6a92c1b5948f73119035e34c Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sat, 17 Jan 2026 19:31:18 +0100 Subject: [PATCH 248/267] Release 6.4.1 --- .gitignore | 1 + sources | 2 +- xpra-6.4-fix_clipboard_on_wayland.patch | 31 ------------------------- xpra.spec | 8 ++----- 4 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 xpra-6.4-fix_clipboard_on_wayland.patch diff --git a/.gitignore b/.gitignore index 7689e96..d55f8e6 100644 --- a/.gitignore +++ b/.gitignore @@ -95,3 +95,4 @@ /xpra-6.3.5.tar.gz /xpra-6.3.6.tar.gz /xpra-6.4.tar.gz +/xpra-6.4.1.tar.gz diff --git a/sources b/sources index a030efb..279189e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-6.4.tar.gz) = c82010f635e2446e98ea68ebd330686d48362843205e164818f7a9d84d444800388ae485982a803ee2ef508d940f25da5e40462b52d7d4b591c308fc83946c85 +SHA512 (xpra-6.4.1.tar.gz) = a65ecfc9f095e7b4f75be7c45e2d7415bd964d492ab0b88239af632f6189866f2211d89cceb6732b3b7c04ae6fadcd229d4dee72af817470a24f1d60625992cd diff --git a/xpra-6.4-fix_clipboard_on_wayland.patch b/xpra-6.4-fix_clipboard_on_wayland.patch deleted file mode 100644 index 7fd7d91..0000000 --- a/xpra-6.4-fix_clipboard_on_wayland.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 6fd2cd83ad2f69159287f6549032b30f3feb4696 Mon Sep 17 00:00:00 2001 -From: Antoine Martin -Date: Fri, 5 Dec 2025 20:15:41 +0700 -Subject: [PATCH] #4728 match older function location - ---- - xpra/gtk/clipboard.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/xpra/gtk/clipboard.py b/xpra/gtk/clipboard.py -index 586e4d740c..b1427c6129 100644 ---- a/xpra/gtk/clipboard.py -+++ b/xpra/gtk/clipboard.py -@@ -8,7 +8,7 @@ - from xpra.util.gobject import n_arg_signal, one_arg_signal - from xpra.clipboard.common import ClipboardCallback - from xpra.clipboard.targets import TEXT_TARGETS --from xpra.clipboard.proxy import ClipboardProxyCore, filter_data -+from xpra.clipboard.proxy import ClipboardProxyCore - from xpra.clipboard.timeout import ClipboardTimeoutHelper - from xpra.os_util import gi_import - from xpra.util.str_fn import Ellipsizer -@@ -163,7 +163,7 @@ def get_targets(): - if sel: - data = sel.get_data() - if target in ("image/png", "image/jpeg"): -- data = filter_data(dtype=target, dformat=8, data=data) -+ data = self.filter_data(dtype=target, dformat=8, data=data) - got_contents(target, 8, data) - return - log.warn("Warning: can't find request target atom {target}") diff --git a/xpra.spec b/xpra.spec index 18b643d..b49d6c8 100644 --- a/xpra.spec +++ b/xpra.spec @@ -3,7 +3,7 @@ # %if 0%{?fedora} -%bcond_without openh264 +%bcond_with openh264 %else %bcond_with openh264 %endif @@ -24,7 +24,7 @@ %global build_opts -C--global-option=--without-nvidia -C--global-option=--without-pandoc_lua -C--global-option=--with-verbose -C--global-option=--with-Xdummy -C--global-option=--with-Xdummy_wrapper -C--global-option=--without-strict -C--global-option=--with-vpx %{?with_debug:-C--global-option=--with-debug} %{?with_openh264:-C--global-option=--with-openh264} -C--global-option=--without-cuda_rebuild -C--global-option=--with-client -C--global-option=--without-qt6_client -C--global-option=--without-pyglet_client -C--global-option=--without-enc_x264 Name: xpra -Version: 6.4 +Version: 6.4.1 Release: %autorelease Epoch: 1 Summary: Remote display server for applications and desktops @@ -42,9 +42,6 @@ Patch0: %{name}-fix_audio.patch # Fix rhbz#2417964 Patch1: %{name}-bug4724.patch -# Fix rhbz#2425762 -Patch2: %{name}-%{version}-fix_clipboard_on_wayland.patch - BuildRequires: python3-devel BuildRequires: gtk3-devel BuildRequires: libXtst-devel @@ -157,7 +154,6 @@ This package contains the GTK3 xpra client. %patch -P 0 -p1 -b .backup %endif %patch -P 1 -p1 -%patch -P 2 -p1 rm -rf *.egg-info From a4ab6bd044376042f7dce2b1334ac3f2f60a8a2e Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sat, 31 Jan 2026 15:32:32 +0100 Subject: [PATCH 249/267] Release 6.4.2 --- .gitignore | 1 + sources | 2 +- xpra.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d55f8e6..2d9eae0 100644 --- a/.gitignore +++ b/.gitignore @@ -96,3 +96,4 @@ /xpra-6.3.6.tar.gz /xpra-6.4.tar.gz /xpra-6.4.1.tar.gz +/xpra-6.4.2.tar.gz diff --git a/sources b/sources index 279189e..7b3cb3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-6.4.1.tar.gz) = a65ecfc9f095e7b4f75be7c45e2d7415bd964d492ab0b88239af632f6189866f2211d89cceb6732b3b7c04ae6fadcd229d4dee72af817470a24f1d60625992cd +SHA512 (xpra-6.4.2.tar.gz) = e4324083afa7ccce749ee497d72ecc5e49cf67888250711ddc4daad73314c95521d51a5047e2b2d6f4a7b6fdd0af702092855f8bc8c2b20d21f45737ddec4eb2 diff --git a/xpra.spec b/xpra.spec index b49d6c8..71d159f 100644 --- a/xpra.spec +++ b/xpra.spec @@ -24,7 +24,7 @@ %global build_opts -C--global-option=--without-nvidia -C--global-option=--without-pandoc_lua -C--global-option=--with-verbose -C--global-option=--with-Xdummy -C--global-option=--with-Xdummy_wrapper -C--global-option=--without-strict -C--global-option=--with-vpx %{?with_debug:-C--global-option=--with-debug} %{?with_openh264:-C--global-option=--with-openh264} -C--global-option=--without-cuda_rebuild -C--global-option=--with-client -C--global-option=--without-qt6_client -C--global-option=--without-pyglet_client -C--global-option=--without-enc_x264 Name: xpra -Version: 6.4.1 +Version: 6.4.2 Release: %autorelease Epoch: 1 Summary: Remote display server for applications and desktops From 93c0763d1412536c12d5ba11b695b5599fda5bbe Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sat, 31 Jan 2026 16:10:51 +0100 Subject: [PATCH 250/267] Fix runtime dependencies --- xpra.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index 71d159f..92d696b 100644 --- a/xpra.spec +++ b/xpra.spec @@ -131,7 +131,7 @@ network bandwidth constraints. %package -n %{name}-client-gnome Summary: Gnome integration for the xpra client -Requires: %{name}-client-gtk3 = 1:%{version}-%{release} +Requires: %{name}-client-gtk3%{?_isa} = 1:%{version}-%{release} Requires: gnome-shell-extension-appindicator %description -n %{name}-client-gnome @@ -143,6 +143,7 @@ is required for querying and activating keyboard input sources. %package -n %{name}-client-gtk3 Summary: GTK3 xpra client BuildRequires: xclip +Requires: %{name}%{?_isa} = 1:%{version}-%{release} %description -n %{name}-client-gtk3 This package contains the GTK3 xpra client. From 31ae8a7c1b565c799d7431bbe938ca6b5ff10dec Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sun, 1 Feb 2026 15:34:33 +0100 Subject: [PATCH 251/267] Release 6.4.3 --- .gitignore | 1 + sources | 2 +- xpra.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2d9eae0..ef4ec76 100644 --- a/.gitignore +++ b/.gitignore @@ -97,3 +97,4 @@ /xpra-6.4.tar.gz /xpra-6.4.1.tar.gz /xpra-6.4.2.tar.gz +/xpra-6.4.3.tar.gz diff --git a/sources b/sources index 7b3cb3f..cea6b78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-6.4.2.tar.gz) = e4324083afa7ccce749ee497d72ecc5e49cf67888250711ddc4daad73314c95521d51a5047e2b2d6f4a7b6fdd0af702092855f8bc8c2b20d21f45737ddec4eb2 +SHA512 (xpra-6.4.3.tar.gz) = 8d67ca654c240ce3c581d54e5ff002a0f658df0e02d7367249fc000b3462fc1d4441fc4b02a5152048a225681ff1dfd7497471105655155e09375e0ab02ef85c diff --git a/xpra.spec b/xpra.spec index 92d696b..e294d8d 100644 --- a/xpra.spec +++ b/xpra.spec @@ -24,7 +24,7 @@ %global build_opts -C--global-option=--without-nvidia -C--global-option=--without-pandoc_lua -C--global-option=--with-verbose -C--global-option=--with-Xdummy -C--global-option=--with-Xdummy_wrapper -C--global-option=--without-strict -C--global-option=--with-vpx %{?with_debug:-C--global-option=--with-debug} %{?with_openh264:-C--global-option=--with-openh264} -C--global-option=--without-cuda_rebuild -C--global-option=--with-client -C--global-option=--without-qt6_client -C--global-option=--without-pyglet_client -C--global-option=--without-enc_x264 Name: xpra -Version: 6.4.2 +Version: 6.4.3 Release: %autorelease Epoch: 1 Summary: Remote display server for applications and desktops From 4dc62fbe24cd1e84f8f1889a12bc28b4cb08da8d Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Fri, 6 Feb 2026 12:49:34 +0100 Subject: [PATCH 252/267] Rebuild for procps-ng-4.0.6 From ea8cea7b0eac586df0eebfe917c89ca64b32aae3 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Fri, 6 Feb 2026 14:24:12 +0100 Subject: [PATCH 253/267] Set pygobject cflags --- xpra.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index e294d8d..d56446b 100644 --- a/xpra.spec +++ b/xpra.spec @@ -172,7 +172,7 @@ EOF %pyproject_buildrequires -x tests %build -export CFLAGS="%{optflags} -I%{_includedir}/security" +export CFLAGS="%{optflags} -I%{_includedir}/security %(pkgconf --cflags pygobject-3.0)" %pyproject_wheel %{build_opts} %install From 62f74a79ba1efa838b4103a40bb4087a45607b27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= Date: Mon, 23 Feb 2026 15:30:29 +0100 Subject: [PATCH 254/267] Fix invalid extras in %pyproject_buildrequires -x The extras requested via -x do not match the project's upstream metadata, causing a build failure with the new extras validation in pyproject-rpm-macros. See: https://src.fedoraproject.org/rpms/pyproject-rpm-macros/pull-request/534 --- xpra.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index d56446b..1f59647 100644 --- a/xpra.spec +++ b/xpra.spec @@ -169,7 +169,7 @@ g xpra - EOF %generate_buildrequires -%pyproject_buildrequires -x tests +%pyproject_buildrequires %build export CFLAGS="%{optflags} -I%{_includedir}/security %(pkgconf --cflags pygobject-3.0)" From 2230f6450e6b8bd11a81aaaa9fcdf086df80540f Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 19 Mar 2026 22:29:16 +0100 Subject: [PATCH 255/267] Rebuilt for libvpx-1.6.0 From 44ba426fe7423994ceb5ba9e5230a19c3aca7cd7 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Mon, 4 May 2026 14:25:08 +0200 Subject: [PATCH 256/267] Release 6.4.4 --- .gitignore | 1 + sources | 2 +- xpra.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ef4ec76..62aa06f 100644 --- a/.gitignore +++ b/.gitignore @@ -98,3 +98,4 @@ /xpra-6.4.1.tar.gz /xpra-6.4.2.tar.gz /xpra-6.4.3.tar.gz +/xpra-6.4.4.tar.gz diff --git a/sources b/sources index cea6b78..a194e64 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-6.4.3.tar.gz) = 8d67ca654c240ce3c581d54e5ff002a0f658df0e02d7367249fc000b3462fc1d4441fc4b02a5152048a225681ff1dfd7497471105655155e09375e0ab02ef85c +SHA512 (xpra-6.4.4.tar.gz) = e4f19ce7d6090b8236faa0087116b7bd59782c923e96994040e3807842b09932b8f397ef2c85bf412537db4278e8b8baf23d216fa6b080d7196a2f82b5493342 diff --git a/xpra.spec b/xpra.spec index 1f59647..b08db79 100644 --- a/xpra.spec +++ b/xpra.spec @@ -24,7 +24,7 @@ %global build_opts -C--global-option=--without-nvidia -C--global-option=--without-pandoc_lua -C--global-option=--with-verbose -C--global-option=--with-Xdummy -C--global-option=--with-Xdummy_wrapper -C--global-option=--without-strict -C--global-option=--with-vpx %{?with_debug:-C--global-option=--with-debug} %{?with_openh264:-C--global-option=--with-openh264} -C--global-option=--without-cuda_rebuild -C--global-option=--with-client -C--global-option=--without-qt6_client -C--global-option=--without-pyglet_client -C--global-option=--without-enc_x264 Name: xpra -Version: 6.4.3 +Version: 6.4.4 Release: %autorelease Epoch: 1 Summary: Remote display server for applications and desktops From 35f60a93156999cca49bb331fac6e8ed2872a7a8 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 3 Jun 2026 23:53:45 +0200 Subject: [PATCH 257/267] Rebuilt for Python 3.15 From 9c237c7b7165e1daf00dc95c7c7b95a8956a4bd1 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Wed, 17 Jun 2026 14:06:06 +0200 Subject: [PATCH 258/267] Release 6.5 --- .gitignore | 1 + sources | 2 +- xpra-bug4724.patch | 59 ---------------------------------------------- xpra.spec | 6 +---- 4 files changed, 3 insertions(+), 65 deletions(-) delete mode 100644 xpra-bug4724.patch diff --git a/.gitignore b/.gitignore index 62aa06f..11a50fc 100644 --- a/.gitignore +++ b/.gitignore @@ -99,3 +99,4 @@ /xpra-6.4.2.tar.gz /xpra-6.4.3.tar.gz /xpra-6.4.4.tar.gz +/xpra-6.5.tar.gz diff --git a/sources b/sources index a194e64..0db8ef9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-6.4.4.tar.gz) = e4f19ce7d6090b8236faa0087116b7bd59782c923e96994040e3807842b09932b8f397ef2c85bf412537db4278e8b8baf23d216fa6b080d7196a2f82b5493342 +SHA512 (xpra-6.5.tar.gz) = 142871f51c2eab390317ffa1f4bd878bbcc4e122b7200c98e4f4125969a32c251da2a5b83b4c31992358abbd707196b1f4ddd2df78b199853af73b37266c089a diff --git a/xpra-bug4724.patch b/xpra-bug4724.patch deleted file mode 100644 index d9feb32..0000000 --- a/xpra-bug4724.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 64d76c103d8d6534da22e52ff3c412548e622164 Mon Sep 17 00:00:00 2001 -From: ndias -Date: Tue, 2 Dec 2025 17:54:00 +0000 -Subject: [PATCH 1/2] Update extension.js - -Update extension to work with gnome-shell 49 ---- - .../extensions/input-source-manager@xpra_org/extension.js | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/fs/share/gnome-shell/extensions/input-source-manager@xpra_org/extension.js b/fs/share/gnome-shell/extensions/input-source-manager@xpra_org/extension.js -index 870927dbed..7b8478bdce 100644 ---- a/fs/share/gnome-shell/extensions/input-source-manager@xpra_org/extension.js -+++ b/fs/share/gnome-shell/extensions/input-source-manager@xpra_org/extension.js -@@ -18,8 +18,8 @@ - * SPDX-License-Identifier: GPL-2.0-or-later - */ - --const { Gio } = imports.gi; --const { getInputSourceManager } = imports.ui.status.keyboard; -+import Gio from 'gi://Gio'; -+import * as getInputSourceManager from 'resource:///org/gnome/shell/ui/status/keyboard.js'; - - const XMLInterface = ` - -@@ -40,7 +40,7 @@ function init(meta) { - return new InputSourceManagerInterface(); - } - --class InputSourceManagerInterface { -+export default class InputSourceManagerInterface { - enable() { - this._ism = new ISMWrapper(); - this._dbusObj= Gio.DBusExportedObject.wrapJSObject(XMLInterface, this._ism); - -From 4e7e4b54b37d4701c90ac2d6603d84b64e00e49b Mon Sep 17 00:00:00 2001 -From: ndias -Date: Tue, 2 Dec 2025 17:56:34 +0000 -Subject: [PATCH 2/2] Update metadata.json - -Update to work with gnome-shell 49 ---- - .../extensions/input-source-manager@xpra_org/metadata.json | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/fs/share/gnome-shell/extensions/input-source-manager@xpra_org/metadata.json b/fs/share/gnome-shell/extensions/input-source-manager@xpra_org/metadata.json -index c99d8362d9..cfc3c822c2 100644 ---- a/fs/share/gnome-shell/extensions/input-source-manager@xpra_org/metadata.json -+++ b/fs/share/gnome-shell/extensions/input-source-manager@xpra_org/metadata.json -@@ -9,7 +9,8 @@ - "41", - "42", - "43", -- "44" -+ "44", -+ "49" - ], - "url": "https://github.com/Xpra-org/xpra/", - "uuid": "input-source-manager@xpra_org", diff --git a/xpra.spec b/xpra.spec index b08db79..cd62830 100644 --- a/xpra.spec +++ b/xpra.spec @@ -24,7 +24,7 @@ %global build_opts -C--global-option=--without-nvidia -C--global-option=--without-pandoc_lua -C--global-option=--with-verbose -C--global-option=--with-Xdummy -C--global-option=--with-Xdummy_wrapper -C--global-option=--without-strict -C--global-option=--with-vpx %{?with_debug:-C--global-option=--with-debug} %{?with_openh264:-C--global-option=--with-openh264} -C--global-option=--without-cuda_rebuild -C--global-option=--with-client -C--global-option=--without-qt6_client -C--global-option=--without-pyglet_client -C--global-option=--without-enc_x264 Name: xpra -Version: 6.4.4 +Version: 6.5 Release: %autorelease Epoch: 1 Summary: Remote display server for applications and desktops @@ -39,9 +39,6 @@ Source1: %{name}.appdata.xml # https://bodhi.fedoraproject.org/updates/FEDORA-2025-0882918c25#comment-4407961 Patch0: %{name}-fix_audio.patch -# Fix rhbz#2417964 -Patch1: %{name}-bug4724.patch - BuildRequires: python3-devel BuildRequires: gtk3-devel BuildRequires: libXtst-devel @@ -154,7 +151,6 @@ This package contains the GTK3 xpra client. %if 0%{?fedora} || 0%{?rhel} >= 9 %patch -P 0 -p1 -b .backup %endif -%patch -P 1 -p1 rm -rf *.egg-info From 0abb78cc262640856a5f3a241e0638b676ae54fe Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Thu, 18 Jun 2026 16:34:46 +0200 Subject: [PATCH 259/267] Release 6.5 --- xpra.spec | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/xpra.spec b/xpra.spec index cd62830..c96406a 100644 --- a/xpra.spec +++ b/xpra.spec @@ -50,6 +50,7 @@ BuildRequires: desktop-file-utils BuildRequires: libvpx-devel BuildRequires: libXdamage-devel BuildRequires: libXres-devel +BuildRequires: lua-devel BuildRequires: cups-devel BuildRequires: python3-cups BuildRequires: redhat-rpm-config @@ -113,7 +114,6 @@ Requires: pulseaudio-utils%{?_isa} Requires: cups-filesystem Requires: shared-mime-info%{?_isa} Requires: systemd-udev%{?_isa} - %description Xpra is "screen for X": it allows you to run X programs, usually on a remote host, direct their display to your local machine, and then to disconnect from @@ -130,7 +130,6 @@ network bandwidth constraints. Summary: Gnome integration for the xpra client Requires: %{name}-client-gtk3%{?_isa} = 1:%{version}-%{release} Requires: gnome-shell-extension-appindicator - %description -n %{name}-client-gnome This package installs the GNOME Shell extensions that can help in restoring the system tray functionality. @@ -141,10 +140,19 @@ is required for querying and activating keyboard input sources. Summary: GTK3 xpra client BuildRequires: xclip Requires: %{name}%{?_isa} = 1:%{version}-%{release} - %description -n %{name}-client-gtk3 This package contains the GTK3 xpra client. +%package -n %{name}-plugin-lua +Summary: Wireshark/tshark Lua dissector for the Xpra remote display protocol +BuildRequires: wireshark-devel +%{?lua_version:Requires: lua(abi) = %{lua_version}} +Requires: %{name}%{?_isa} = 1:%{version}-%{release} +%description -n %{name}-plugin-lua +The dissector registers on TCP port 14500 (xpra default) and also +installs a heuristic detector so it picks up traffic on any port. +Use Decode As → Xpra to force it on a different port. + %prep %autosetup -n %{name}-%{version} -N @@ -239,6 +247,16 @@ install -m0644 -D xpra.sysusers.conf %{buildroot}%{_sysusersdir}/xpra.conf # Remove invalid paths sed -e 's|build/bdist.linux-%{?_arch}/wheel/xpra-%{version}.data/data||g' -i %{buildroot}%{_sysconfdir}/xpra/conf.d/55_server_x11.conf +# Move Lua script into wireshark plugin directory and remove invalid /usr sub-directory +%define wireshark_plugindir %(pkg-config --variable plugindir wireshark)/epan +mkdir -p %{buildroot}%{wireshark_plugindir} +%ifarch %{ix86} +cp -p %{buildroot}/usr/%{_libdir}/wireshark/plugins/xpra_dissector.lua %{buildroot}%{wireshark_plugindir}/ +%else +cp -p %{buildroot}/usr/%{wireshark_plugindir}/xpra_dissector.lua %{buildroot}%{wireshark_plugindir}/ +%endif +rm -rf %{buildroot}/usr/%{_libdir} + %post %systemd_post xpra-encoder.service %systemd_post xpra.service @@ -292,6 +310,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/48x48/apps/xpra-mdns.png %{_datadir}/icons/hicolor/48x48/apps/xpra-shadow.png %{_datadir}/icons/hicolor/64x64/apps/xpra.png +%{_datadir}/icons/xpra-large.png %{_mandir}/man1/xpra.1.* %{_mandir}/man1/xpra_*.1.* %{_mandir}/man1/run_scaled.1.* @@ -324,5 +343,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop %{_datadir}/gnome-shell/extensions/%{gnome_shell_extension}/extension.js %{_datadir}/gnome-shell/extensions/%{gnome_shell_extension}/metadata.json +%files -n %{name}-plugin-lua +%{wireshark_plugindir}/xpra_dissector.lua + %changelog %autochangelog From a738b6055a1b7b1f42643c59bd0bebdd84ca58db Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Thu, 18 Jun 2026 16:52:52 +0200 Subject: [PATCH 260/267] Add wireshark as required package --- xpra.spec | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/xpra.spec b/xpra.spec index c96406a..b1be425 100644 --- a/xpra.spec +++ b/xpra.spec @@ -126,28 +126,29 @@ Sessions can be accessed over SSH, or password protected over plain TCP sockets. Xpra is usable over reasonably slow links and does its best to adapt to changing network bandwidth constraints. -%package -n %{name}-client-gnome -Summary: Gnome integration for the xpra client -Requires: %{name}-client-gtk3%{?_isa} = 1:%{version}-%{release} -Requires: gnome-shell-extension-appindicator +%package -n %{name}-client-gnome +Summary: Gnome integration for the xpra client +Requires: %{name}-client-gtk3%{?_isa} = 1:%{version}-%{release} +Requires: gnome-shell-extension-appindicator %description -n %{name}-client-gnome This package installs the GNOME Shell extensions that can help in restoring the system tray functionality. It also includes the gnome_shell_extension extension which is required for querying and activating keyboard input sources. -%package -n %{name}-client-gtk3 -Summary: GTK3 xpra client -BuildRequires: xclip -Requires: %{name}%{?_isa} = 1:%{version}-%{release} +%package -n %{name}-client-gtk3 +Summary: GTK3 xpra client +BuildRequires: xclip +Requires: %{name}%{?_isa} = 1:%{version}-%{release} %description -n %{name}-client-gtk3 This package contains the GTK3 xpra client. -%package -n %{name}-plugin-lua -Summary: Wireshark/tshark Lua dissector for the Xpra remote display protocol -BuildRequires: wireshark-devel +%package -n %{name}-plugin-lua +Summary: Wireshark/tshark Lua dissector for the Xpra remote display protocol +BuildRequires: wireshark-devel %{?lua_version:Requires: lua(abi) = %{lua_version}} -Requires: %{name}%{?_isa} = 1:%{version}-%{release} +Requires: %{name}%{?_isa} = 1:%{version}-%{release} +Requires: wireshark%{?_isa} %description -n %{name}-plugin-lua The dissector registers on TCP port 14500 (xpra default) and also installs a heuristic detector so it picks up traffic on any port. From ede8108a1485550fffab7fbd67b434258fc9a101 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sun, 21 Jun 2026 19:11:55 +0200 Subject: [PATCH 261/267] Fix wireshark dependency --- xpra.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xpra.spec b/xpra.spec index b1be425..d01942d 100644 --- a/xpra.spec +++ b/xpra.spec @@ -148,7 +148,7 @@ Summary: Wireshark/tshark Lua dissector for the Xpra remote display protocol BuildRequires: wireshark-devel %{?lua_version:Requires: lua(abi) = %{lua_version}} Requires: %{name}%{?_isa} = 1:%{version}-%{release} -Requires: wireshark%{?_isa} +Requires: wireshark-cli%{?_isa} %description -n %{name}-plugin-lua The dissector registers on TCP port 14500 (xpra default) and also installs a heuristic detector so it picks up traffic on any port. From 11cfad714133a0cd1a84585de49cf1371fb13c99 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Wed, 1 Jul 2026 22:37:58 +0200 Subject: [PATCH 262/267] Fix rhbz#2496082 --- xpra-6.5-rhbz2496082.patch | 27 +++++++++++++++++++++++++++ xpra.spec | 5 +++++ 2 files changed, 32 insertions(+) create mode 100644 xpra-6.5-rhbz2496082.patch diff --git a/xpra-6.5-rhbz2496082.patch b/xpra-6.5-rhbz2496082.patch new file mode 100644 index 0000000..4e75635 --- /dev/null +++ b/xpra-6.5-rhbz2496082.patch @@ -0,0 +1,27 @@ +From da3fa8745e7e67845e63cf6d80ed31c768f97138 Mon Sep 17 00:00:00 2001 +From: Antoine Martin +Date: Thu, 25 Jun 2026 00:36:32 +0700 +Subject: [PATCH] #4938 always start the protocol, even with remote starts + +--- + xpra/scripts/main.py | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py +index ba06004fac..5f17508af4 100755 +--- a/xpra/scripts/main.py ++++ b/xpra/scripts/main.py +@@ -2075,7 +2075,12 @@ def handshake_complete(*_args) -> None: + while True: + try: + conn = connect_or_fail(params, opts) +- app.make_protocol(conn) ++ protocol = app.make_protocol(conn) ++ if opts.attach is not False: ++ # the command clients (attach=False) start the protocol from their own `run()` method, ++ # but the regular client relies on the caller to start it ++ # (just like `do_setup_connection` does for the normal attach path): ++ protocol.start() + may_show_progress(app, 80, "connecting to server") + break + except InitExit as e: diff --git a/xpra.spec b/xpra.spec index d01942d..68d9ebd 100644 --- a/xpra.spec +++ b/xpra.spec @@ -39,6 +39,9 @@ Source1: %{name}.appdata.xml # https://bodhi.fedoraproject.org/updates/FEDORA-2025-0882918c25#comment-4407961 Patch0: %{name}-fix_audio.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=2496082 +Patch1: %{name}-6.5-rhbz2496082.patch + BuildRequires: python3-devel BuildRequires: gtk3-devel BuildRequires: libXtst-devel @@ -161,6 +164,8 @@ Use Decode As → Xpra to force it on a different port. %patch -P 0 -p1 -b .backup %endif +%patch -P 1 -p1 -b .backup + rm -rf *.egg-info # cc1: error: unrecognized compiler option ‘-mfpmath=387’ From 9b2db3c019a08974eaf7b9bcd47b046c6362d566 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Sun, 5 Jul 2026 21:38:10 +0200 Subject: [PATCH 263/267] Release 6.5.1 --- .gitignore | 1 + sources | 2 +- xpra-6.5-rhbz2496082.patch | 27 --------------------------- xpra.spec | 7 +------ 4 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 xpra-6.5-rhbz2496082.patch diff --git a/.gitignore b/.gitignore index 11a50fc..939446b 100644 --- a/.gitignore +++ b/.gitignore @@ -100,3 +100,4 @@ /xpra-6.4.3.tar.gz /xpra-6.4.4.tar.gz /xpra-6.5.tar.gz +/xpra-6.5.1.tar.gz diff --git a/sources b/sources index 0db8ef9..91639cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-6.5.tar.gz) = 142871f51c2eab390317ffa1f4bd878bbcc4e122b7200c98e4f4125969a32c251da2a5b83b4c31992358abbd707196b1f4ddd2df78b199853af73b37266c089a +SHA512 (xpra-6.5.1.tar.gz) = b2e1b7975b79e6fa0790b63d879f9943471d4ce536ca17f20d96c997881ab5f75b6fc12bbe86730dbc4ea46a28c46960c23cdd984dc4090d6a09a74261081eab diff --git a/xpra-6.5-rhbz2496082.patch b/xpra-6.5-rhbz2496082.patch deleted file mode 100644 index 4e75635..0000000 --- a/xpra-6.5-rhbz2496082.patch +++ /dev/null @@ -1,27 +0,0 @@ -From da3fa8745e7e67845e63cf6d80ed31c768f97138 Mon Sep 17 00:00:00 2001 -From: Antoine Martin -Date: Thu, 25 Jun 2026 00:36:32 +0700 -Subject: [PATCH] #4938 always start the protocol, even with remote starts - ---- - xpra/scripts/main.py | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/xpra/scripts/main.py b/xpra/scripts/main.py -index ba06004fac..5f17508af4 100755 ---- a/xpra/scripts/main.py -+++ b/xpra/scripts/main.py -@@ -2075,7 +2075,12 @@ def handshake_complete(*_args) -> None: - while True: - try: - conn = connect_or_fail(params, opts) -- app.make_protocol(conn) -+ protocol = app.make_protocol(conn) -+ if opts.attach is not False: -+ # the command clients (attach=False) start the protocol from their own `run()` method, -+ # but the regular client relies on the caller to start it -+ # (just like `do_setup_connection` does for the normal attach path): -+ protocol.start() - may_show_progress(app, 80, "connecting to server") - break - except InitExit as e: diff --git a/xpra.spec b/xpra.spec index 68d9ebd..e614d5b 100644 --- a/xpra.spec +++ b/xpra.spec @@ -24,7 +24,7 @@ %global build_opts -C--global-option=--without-nvidia -C--global-option=--without-pandoc_lua -C--global-option=--with-verbose -C--global-option=--with-Xdummy -C--global-option=--with-Xdummy_wrapper -C--global-option=--without-strict -C--global-option=--with-vpx %{?with_debug:-C--global-option=--with-debug} %{?with_openh264:-C--global-option=--with-openh264} -C--global-option=--without-cuda_rebuild -C--global-option=--with-client -C--global-option=--without-qt6_client -C--global-option=--without-pyglet_client -C--global-option=--without-enc_x264 Name: xpra -Version: 6.5 +Version: 6.5.1 Release: %autorelease Epoch: 1 Summary: Remote display server for applications and desktops @@ -39,9 +39,6 @@ Source1: %{name}.appdata.xml # https://bodhi.fedoraproject.org/updates/FEDORA-2025-0882918c25#comment-4407961 Patch0: %{name}-fix_audio.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=2496082 -Patch1: %{name}-6.5-rhbz2496082.patch - BuildRequires: python3-devel BuildRequires: gtk3-devel BuildRequires: libXtst-devel @@ -164,8 +161,6 @@ Use Decode As → Xpra to force it on a different port. %patch -P 0 -p1 -b .backup %endif -%patch -P 1 -p1 -b .backup - rm -rf *.egg-info # cc1: error: unrecognized compiler option ‘-mfpmath=387’ From e26002cf3c62e6b35937b9b61173bf97007c26e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:24:59 +0000 Subject: [PATCH 264/267] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild From bbefa6f1aad9107521f31119c565cfbb5c902281 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 22 Jul 2026 10:15:58 +0200 Subject: [PATCH 265/267] Rebuilt for Python 3.15.0b4 ABI change From 32dcee0869cd027bf573a6b2ebc6e0e0fc563800 Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Mon, 27 Jul 2026 11:08:48 +0200 Subject: [PATCH 266/267] Release 6.5.2 --- .gitignore | 1 + sources | 2 +- xpra.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 939446b..5facf88 100644 --- a/.gitignore +++ b/.gitignore @@ -101,3 +101,4 @@ /xpra-6.4.4.tar.gz /xpra-6.5.tar.gz /xpra-6.5.1.tar.gz +/xpra-6.5.2.tar.gz diff --git a/sources b/sources index 91639cf..17c7ca8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-6.5.1.tar.gz) = b2e1b7975b79e6fa0790b63d879f9943471d4ce536ca17f20d96c997881ab5f75b6fc12bbe86730dbc4ea46a28c46960c23cdd984dc4090d6a09a74261081eab +SHA512 (xpra-6.5.2.tar.gz) = 7e9097e046f6ca1cf82aca9896e6b97a1fea1ac7f2468fe5ac9fc6f6a7f56827eff5f8945c28a394002ca98db349190f5d3c9f63049417a5f1c99f18bff2b284 diff --git a/xpra.spec b/xpra.spec index e614d5b..1364608 100644 --- a/xpra.spec +++ b/xpra.spec @@ -24,7 +24,7 @@ %global build_opts -C--global-option=--without-nvidia -C--global-option=--without-pandoc_lua -C--global-option=--with-verbose -C--global-option=--with-Xdummy -C--global-option=--with-Xdummy_wrapper -C--global-option=--without-strict -C--global-option=--with-vpx %{?with_debug:-C--global-option=--with-debug} %{?with_openh264:-C--global-option=--with-openh264} -C--global-option=--without-cuda_rebuild -C--global-option=--with-client -C--global-option=--without-qt6_client -C--global-option=--without-pyglet_client -C--global-option=--without-enc_x264 Name: xpra -Version: 6.5.1 +Version: 6.5.2 Release: %autorelease Epoch: 1 Summary: Remote display server for applications and desktops From c20b1b3deb0ca9b6e5ec5f18f7d4852f3b7c6a8f Mon Sep 17 00:00:00 2001 From: Antonio Trande Date: Wed, 19 Aug 2026 18:16:14 +0200 Subject: [PATCH 267/267] Release 6.5.3 --- .gitignore | 1 + sources | 2 +- xpra.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5facf88..283cf77 100644 --- a/.gitignore +++ b/.gitignore @@ -102,3 +102,4 @@ /xpra-6.5.tar.gz /xpra-6.5.1.tar.gz /xpra-6.5.2.tar.gz +/xpra-6.5.3.tar.gz diff --git a/sources b/sources index 17c7ca8..c8ed7c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xpra-6.5.2.tar.gz) = 7e9097e046f6ca1cf82aca9896e6b97a1fea1ac7f2468fe5ac9fc6f6a7f56827eff5f8945c28a394002ca98db349190f5d3c9f63049417a5f1c99f18bff2b284 +SHA512 (xpra-6.5.3.tar.gz) = 98eee6577d26cf15cdf8115352e73601438804a69d5081d7af908d9c4fc03e44e723eb74cc6f468c92c8e935cc5e897bcdeda316d3f756905b368e83ac051d91 diff --git a/xpra.spec b/xpra.spec index 1364608..933f86c 100644 --- a/xpra.spec +++ b/xpra.spec @@ -24,7 +24,7 @@ %global build_opts -C--global-option=--without-nvidia -C--global-option=--without-pandoc_lua -C--global-option=--with-verbose -C--global-option=--with-Xdummy -C--global-option=--with-Xdummy_wrapper -C--global-option=--without-strict -C--global-option=--with-vpx %{?with_debug:-C--global-option=--with-debug} %{?with_openh264:-C--global-option=--with-openh264} -C--global-option=--without-cuda_rebuild -C--global-option=--with-client -C--global-option=--without-qt6_client -C--global-option=--without-pyglet_client -C--global-option=--without-enc_x264 Name: xpra -Version: 6.5.2 +Version: 6.5.3 Release: %autorelease Epoch: 1 Summary: Remote display server for applications and desktops