[arch-commits] Commit in gnuradio/trunk (PKGBUILD)

[Kyle Keen]

    Date: Tuesday, November 18, 2014 @ 01:05:03
  Author: kkeen
Revision: 122693

upgpkg: gnuradio 3.7.5.1-4  fix depends

Modified:
  gnuradio/trunk/PKGBUILD

----------+
 PKGBUILD |   15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-17 18:22:03 UTC (rev 122692)
+++ PKGBUILD	2014-11-18 00:05:03 UTC (rev 122693)
@@ -5,7 +5,7 @@
 pkgbase=gnuradio
 pkgname=(gnuradio gnuradio-companion)
 pkgver=3.7.5.1
-pkgrel=3
+pkgrel=4
 pkgdesc="General purpose DSP and SDR toolkit.  With drivers for usrp and fcd."
 arch=('i686' 'x86_64')
 url="http://gnuradio.org"
@@ -12,12 +12,6 @@
 license=('GPL')
 depends=('fftw' 'python2-numpy' 'cppunit' 'gsl' 'blas' 'guile' 'boost-libs>=1.53' 'libusbx' 'portaudio' 'libuhd' 'zeromq')
 makedepends=('boost' 'cmake' 'python2-lxml' 'pygtk' 'wxpython' 'python2-cheetah' 'glu' 'swig' )
-optdepends=('gnuradio-osmosdr: pile of driver blocks'
-            'boost: gr_modtool'
-            'swig: gr_modtool'
-            'cmake: gr_modtool'
-            'pkgconfig: libuhd')
-conflicts=('gnuradio-git')
 install=gnuradio.install
 
 # gr-qtgui todo
@@ -74,6 +68,11 @@
 }
 
 package_gnuradio() {
+  optdepends=('boost: gr_modtool'
+              'swig: gr_modtool'
+              'cmake: gr_modtool'
+              'pkgconfig: libuhd')
+  conflicts=('gnuradio-git')
   cd "$srcdir"
   install -Dm644 21-fcd.rules "$pkgdir/usr/lib/udev/rules.d/21-fcd.rules"
   cd "$srcdir/$pkgbase-$pkgver/grc/freedesktop"
@@ -92,7 +91,7 @@
 
 package_gnuradio-companion() {
   pkgdesc="GUI frontend for gnuradio and SDR."
-  depends=('python2-cheetah' 'python2-lxml' 'pygtk' 'wxpython' 'python2-opengl')
+  depends=('gnuradio' 'python2-cheetah' 'python2-lxml' 'pygtk' 'wxpython' 'python2-opengl')
   optdepends=()
   conflicts=()
   install="gnuradio-companion.install"