fixed %install, BR: s/ice-devel/python-ice/ (ctrlport), qt4-qmake

diff --git a/gnuradio.spec b/gnuradio.spec
index a0a908f7850367b2ddb473a82469847c8fcad8d8..5720c7366dae226b4f8052dfc2e04067aa6befa5 100644 (file)
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -38,21 +38,25 @@ BuildRequires:      cppunit-devel >= 1.9.14
 BuildRequires: doxygen >= 1.5
 BuildRequires: fftw3-devel >= 3.0
 BuildRequires: gsl-devel >= 1.10
-BuildRequires: ice-devel
 BuildRequires: jack-audio-connection-kit-devel >= 0.8
 BuildRequires: libusb-devel
 BuildRequires: log4cpp-devel
 BuildRequires: orc-devel >= 0.4.11
 BuildRequires: portaudio-devel >= 19
+# R/S instead?
 BuildRequires: python-PyOpenGL
 BuildRequires: python-PyQt4-devel >= 4.4
+# R/S instead?
 BuildRequires: python-PyQwt-devel >= 5.2
 BuildRequires: python-cheetah >= 2.0.0
 BuildRequires: python-devel >= 2.5
+BuildRequires: python-ice
 BuildRequires: python-lxml >= 1.3.6
 BuildRequires: python-numpy >= 1.1.0
 BuildRequires: python-pygtk-devel >= 2.10.0
+# R/S instead?
 BuildRequires: python-wxPython-devel >= 2.8
+BuildRequires: qt4-qmake >= 4.2.0
 BuildRequires: qwt-devel >= 5.2
 BuildRequires: sphinx
 BuildRequires: swig-python >= 1.3.31
@@ -113,6 +117,7 @@ cd build
 %install
 rm -rf $RPM_BUILD_ROOT
 
+cd build
 %{__make} install \
        pythondir=%{py_sitedir} \
        DESTDIR=$RPM_BUILD_ROOT