From fa1b60083527c78d7f6a3236737989637018267f Mon Sep 17 00:00:00 2001 From: Ankur Sinha (Ankur Sinha Gmail) Date: Nov 27 2018 15:14:42 +0000 Subject: Fix to correctly use system libraries --- diff --git a/python-fsleyes.spec b/python-fsleyes.spec index 0f8b9ac..31f0b21 100644 --- a/python-fsleyes.spec +++ b/python-fsleyes.spec @@ -11,7 +11,7 @@ FSLeyes, the FSL image viewer Name: python-%{srcname} Version: 0.26.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: FSLeyes, the FSL image viewer License: ASL 2.0 @@ -55,6 +55,7 @@ Requires: %{py3_dist trimesh} Requires: %{py3_dist indexed_gzip} # PyOpenGL-accelerate is provided by this Requires: %{py3_dist pyopengl} +Requires: %{py3_dist sip} # Not yet avaiable in Fedora # Extra requirements, so skipping for the time being @@ -76,6 +77,16 @@ This package contains documentation for %{name}. %autosetup -n %{srcname}-%{version} rm -rfv fsleyes_widgets.egg-info +# Remove unnecessary upper limit on Pillow: +# https://github.com/pauldmccarthy/fsleyes/issues/7 +sed -i 's/\(Pillow>=3.2.0\),.*/\1/' requirements.txt + +# Use system sip +sed -i 's/import wx.siplib as sip/import sip/' fsleyes/gl/__init__.py +sed -i 's/import wx.siplib as sip/import sip/' fsleyes/panel.py +sed -i 's/wx.siplib/sip/' fsleyes/gl/__init__.py +sed -i 's/wx.siplib/sip/' fsleyes/panel.py + # remove unneeded shebangs find . -name "*py" -exec sed -i '/#!\/usr\/bin\/env python/ d' '{}' \; @@ -135,6 +146,10 @@ xvfb-run -s "-screen 0 640x480x24" pytest-3 %doc userdoc/userdoc_html apidoc/apidoc_html %changelog +* Tue Nov 27 2018 Ankur Sinha - 0.26.4-3 +- Remove unnecessary pillow version limit +- Use wxpython4 and sip correctly from system + * Mon Nov 26 2018 Ankur Sinha - 0.26.4-2 - Fix requires - Enable available requires