cleanups, BR boost-devel, verbose files, fix overadapterizing

diff --git a/uhd.spec b/uhd.spec
index e535f8b7377cc9478a219f0e3a06ae7379dbeeeb..4a24e8c50c3f6c9b34a3eabb165786053facf0a4 100644 (file)
--- a/uhd.spec
+++ b/uhd.spec
@@ -1,11 +1,8 @@
-
 %define        ver_major 3
 %define        ver_minor 8
 %define        ver_patch 3
 
 %define        ver %(printf "%03d.%03d.%03d" %{ver_major} %{ver_minor} %{ver_patch})
-%define        ver_ %(printf "%03d_%03d_%03d" %{ver_major} %{ver_minor} %{ver_patch})
-
 Summary:       Universal Hardware Driver for Ettus Research products
 Name:          uhd
 Version:       %{ver_major}.%{ver_minor}.%{ver_patch}
@@ -17,6 +14,7 @@ Source0:      http://files.ettus.com/binaries/uhd/uhd_%{ver}-release/%{name}-%{versio
 URL:           http://www.qcustomplot.com/
 BuildRequires: QtCore-devel
 BuildRequires: QtGui-devel
+BuildRequires: boost-devel
 BuildRequires: cmake >= 2.8.0
 BuildRequires: qt4-build
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -38,7 +36,7 @@ Requires:     %{name} = %{version}-%{release}
 Header files for Universal Hardware Driver for Ettus Research
 products.
 
-%package        doc
+%package doc
 Summary:       Documentation and examples for uhd
 Group:         Documentation
 %if "%{_rpmversion}" >= "5"
@@ -53,29 +51,28 @@ Research products
 %setup -q
 
 %build
-
 install -d build
 cd build
 %cmake \
-       ../
+       ..
 %{__make}
 
-cd ../
-
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} -C build install/fast \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/uhd/utils%{_prefix}p_n2xx_simple_net_burner
-rm -f $RPM_BUILD_ROOT%{_libdir}/uhd/utils%{_prefix}p_x3xx_fpga_burner
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/utils/usrp_n2xx_simple_net_burner
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}/utils/usrp_x3xx_fpga_burner
+
+# not packaged
+rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/tests
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -87,42 +84,53 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/uhd_find_devices
 %attr(755,root,root) %{_bindir}/uhd_images_downloader
 %attr(755,root,root) %{_bindir}/uhd_usrp_probe
-%attr(755,root,root) %{_bindir}%{_prefix}p2_card_burner
-%attr(755,root,root) %{_bindir}%{_prefix}p_n2xx_simple_net_burner
-%attr(755,root,root) %{_bindir}%{_prefix}p_x3xx_fpga_burner
-%attr(755,root,root) %{_libdir}/libuhd.so.*.*
-%ghost %{_libdir}/libuhd.so.003
-%dir %{_libdir}/uhd
-%attr(755,root,root) %{_libdir}/uhd/utils
-%{_mandir}/man1/*
+%attr(755,root,root) %{_bindir}/usrp2_card_burner
+%attr(755,root,root) %{_bindir}/usrp_n2xx_simple_net_burner
+%attr(755,root,root) %{_bindir}/usrp_x3xx_fpga_burner
+%{_mandir}/man1/octoclock_firmware_burner.1*
+%{_mandir}/man1/uhd_cal_rx_iq_balance.1*
+%{_mandir}/man1/uhd_cal_tx_dc_offset.1*
+%{_mandir}/man1/uhd_cal_tx_iq_balance.1*
+%{_mandir}/man1/uhd_find_devices.1*
+%{_mandir}/man1/uhd_images_downloader.1*
+%{_mandir}/man1/uhd_usrp_probe.1*
+%{_mandir}/man1/usrp2_card_burner.1*
+%{_mandir}/man1/usrp_n2xx_simple_net_burner.1*
+%{_mandir}/man1/usrp_x3xx_fpga_burner.1*
+%attr(755,root,root) %{_libdir}/libuhd.so.00*.00*
+%attr(755,root,root) %ghost %{_libdir}/libuhd.so.003
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/utils
 
 %files devel
 %defattr(644,root,root,755)
 %{_pkgconfigdir}/uhd.pc
-%{_libdir}/cmake/uhd
 %{_includedir}/uhd
-%{_libdir}/*.so
+%{_libdir}/cmake/uhd
+%{_libdir}/libuhd.so
 
 %files doc
 %defattr(644,root,root,755)
-%{_docdir}/uhd
-%{_libdir}/uhd/examples/benchmark_rate
-%{_libdir}/uhd/examples/fpgpio
-%{_libdir}/uhd/examples/latency_test
-%{_libdir}/uhd/examples/network_relay
-%{_libdir}/uhd/examples/rx_ascii_art_dft
-%{_libdir}/uhd/examples/rx_multi_samples
-%{_libdir}/uhd/examples/rx_samples_to_file
-%{_libdir}/uhd/examples/rx_samples_to_udp
-%{_libdir}/uhd/examples/rx_timed_samples
-%{_libdir}/uhd/examples/test_clock_synch
-%{_libdir}/uhd/examples/test_dboard_coercion
-%{_libdir}/uhd/examples/test_messages
-%{_libdir}/uhd/examples/test_pps_input
-%{_libdir}/uhd/examples/test_timed_commands
-%{_libdir}/uhd/examples/transport_hammer
-%{_libdir}/uhd/examples/tx_bursts
-%{_libdir}/uhd/examples/tx_samples_from_file
-%{_libdir}/uhd/examples/tx_timed_samples
-%{_libdir}/uhd/examples/tx_waveforms
-%{_libdir}/uhd/examples/txrx_loopback_to_file
+%{_docdir}/%{name}
+%dir %dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/examples
+%{_libdir}/%{name}/examples/benchmark_rate
+%{_libdir}/%{name}/examples/fpgpio
+%{_libdir}/%{name}/examples/latency_test
+%{_libdir}/%{name}/examples/network_relay
+%{_libdir}/%{name}/examples/rx_ascii_art_dft
+%{_libdir}/%{name}/examples/rx_multi_samples
+%{_libdir}/%{name}/examples/rx_samples_to_file
+%{_libdir}/%{name}/examples/rx_samples_to_udp
+%{_libdir}/%{name}/examples/rx_timed_samples
+%{_libdir}/%{name}/examples/test_clock_synch
+%{_libdir}/%{name}/examples/test_dboard_coercion
+%{_libdir}/%{name}/examples/test_messages
+%{_libdir}/%{name}/examples/test_pps_input
+%{_libdir}/%{name}/examples/test_timed_commands
+%{_libdir}/%{name}/examples/transport_hammer
+%{_libdir}/%{name}/examples/tx_bursts
+%{_libdir}/%{name}/examples/tx_samples_from_file
+%{_libdir}/%{name}/examples/tx_timed_samples
+%{_libdir}/%{name}/examples/tx_waveforms
+%{_libdir}/%{name}/examples/txrx_loopback_to_file