From c7a15740945220d429339aa80592ca959cc9b22f Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Nov 08 2016 23:38:29 +0000
Subject: Update to 0.17.6


- Fix build on EPEL7
- Use %license

---

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 <orion@cora.nwra.com> - 0.17.6-1
+- Update to 0.17.6
+- Fix build on EPEL7
+- Use %%license
+
 * Sat Oct  1 2016 Jonathan Underwood <jonathan.underwood@gmail.com> - 0.17.5-2
 - Clean up some rpmlint errors
 - Use %%_cups_serverbin if defined