[uhd/f16: 6/6] Merge remote-tracking branch 'origin/f17' into f16

[Jaroslav Škarvada]

commit 486c234b6dffe6dfeb7751f32a842538b0b7d57d
Merge: 95fd70c 8593b77
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Tue Mar 27 15:46:41 2012 +0200

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	sources
    	uhd.spec

 sources                                 |    2 +-
 uhd-3.4.0-usrp1-r45-dbsrx-i2c-fix.patch |   41 +++++++++++++++++++++++++++++++
 uhd.spec                                |   16 +++++++++---
 3 files changed, 54 insertions(+), 5 deletions(-)
---
diff --cc uhd.spec
index 6464cb8,0d96d24..f735874
--- a/uhd.spec
+++ b/uhd.spec
@@@ -76,10 -85,13 +79,9 @@@ BuildArch:      noarc
  %description doc
  Documentation for the Universal Hardware Driver (UHD).
  
 -%pre
 -getent group usrp >/dev/null || groupadd -r usrp >/dev/null
 -
  %files
  %doc _tmpdoc/*
- %{_bindir}/uhd_find_devices
- %{_bindir}/uhd_usrp_probe
+ %{_bindir}/*
 -%config(noreplace) %{_sysconfdir}/udev/rules.d/10-usrp-uhd.rules
  %config(noreplace) %{_sysconfdir}/security/limits.d/*.conf
  %{_libdir}/lib*.so.*
  %{_libexecdir}/uhd