# TODO
-# - package just xpra, get rid of the wm stuff
+# - test and finish systemd integration
# - subpackages for client/server, see http://xpra.org/dev.html
+# - nvenc (4,5,6)/cuda support (on bcond)
+# - xvid? (checks for xvid.pc)
+#
+# Conditional build:
+%bcond_without client # client part
+%bcond_without server # server part
+%bcond_without sound # (gstreamer) sound support
+%bcond_without clipboard # clipboard support
+%bcond_without swscale # swscale colorspace conversion support
+%bcond_without avcodec # avcodec decoding
+%bcond_without opengl # OpenGL support
+%bcond_without vpx # VPX/WebM support
+%bcond_without webp # WebP support
+%bcond_without x264 # x264 encoding
+%bcond_without x265 # x265 encoding
+
+%ifarch i386 i486 x32
+%undefine with_x265
+%endif
+
Summary: Xpra gives you "persistent remote applications" for X
+Summary(pl.UTF-8): Xpra - "stałe zdalne aplikacje" dla X
Name: xpra
-Version: 0.9.2
-Release: 1
+Version: 2.2.6
+Release: 7
License: GPL v2+
+Group: X11/Applications/Networking
Source0: http://xpra.org/src/%{name}-%{version}.tar.xz
-# Source0-md5: 8de43238841a6b47e597bcd53ee06c13
-Group: Networking
+# Source0-md5: 22c032c29be6d22fa7e21405792a1372
+Patch0: setup-cc-ccache.patch
URL: http://xpra.org/
+BuildRequires: OpenGL-devel
+# libavcodec >= 56 libswscale
BuildRequires: ffmpeg-devel
-BuildRequires: gtk+2-devel
-BuildRequires: libx264-devel
+BuildRequires: gtk+2-devel >= 2.0
+BuildRequires: gtk+3-devel
+BuildRequires: libvpx-devel >= 1.4
+BuildRequires: libwebp-devel >= 0.3
+%{?with_x264:BuildRequires: libx264-devel}
+%{?with_x265:BuildRequires: libx265-devel}
+BuildRequires: libyuv-devel
BuildRequires: pkgconfig
-BuildRequires: python-Cython
-BuildRequires: python-distribute
-BuildRequires: python-pygobject-devel
-BuildRequires: python-pygtk-devel
+BuildRequires: python-Cython >= 0.19.0
+BuildRequires: python-devel >= 1:2.6
+BuildRequires: python-pycairo-devel
+BuildRequires: python-pygobject-devel >= 2.0
+BuildRequires: python-pygtk-devel >= 2:2.0
+BuildRequires: python-setuptools
BuildRequires: rpm-pythonprov
+BuildRequires: sed >= 4.0
BuildRequires: tar >= 1:1.22
+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXcomposite-devel
+BuildRequires: xorg-lib-libXdamage-devel
+BuildRequires: xorg-lib-libXext-devel
+BuildRequires: xorg-lib-libXfixes-devel
+BuildRequires: xorg-lib-libXrandr-devel
BuildRequires: xorg-lib-libXtst-devel
+BuildRequires: xorg-lib-libxkbfile-devel
BuildRequires: xz
-Requires: libwebp
+Requires: libvpx >= 1.4
+Requires: libwebp >= 0.3
+Requires: python-pygtk-gtk >= 2:2.0
+Requires: xorg-app-setxkbmap
+Requires: xorg-app-xauth
+Requires: xorg-app-xmodmap
Requires: xorg-xserver-Xvfb
+Suggests: python-PIL
+Suggests: python-PyOpenGL
+Suggests: python-numpy
+Suggests: python-pygtkglext
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+# currently lib, not %{_lib} (see cups.spec)
+%define cupsdir /usr/lib/cups/backend
+# xpra/x11/bindings/randr_bindings.c:... error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
+%define specflags -fno-strict-aliasing
+
%description
Xpra gives you "persistent remote applications" for X. That is, unlike
normal X applications, applications run with xpra are "persistent" --
So basically it's screen for remote X apps.
+%description -l pl.UTF-8
+Xpra daje "stałe zdalne aplikacje" dla serwera X, które w
+przeciwieństwie do zwykłych X-owych aplikacji, uruchamiane są z xprą
+jako niezamykające. Można je uruchomić zdalnie i one nie zostaną
+zamknięte, gdy połączenie zostanie przerwane. Można je odłączyć i
+podłączyć z powrotem później, również z innego komputera, bez straty
+stanu. W odróżnieniu od VNC czy RDP, xpra jest dla zdalnych aplikacji,
+a nie zdalnych pulpitów - pojedyncze aplikacje pokazują się jako
+samodzielne okno na lokalnym ekranie, zarządzane przez lokalnego
+zarządcę okien.
+
+W uproszczeniu xpra to "screen" dla zdalnych aplikacji X-owych.
+
+%package -n cups-backend-xpra
+Summary: Xpra backend for CUPS
+Summary(pl.UTF-8): Backend Xpra dla CUPS-a
+Group: Applications/Printing
+Requires: %{name} = %{version}-%{release}
+Requires: cups
+
+%description -n cups-backend-xpra
+Xpra backend for CUPS.
+
+%description -n cups-backend-xpra -l pl.UTF-8
+Backend Xpra dla CUPS-a.
+
%prep
%setup -q
+%patch0 -p1
+
+%{__sed} -i -e '1s,/usr/bin/env python,%{__python},' cups/xpraforwarder $(grep -l '/usr/bin/env python' -r xpra)
+%{__sed} -i -e 's,"/bin/udev_product_version","%{_bindir}/udev_product_version",' udev/rules.d/71-xpra-virtual-pointer.rules
%build
CC="%{__cc}" \
CFLAGS="%{rpmcflags}" \
-%{__python} setup.py build
+%{__python} setup.py build \
+ --with-PIC \
+ --with-Xdummy \
+ %{__with_without client} \
+ %{__with_without clipboard} \
+ %{__with_without swscale csc_swscale} \
+ --with%{!?debug:out}-debug \
+ %{__with_without avcodec dec_avcodec2} \
+ %{__with_without ffmpeg enc_ffmpeg} \
+ %{__with_without x264 enc_x264} \
+ %{__with_without x265 enc_x265} \
+ --without-gtk2 \
+ --with-gtk3 \
+ %{__with_without opengl} \
+ %{__with_without server} \
+ %{__with_without server shadow} \
+ %{__with_without sound} \
+ --without-strict \
+ %{__with_without vpx} \
+ --with-warn \
+ %{__with_without webp} \
+ --with-x11 \
+ %{nil}
%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install \
--skip-build \
+ --prefix=%{_prefix} \
+ --install-purelib=%{py_sitescriptdir} \
+ --install-platlib=%{py_sitedir} \
--optimize=2 \
--root=$RPM_BUILD_ROOT
-%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/parti/test_*.py*
-
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/parti/README
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/parti/parti.README
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/wimpiggy/wimpiggy.README
%{__rm} $RPM_BUILD_ROOT%{_datadir}/xpra/COPYING
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/xpra/webm/LICENSE
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/xpra/xpra.README
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/xpra/README
+
+install -d $RPM_BUILD_ROOT/lib/udev/rules.d
+%{__mv} $RPM_BUILD_ROOT{%{_prefix},}/lib/udev/rules.d/71-xpra-virtual-pointer.rules
%py_postclean
%files
%defattr(644,root,root,755)
-%doc NEWS xpra.README
+%doc NEWS README
%dir %{_sysconfdir}/%{name}
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/xorg.conf
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/xpra.conf
-%attr(755,root,root) %{_bindir}/parti
-%attr(755,root,root) %{_bindir}/parti-repl
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/xorg-uinput.conf
+%dir %{_sysconfdir}/%{name}/conf.d
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/conf.d/05_features.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/conf.d/10_network.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/conf.d/12_ssl.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/conf.d/15_file_transfers.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/conf.d/16_printing.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/conf.d/20_sound.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/conf.d/30_picture.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/conf.d/35_webcam.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/conf.d/40_client.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/conf.d/42_client_keyboard.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/conf.d/50_server_network.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/conf.d/55_server_x11.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/conf.d/60_server.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/conf.d/65_proxy.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/xpra
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xorg.conf.d/90-xpra-virtual.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/pam.d/xpra
+/etc/dbus-1/system.d/xpra.conf
+%{systemdunitdir}/xpra.service
+%{systemdunitdir}/xpra.socket
+/usr/lib/sysusers.d/xpra.conf
+/lib/udev/rules.d/71-xpra-virtual-pointer.rules
+%attr(755,root,root) %{_bindir}/udev_product_version
%attr(755,root,root) %{_bindir}/xpra
-%attr(755,root,root) %{_bindir}/xpra_Xdummy
+%attr(755,root,root) %{_bindir}/xpra_browser
%attr(755,root,root) %{_bindir}/xpra_launcher
+%attr(755,root,root) %{_bindir}/xpra_signal_listener
+%{_datadir}/appdata/xpra.appdata.xml
+%{_datadir}/mime/packages/application-x-xpraconfig.xml
%dir %{_datadir}/xpra
+%{_datadir}/xpra/bell.wav
%dir %{_datadir}/xpra/icons
%{_datadir}/xpra/icons/*.png
-%{_desktopdir}/xpra_launcher.desktop
+# experimental html5 client
+%{_datadir}/%{name}/www
+%{_desktopdir}/xpra.desktop
+%{_desktopdir}/xpra-browser.desktop
+%{_desktopdir}/xpra-launcher.desktop
%{_iconsdir}/xpra.png
-%{_mandir}/man1/parti.1*
+%{_iconsdir}/xpra-mdns.png
+%{systemdtmpfilesdir}/xpra.conf
+# specified in the above (xpra group seems to be optional though)
+#%attr(770,root,xpra) %dir /var/run/xpra
%{_mandir}/man1/xpra.1*
+%{_mandir}/man1/xpra_browser.1*
%{_mandir}/man1/xpra_launcher.1*
-%dir %{py_sitedir}/parti
-%{py_sitedir}/parti/*.py[co]
-%{py_sitedir}/parti/addons
-%{py_sitedir}/parti/scripts
-%{py_sitedir}/parti/trays
-%{py_sitedir}/parti_all-%{version}-py*.egg-info
-
-%dir %{py_sitedir}/wimpiggy
-%dir %{py_sitedir}/wimpiggy/gdk
-%dir %{py_sitedir}/wimpiggy/gdk/*.py[co]
-%dir %{py_sitedir}/wimpiggy/lowlevel
-%{py_sitedir}/wimpiggy/*.py[co]
-%{py_sitedir}/wimpiggy/lowlevel/*.py[co]
-%attr(755,root,root) %{py_sitedir}/wimpiggy/gdk/gdk_atoms.so
-%attr(755,root,root) %{py_sitedir}/wimpiggy/lowlevel/bindings.so
-
%dir %{py_sitedir}/xpra
-%dir %{py_sitedir}/xpra/gl
-%dir %{py_sitedir}/xpra/platform
-%dir %{py_sitedir}/xpra/rencode
-%dir %{py_sitedir}/xpra/scripts
-%dir %{py_sitedir}/xpra/sound
-%dir %{py_sitedir}/xpra/stats
-%dir %{py_sitedir}/xpra/vpx
-%dir %{py_sitedir}/xpra/webm
-%dir %{py_sitedir}/xpra/x264
-%dir %{py_sitedir}/xpra/xor
-%dir %{py_sitedir}/xpra/xposix
+%dir %{py_sitedir}/xpra/buffers
+%{py_sitedir}/xpra/buffers/__init__.py[co]
+%attr(755,root,root) %{py_sitedir}/xpra/buffers/membuf.so
+%{py_sitedir}/xpra/client
+%{py_sitedir}/xpra/clipboard
+%dir %{py_sitedir}/xpra/codecs
+%dir %{py_sitedir}/xpra/codecs/argb
+%attr(755,root,root) %{py_sitedir}/xpra/codecs/argb/argb.so
+%{py_sitedir}/xpra/codecs/argb/__init__.py[co]
+%dir %{py_sitedir}/xpra/codecs/csc_libyuv
+%attr(755,root,root) %{py_sitedir}/xpra/codecs/csc_libyuv/colorspace_converter.so
+%{py_sitedir}/xpra/codecs/csc_libyuv/__init__.py[co]
+%if %{with swscale}
+%dir %{py_sitedir}/xpra/codecs/csc_swscale
+%attr(755,root,root) %{py_sitedir}/xpra/codecs/csc_swscale/colorspace_converter.so
+%{py_sitedir}/xpra/codecs/csc_swscale/__init__.py[co]
+%endif
+%if %{with avcodec}
+%dir %{py_sitedir}/xpra/codecs/dec_avcodec2
+%attr(755,root,root) %{py_sitedir}/xpra/codecs/dec_avcodec2/decoder.so
+%{py_sitedir}/xpra/codecs/dec_avcodec2/__init__.py[co]
+%endif
+%dir %{py_sitedir}/xpra/codecs/enc_proxy
+%{py_sitedir}/xpra/codecs/enc_proxy/*.py[co]
+%if %{with x264}
+%dir %{py_sitedir}/xpra/codecs/enc_x264
+%attr(755,root,root) %{py_sitedir}/xpra/codecs/enc_x264/encoder.so
+%{py_sitedir}/xpra/codecs/enc_x264/__init__.py[co]
+%endif
+%if %{with x265}
+%dir %{py_sitedir}/xpra/codecs/enc_x265
+%attr(755,root,root) %{py_sitedir}/xpra/codecs/enc_x265/encoder.so
+%{py_sitedir}/xpra/codecs/enc_x265/__init__.py[co]
+%endif
+%dir %{py_sitedir}/xpra/codecs/jpeg
+%{py_sitedir}/xpra/codecs/jpeg/__init__.py[co]
+%attr(755,root,root) %{py_sitedir}/xpra/codecs/jpeg/decoder.so
+%attr(755,root,root) %{py_sitedir}/xpra/codecs/jpeg/encoder.so
+%dir %{py_sitedir}/xpra/codecs/libav_common
+%attr(755,root,root) %{py_sitedir}/xpra/codecs/libav_common/av_log.so
+%{py_sitedir}/xpra/codecs/libav_common/__init__.py[co]
+%{py_sitedir}/xpra/codecs/pillow
+%dir %{py_sitedir}/xpra/codecs/v4l2
+%attr(755,root,root) %{py_sitedir}/xpra/codecs/v4l2/pusher.so
+%{py_sitedir}/xpra/codecs/v4l2/__init__.py[co]
+%dir %{py_sitedir}/xpra/codecs/vpx
+%attr(755,root,root) %{py_sitedir}/xpra/codecs/vpx/decoder.so
+%attr(755,root,root) %{py_sitedir}/xpra/codecs/vpx/encoder.so
+%{py_sitedir}/xpra/codecs/vpx/__init__.py[co]
+%dir %{py_sitedir}/xpra/codecs/webp
+%attr(755,root,root) %{py_sitedir}/xpra/codecs/webp/decode.so
+%attr(755,root,root) %{py_sitedir}/xpra/codecs/webp/encode.so
+%{py_sitedir}/xpra/codecs/webp/__init__.py[co]
+%dir %{py_sitedir}/xpra/codecs/xor
+%attr(755,root,root) %{py_sitedir}/xpra/codecs/xor/cyxor.so
+%{py_sitedir}/xpra/codecs/xor/*.py[co]
+%{py_sitedir}/xpra/codecs/*.py[co]
+%{py_sitedir}/xpra/dbus
+%dir %{py_sitedir}/xpra/gtk_common
+%{py_sitedir}/xpra/gtk_common/*.py[co]
+%dir %{py_sitedir}/xpra/gtk_common/gtk2
+%{py_sitedir}/xpra/gtk_common/gtk2/__init__.py[co]
+%attr(755,root,root) %{py_sitedir}/xpra/gtk_common/gtk2/gdk_atoms.so
+%attr(755,root,root) %{py_sitedir}/xpra/gtk_common/gtk2/gdk_bindings.so
+%{py_sitedir}/xpra/keyboard
+%attr(755,root,root) %{py_sitedir}/xpra/monotonic_time.so
+%dir %{py_sitedir}/xpra/net
+%{py_sitedir}/xpra/net/mdns
+%attr(755,root,root) %{py_sitedir}/xpra/net/vsock.so
+%{py_sitedir}/xpra/net/*.py[co]
+%dir %{py_sitedir}/xpra/net/bencode
+%{py_sitedir}/xpra/net/bencode/*.py[co]
+%attr(755,root,root) %{py_sitedir}/xpra/net/bencode/cython_bencode.so
+%{py_sitedir}/xpra/platform
+%{py_sitedir}/xpra/scripts
+%dir %{py_sitedir}/xpra/server
+%attr(755,root,root) %{py_sitedir}/xpra/server/cystats.so
+%{py_sitedir}/xpra/server/*.py[co]
+%dir %{py_sitedir}/xpra/server/auth
+%{py_sitedir}/xpra/server/auth/*.py[co]
+%{py_sitedir}/xpra/server/dbus
+%attr(755,root,root) %{py_sitedir}/xpra/server/pam.so
+%{py_sitedir}/xpra/server/proxy
+%{py_sitedir}/xpra/server/rfb
+%{py_sitedir}/xpra/server/shadow
+%dir %{py_sitedir}/xpra/server/window
+%attr(755,root,root) %{py_sitedir}/xpra/server/window/region.so
+%{py_sitedir}/xpra/server/window/*.py[co]
+%attr(755,root,root) %{py_sitedir}/xpra/server/window/motion.so
+%{py_sitedir}/xpra/sound
+%dir %{py_sitedir}/xpra/x11
+%dir %{py_sitedir}/xpra/x11/bindings
+%attr(755,root,root) %{py_sitedir}/xpra/x11/bindings/*.so
+%{py_sitedir}/xpra/x11/bindings/__init__.py[co]
+%{py_sitedir}/xpra/x11/dbus
+%dir %{py_sitedir}/xpra/x11/gtk2
+%attr(755,root,root) %{py_sitedir}/xpra/x11/gtk2/gdk_bindings.so
+%attr(755,root,root) %{py_sitedir}/xpra/x11/gtk2/gdk_display_source.so
+%{py_sitedir}/xpra/x11/gtk2/*.py[co]
+%{py_sitedir}/xpra/x11/gtk2/models
+%dir %{py_sitedir}/xpra/x11/gtk_x11
+%{py_sitedir}/xpra/x11/gtk_x11/*.py[co]
+%{py_sitedir}/xpra/x11/*.py[co]
%{py_sitedir}/xpra/*.py[co]
-%{py_sitedir}/xpra/gl/*.py[co]
-%{py_sitedir}/xpra/platform/*.py[co]
-%{py_sitedir}/xpra/rencode/*.py[co]
-%{py_sitedir}/xpra/scripts/*.py[co]
-%{py_sitedir}/xpra/sound/*.py[co]
-%{py_sitedir}/xpra/stats/*.py[co]
-%{py_sitedir}/xpra/vpx/*.py[co]
-%{py_sitedir}/xpra/webm/*.py[co]
-%{py_sitedir}/xpra/x264/*.py[co]
-%{py_sitedir}/xpra/xor/*.py[co]
-%{py_sitedir}/xpra/xposix/*.py[co]
-%attr(755,root,root) %{py_sitedir}/xpra/rencode/_rencode.so
-%attr(755,root,root) %{py_sitedir}/xpra/stats/cymaths.so
-%attr(755,root,root) %{py_sitedir}/xpra/vpx/codec.so
-%attr(755,root,root) %{py_sitedir}/xpra/wait_for_x_server.so
-%attr(755,root,root) %{py_sitedir}/xpra/x264/codec.so
-%attr(755,root,root) %{py_sitedir}/xpra/xor/cyxor.so
+%{py_sitedir}/xpra-%{version}-py*.egg-info
+
+%files -n cups-backend-xpra
+%defattr(644,root,root,755)
+%attr(756,root,root) %{cupsdir}/xpraforwarder