jgu pushed to xpra (f20). "Update to 0.15.0 (..more)"

Thu Jun 11 23:42:12 UTC 2015

From ff57c8429b3dcd97ca21ec5b8430a65b1a686cef Mon Sep 17 00:00:00 2001
From: Jonathan Underwood <jonathan.underwood at gmail.com>
Date: Mon, 1 Jun 2015 16:53:18 +0100
Subject: 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

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 <jonathan.underwood at gmail.com> - 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 <jonathan.underwood at gmail.com> - 0.14.24-1
 - Update to 0.14.24
 - Remove Requires for xorg-x11-server-Xvfb
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/xpra.git/commit/?h=f20&id=ff57c8429b3dcd97ca21ec5b8430a65b1a686cef
