xpra icon
Bug tracker and wiki

This bug tracker and wiki are being discontinued
please use https://github.com/Xpra-org/xpra instead.


Ticket #606: xpra-20140816.patch

File xpra-20140816.patch, 1.7 KB (added by pyther, 7 years ago)

xpra.spec patch based on r7292

  • xpra.spec

    old new  
    44# later version. See the file COPYING for details.
    55
    66%define version 0.14.0
    7 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
     7%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
    88%if 0%{?build_no} == 0
    99%define build_no 0
    1010%endif
    Requires: ffmpeg-xpra 
    118118BuildRequires: pkgconfig
    119119BuildRequires: Cython
    120120BuildRequires: pygtk2-devel
    121 BuildRequires: python, setuptool
     121BuildRequires: python, python-setuptools
    122122BuildRequires: pygobject2-devel
    123123BuildRequires: libxkbfile-devel
    124124BuildRequires: libXtst-devel
    rm -rf $RPM_BUILD_ROOT 
    178178cd xpra-%{version}
    179179%{__python} setup.py install -O1 %{dummy} --prefix /usr --skip-build --root %{buildroot}
    180180
    181 #why do we even need to do this ourselves?
    182 %ifarch x86_64
    183 mv -f "${RPM_BUILD_ROOT}/usr/lib64" "${RPM_BUILD_ROOT}/usr/lib"
    184 %endif
    185181
    186182%if 0%{?opengl}
    187183#included by default
    188184%else
    189 rm -fr ${RPM_BUILD_ROOT}/usr/lib/python2.*/site-packages/xpra/client/gl
     185rm -fr ${RPM_BUILD_ROOT}/%{python_sitearch}/xpra/client/gl
    190186%endif
    191187
    192188%if 0%{?no_sound}
    193 rm -fr ${RPM_BUILD_ROOT}/usr/lib/python2.*/site-packages/xpra/sound
     189rm -fr ${RPM_BUILD_ROOT}/%{python_sitearch}/xpra/sound
    194190%endif
    195191
    196192
    rm -rf $RPM_BUILD_ROOT 
    201197%files
    202198%defattr(-,root,root)
    203199%{_bindir}/xpra*
    204 %{python_sitelib}/xpra
     200%{python_sitearch}/xpra
    205201%if %{include_egg}
    206 %{python_sitelib}/xpra-*.egg-info
     202%{python_sitearch}/xpra-*.egg-info
    207203%endif
    208204%{_datadir}/xpra
    209205%{_datadir}/man/man1/xpra*