[gnuradio/epel7] Enabled uhd on ppc64

[Jaroslav Škarvada]

commit 32cb901d6ef75214e1e99077d8f897cd13a31f3f
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Thu Mar 12 14:44:48 2015 +0100

    Enabled uhd on ppc64

 gnuradio.spec | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)
---
diff --git a/gnuradio.spec b/gnuradio.spec
index e885045..33acd4e 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -14,21 +14,12 @@
 %endif
 %endif
 
-# Workaround for rhbz#1128127
-%if 0%{?rhel:1}
-%ifnarch ppc64
-%global build_uhd 1
-%endif
-%else
-%global build_uhd 1
-%endif
-
 # For versions not yet on ftp, pull from git
 #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a
 
 Name:		gnuradio
 Version:	3.7.5.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Software defined radio framework
 
 Group:		Applications/Engineering
@@ -54,9 +45,7 @@ BuildRequires:	portaudio-devel, libtool, gsm-devel
 BuildRequires:	gsl-devel, tex(latex), numpy, PyQt4-devel, python-cheetah
 BuildRequires:	xdg-utils, python-lxml, pygtk2-devel, orc-devel
 BuildRequires:	dos2unix, sphinx
-%if 0%{?build_uhd}
 BuildRequires:	uhd-devel
-%endif
 %if ! 0%{?rhel:1}
 BuildRequires:	PyQwt-devel, qwt-devel, qwtplot3d-qt4-devel
 %endif
@@ -123,7 +112,7 @@ cd build
 -DENABLE_PYTHON=FORCE -DENABLE_DOXYGEN=FORCE \
 -DENABLE_VOLK=FORCE -DENABLE_GRUEL=FORCE \
 -DENABLE_GR_AUDIO=FORCE -DENABLE_GR_ATSC=FORCE \
--DENABLE_GR_VOCODER=FORCE %{?build_uhd:-DENABLE_GR_UHD=FORCE} \
+-DENABLE_GR_VOCODER=FORCE -DENABLE_GR_UHD=FORCE \
 -DENABLE_GR_NOAA=FORCE -DENABLE_GR_PAGER=FORCE \
 -DENABLE_GR_TRELLIS=FORCE -DENABLE_GR_VIDEO_SDL=FORCE \
 -DENABLE_GR_WXGUI=FORCE -DENABLE_GR_UTILS=FORCE \
@@ -195,6 +184,9 @@ rm -rf %{buildroot}
 %{_datadir}/gnuradio/examples
 
 %changelog
+* Thu Mar 12 2015 Jaroslav Škarvada <jskarvad at redhat.com> - 3.7.5.1-2
+- Enabled uhd on ppc64
+
 * Tue Oct 21 2014 Jaroslav Škarvada <jskarvad at redhat.com> - 3.7.5.1-1
 - New versio
   Resolves: rhbz#1155252