Ticket #606: xpra-20140816.patch

xpra.spec

@@ -4 +4 @@
 # later version. See the file COPYING for details.
 
 %define version 0.14.0
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %if 0%{?build_no} == 0
 %define build_no 0
 %endif
@@ -118 +118 @@
 BuildRequires: pkgconfig
 BuildRequires: Cython
 BuildRequires: pygtk2-devel
-BuildRequires: python, setuptool
+BuildRequires: python, python-setuptools
 BuildRequires: pygobject2-devel
 BuildRequires: libxkbfile-devel
 BuildRequires: libXtst-devel
@@ -178 +178 @@
 cd xpra-%{version}
 %{__python} setup.py install -O1 %{dummy} --prefix /usr --skip-build --root %{buildroot}
 
-#why do we even need to do this ourselves?
-%ifarch x86_64
-mv -f "${RPM_BUILD_ROOT}/usr/lib64" "${RPM_BUILD_ROOT}/usr/lib"
-%endif
 
 %if 0%{?opengl}
 #included by default
 %else
-rm -fr ${RPM_BUILD_ROOT}/usr/lib/python2.*/site-packages/xpra/client/gl
+rm -fr ${RPM_BUILD_ROOT}/%{python_sitearch}/xpra/client/gl
 %endif
 
 %if 0%{?no_sound}
-rm -fr ${RPM_BUILD_ROOT}/usr/lib/python2.*/site-packages/xpra/sound
+rm -fr ${RPM_BUILD_ROOT}/%{python_sitearch}/xpra/sound
 %endif
 
 
@@ -201 +197 @@
 %files
 %defattr(-,root,root)
 %{_bindir}/xpra*
-%{python_sitelib}/xpra
+%{python_sitearch}/xpra
 %if %{include_egg}
-%{python_sitelib}/xpra-*.egg-info
+%{python_sitearch}/xpra-*.egg-info
 %endif
 %{_datadir}/xpra
 %{_datadir}/man/man1/xpra*