diff --git a/gnuradio.spec b/gnuradio.spec index c059323..0c70b2a 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -24,7 +24,7 @@ Name: gnuradio Version: 3.7.13.5 -Release: 1%{?alphatag:.%{alphatag}}%{?dist} +Release: 2%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework License: GPLv3 @@ -55,14 +55,23 @@ BuildRequires: uhd-devel, python2, cppzmq-devel, zeromq-devel, thrift BuildRequires: codec2-devel, findutils BuildRequires: comedilib-devel, jack-audio-connection-kit-devel #BuildRequires: python3-thrift -%if ! 0%{?rhel:1} + +# qwt was dropped in fedora 31+, migration to PyQtGraph should be finished in +# gnuradio-3.8 +# https://github.com/gnuradio/gnuradio/issues/1634 +# https://github.com/gnuradio/gnuradio/pull/2399 +# https://github.com/gnuradio/gnuradio/pull/2187 +%if ! 0%{?rhel:1} && 0%{?fedora} < 31 BuildRequires: PyQwt-devel, qwt-devel, qwtplot3d-qt4-devel %endif Requires: numpy, python2-wxpython, scipy, portaudio, python2-lxml Requires: pygtk2, python2-cheetah, PyQt4, zeromq, log4cpp-devel #Requires: python3-thrift %if ! 0%{?rhel:1} -Requires: PyQwt, python2-pyopengl +%if 0%{?fedora} < 31 +Requires: PyQwt +%endif +Requires: python2-pyopengl %endif Obsoletes: usrp < 3.3.0-1 Obsoletes: grc < 0.80-1 @@ -187,6 +196,9 @@ popd %{_datadir}/gnuradio/examples %changelog +* Mon May 6 2019 Jaroslav Škarvada - 3.7.13.5-2 +- Dropped PyQwt in f31+ + * Wed Apr 24 2019 Jaroslav Škarvada - 3.7.13.5-1 - New version - Updated source URL to point to github