From 073a05ec73a54321ecdf0be3c8b8b0b19c8a7158 Mon Sep 17 00:00:00 2001 From: sagitter Date: Aug 19 2017 08:09:14 +0000 Subject: Update to 2.1.1 --- 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