From 9ac986d62e44311f004b6b2237c9b9ea47a506c3882b537803c7b78d72e3668c Mon Sep 17 00:00:00 2001
From: Luigi Baldoni <aloisio@gmx.com>
Date: Mon, 4 Mar 2019 09:28:06 +0000
Subject: [PATCH] Accepting request 681238 from
 home:alois:branches:X11:Utilities

- Enabled OpenGL (fixes boo#1127415)
- Added brotli as build requirement
- Refreshed xpra-paths.patch

OBS-URL: https://build.opensuse.org/request/show/681238
OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xpra?expand=0&rev=14
---
 xpra-paths.patch | 16 ++++++++--------
 xpra.changes     |  7 +++++++
 xpra.spec        |  7 +++++--
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/xpra-paths.patch b/xpra-paths.patch
index 29e1cd1..5a39b3f 100644
--- a/xpra-paths.patch
+++ b/xpra-paths.patch
@@ -1,8 +1,8 @@
-Index: xpra-2.4/setup.py
+Index: xpra-2.4.3/setup.py
 ===================================================================
---- xpra-2.4.orig/setup.py
-+++ xpra-2.4/setup.py
-@@ -1513,7 +1513,7 @@ else:
+--- xpra-2.4.3.orig/setup.py
++++ xpra-2.4.3/setup.py
+@@ -1515,7 +1515,7 @@ else:
      add_data_files("%s/man1" % man_path,  ["man/xpra.1", "man/xpra_launcher.1", "man/xpra_browser.1"])
      add_data_files("share/applications",  ["xdg/xpra-shadow.desktop", "xdg/xpra-launcher.desktop", "xdg/xpra-browser.desktop", "xdg/xpra.desktop"])
      add_data_files("share/mime/packages", ["xdg/application-x-xpraconfig.xml"])
@@ -11,16 +11,16 @@ Index: xpra-2.4/setup.py
      add_data_files("share/appdata",       ["xdg/xpra.appdata.xml"])
  
      #here, we override build and install so we can
-@@ -1586,7 +1586,7 @@ else:
+@@ -1588,7 +1588,7 @@ else:
              if pam_ENABLED:
                  copytodir("etc/pam.d/xpra", "/etc/pam.d")
  
 -            systemd_dir = "/lib/systemd/system"
-+            systemd_dir = "/usr/lib/systemd/system"
++            systemd_dir = "__UNITDIR__"
              if service_ENABLED:
                  #Linux init service:
                  if os.path.exists("/bin/systemctl"):
-@@ -1597,7 +1597,9 @@ else:
+@@ -1599,7 +1599,9 @@ else:
                  else:
                      copytodir("service/xpra", "/etc/init.d")
                  if os.path.exists("/etc/sysconfig"):
@@ -31,7 +31,7 @@ Index: xpra-2.4/setup.py
                  elif os.path.exists("/etc/default"):
                      copytodir("etc/sysconfig/xpra", "/etc/default")
              if sd_listen_ENABLED:
-@@ -1711,7 +1713,6 @@ else:
+@@ -1713,7 +1715,6 @@ else:
  if scripts_ENABLED:
      scripts += ["scripts/xpra", "scripts/xpra_launcher", "scripts/xpra_browser"]
  
diff --git a/xpra.changes b/xpra.changes
index 6eab55a..9d824b0 100644
--- a/xpra.changes
+++ b/xpra.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Mar  1 09:31:03 UTC 2019 - Luigi Baldoni <aloisio@gmx.com>
+
+- Enabled OpenGL (fixes boo#1127415)
+- Added brotli as build requirement
+- Refreshed xpra-paths.patch
+
 -------------------------------------------------------------------
 Thu Jan 31 12:22:06 UTC 2019 - Luigi Baldoni <aloisio@gmx.com>
 
diff --git a/xpra.spec b/xpra.spec
index 0c5158f..3d78e77 100644
--- a/xpra.spec
+++ b/xpra.spec
@@ -34,6 +34,7 @@ Source1:        xpra-icon.png
 # PATCH-FIX-OPENSUSE xpra-paths.patch -- use suse-specific paths
 Patch0:         %{name}-paths.patch
 BuildRequires:  ImageMagick
+BuildRequires:  brotli
 BuildRequires:  cups
 BuildRequires:  cups-devel
 BuildRequires:  desktop-file-utils
@@ -127,7 +128,9 @@ sed -i "1 s|^#!/usr/bin/env python\b|#!%__python2|" cups/xpraforwarder
 find . -name '*.py' -exec touch -mat 1707141200 {} +
 install -m0644 %{SOURCE1} -t xdg
 # set fillup dir
-sed -i 's|__FILLUPDIR__|%{_fillupdir}|' setup.py
+sed -e 's|__FILLUPDIR__|%{_fillupdir}|' \
+    -e 's|__UNITDIR__|%{_unitdir}|' \
+    -i setup.py
 # fix shebang
 sed -i 's|^#!.*|#!%__python2|' scripts/auth_dialog scripts/xdg-open
 
@@ -151,7 +154,7 @@ python2 setup.py build \
     --with-webp \
     --with-Xdummy \
     --with-Xdummy_wrapper \
-    --without-opengl \
+    --with-opengl \
     --with-service
 
 %install