diff --git a/gnuradio.changes b/gnuradio.changes index 7d33e54..c467ded 100644 --- a/gnuradio.changes +++ b/gnuradio.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Dec 12 15:52:26 UTC 2017 - mpluskal@suse.com + +- Ignore openssl-1_0_0 for build as temporary workaround for + Factory unresolvable state + ------------------------------------------------------------------- Mon May 22 20:27:27 UTC 2017 - mardnh@gmx.de diff --git a/gnuradio.spec b/gnuradio.spec index 1ab5a08..9ff206c 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -16,15 +16,15 @@ # +%define sover 3_7_11-0_0_0 +%define sover_volk 1_3 Name: gnuradio Version: 3.7.11 Release: 0 -%define sover 3_7_11-0_0_0 -%define sover_volk 1_3 Summary: GNU software radio License: GPL-3.0+ Group: Productivity/Hamradio/Other -Url: http://gnuradio.org +URL: http://gnuradio.org Source: http://gnuradio.org/releases/gnuradio/gnuradio-%{version}.tar.gz Source1: %{name}-rpmlintrc # http://www.nathanwest.us/grc_to_37.sh @@ -44,7 +44,7 @@ BuildRequires: libSDL-devel BuildRequires: libjack-devel BuildRequires: libxslt-python BuildRequires: orc -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: portaudio-devel BuildRequires: python-Cheetah BuildRequires: python-Sphinx @@ -52,11 +52,6 @@ BuildRequires: python-gtk BuildRequires: python-lxml BuildRequires: python-numpy BuildRequires: python-qt4-devel -%if 0%{?suse_version} > 1320 -BuildRequires: python-wxWidgets-3_0 -%else -BuildRequires: python-wxWidgets -%endif BuildRequires: qwt6-devel BuildRequires: swig BuildRequires: texlive-dvips @@ -65,13 +60,19 @@ BuildRequires: uhd-devel BuildRequires: update-desktop-files BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(libxml-2.0) +# Workaround for openssl migration +#!BuildIgnore: openssl-1_0_0 Requires: python Requires: python-Cheetah Requires: python-gtk Requires: python-lxml Requires: python-numpy Requires: python-qt4 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} > 1320 +BuildRequires: python-wxWidgets-3_0 +%else +BuildRequires: python-wxWidgets +%endif %description GNU Radio is a collection of software that when combined with minimal