Compare commits

..

65 commits

Author SHA1 Message Date
Python Maint
acfe813c92 Rebuilt for Python 3.15.0b4 ABI change 2026-07-22 10:11:19 +02:00
Fedora Release Engineering
69834dded8 Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 08:08:18 +00:00
Python Maint
77495c7172 Rebuilt for Python 3.15 2026-06-04 09:33:17 +02:00
Jaroslav Škarvada
1c486dd191 New version
Resolves: rhbz#2451594
2026-04-28 13:38:36 +02:00
Fedora Release Engineering
23b5fbbc67 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-20 03:31:08 +00:00
Jaroslav Škarvada
1baf9fd961 Fixed build with cmake-4
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2026-01-13 16:35:41 +01:00
5c4d17f8f5 Rebuilt for Boost 1.90 2026-01-12 18:30:39 +00:00
Jaroslav Škarvada
ff6fd8bff6 New version
Resolves: rhbz#2403533
2025-10-13 17:25:34 +02:00
Python Maint
0808e1d684 Rebuilt for Python 3.14.0rc3 bytecode 2025-09-19 15:01:00 +02:00
Jaroslav Škarvada
df04e96c52 Dropped chdr_log as upstream
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2025-09-12 00:35:43 +02:00
Jaroslav Škarvada
e1213c9be0 Followed upstream and dropped uhd_dump
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2025-09-11 18:17:57 +02:00
Jaroslav Škarvada
9f6339d121 Dropped unneeded patch
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2025-09-11 18:02:10 +02:00
Jaroslav Škarvada
fd8faa4c64 New version
Resolves: rhbz#2387862
2025-09-11 17:50:59 +02:00
Python Maint
e22a339e17 Rebuilt for Python 3.14.0rc2 bytecode 2025-08-15 15:21:21 +02:00
Fedora Release Engineering
e93033b410 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 19:44:33 +00:00
Python Maint
c79fdf3ba9 Rebuilt for Python 3.14 2025-06-03 14:31:02 +02:00
Jaroslav Škarvada
ae45f0b982 New version
Resolves: rhbz#2337610
  Resolves: rhbz#2341478

Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2025-03-17 10:24:55 +01:00
1538edcbf9 Add sysusers.d config file to allow rpm to create users/groups automatically
See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers.
2025-02-11 17:03:11 +01:00
Fedora Release Engineering
b09e6d0822 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 13:40:27 +00:00
Miroslav Suchý
212b456b65 convert GPLv3+ license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-07-25 13:29:06 +02:00
Fedora Release Engineering
249f71537f Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 08:11:17 +00:00
Jaroslav Škarvada
32d9ecc659 New version
Resolves: rhbz#2293732
2024-07-15 16:36:07 +02:00
Python Maint
1b6120a7b3 Rebuilt for Python 3.13 2024-06-08 22:34:34 +02:00
Software Management Team
f07315bd68 Eliminate use of obsolete %patchN syntax (#2283636) 2024-05-30 12:46:49 +02:00
Fedora Release Engineering
87fb805ffa Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 07:02:27 +00:00
Jonathan Wakely
85558aa0e5 Rebuilt for Boost 1.83 2024-01-18 00:50:07 +00:00
Jaroslav Škarvada
a51621a3f9 New version
Resolves: rhbz#2247579
2023-11-21 14:30:29 +01:00
Jaroslav Škarvada
b3de8665ea New version
Resolves: rhbz#2237074
2023-09-25 13:58:33 +02:00
Fedora Release Engineering
f928391d8d Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 17:02:35 +00:00
Python Maint
7ba9c549ea Rebuilt for Python 3.12 2023-06-14 20:24:03 +02:00
Dmitry V. Levin
bdf88f038a 11-dm-mpath.rules: fix warnings reported by udevadm verify
Fix the following warnings reported by udevadm verify:

10-usrp-uhd.rules:9 A comma between tokens is expected.
10-usrp-uhd.rules:12 A comma between tokens is expected.
10-usrp-uhd.rules:15 A comma between tokens is expected.
10-usrp-uhd.rules:16 A comma between tokens is expected.
10-usrp-uhd.rules:17 A comma between tokens is expected.
10-usrp-uhd.rules:18 A comma between tokens is expected.
10-usrp-uhd.rules:19 A comma between tokens is expected.
10-usrp-uhd.rules: udev rules check failed
2023-05-19 08:00:00 +00:00
Jonathan Wakely
e6450ed1a0 Rebuilt for Boost 1.81 2023-02-20 21:57:26 +00:00
Jaroslav Škarvada
1320ace558 New version
Resolves: rhbz#2164284
2023-02-01 17:39:19 +01:00
Fedora Release Engineering
def8e2df85 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-21 05:44:28 +00:00
Jaroslav Škarvada
435955a718 New version
Resolves: rhbz#2124734
2022-09-24 18:17:23 +02:00
Jaroslav Škarvada
b9d08a4ba6 New version
Resolves: rhbz#2110023
2022-07-29 23:30:17 +02:00
Fedora Release Engineering
8c8cb59a33 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 11:19:11 +00:00
Miro Hrončok
f11fa01adb Unbundle pybind11 to fix FTBFS with Python 3.11
Fedora's pybind11 is already fixed.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2099182
2022-06-21 14:24:16 +02:00
Jaroslav Škarvada
e5fb6d4070 Rebuilt for new python
Resolves: rhbz#2099182
2022-06-20 12:27:34 +02:00
Thomas Rodgers
4047fb8169 Rebuilt for Boost 1.78 2022-05-04 11:42:27 +02:00
Jaroslav Škarvada
1bc8bc1e0f Fixed FTBFS
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2022-04-21 21:32:44 +02:00
Jaroslav Škarvada
875ad9bdff New version
Resolves: rhbz#2073640
2022-04-21 15:04:27 +02:00
Jaroslav Škarvada
613bc2470d Switched to the upstream patch to fix compilation on the s390x 2022-02-01 01:06:00 +01:00
Jaroslav Škarvada
49229bd6ae Fixed images path 2022-01-29 00:40:07 +01:00
Jaroslav Škarvada
87d004a0af Defuzzified s390x patch 2022-01-28 16:41:50 +01:00
Fedora Release Engineering
7878961774 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-22 03:27:22 +00:00
Jaroslav Škarvada
c14745893a New version
Resolves: rhbz#2029036
2021-12-15 22:29:50 +01:00
Jaroslav Škarvada
70d4bfb9a0 New version
Resolves: rhbz#2006293
2021-10-04 19:38:52 +02:00
Jaroslav Škarvada
d7f5921e6e New version
Resolves: rhbz#1989976
2021-09-13 19:04:39 +02:00
Jonathan Wakely
c279d53123 Rebuilt for Boost 1.76 2021-08-06 23:55:47 +01:00
Fedora Release Engineering
f4c63bf986 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 19:58:22 +00:00
Jaroslav Škarvada
f35eda7fad New version
Resolves: rhbz#1982075
2021-07-14 20:44:48 +02:00
Jaroslav Škarvada
06e22709bb New version
Resolves: rhbz#1976430
2021-07-02 19:26:00 +02:00
Python Maint
58d4de4fcb Rebuilt for Python 3.10 2021-06-04 21:18:44 +02:00
Tomas Hrnciar
dff1e9b219 BuildRequire setuptools explicitly
See https://fedoraproject.org/wiki/Changes/Reduce_dependencies_on_python3-setuptools
2021-04-19 13:18:32 +02:00
Jonathan Wakely
53309a5cf1 Rebuilt for removed libstdc++ symbol (#1937698) 2021-03-30 19:36:21 +01:00
Jaroslav Škarvada
9accf032da Fixed requires for wireshark plugin
Resolves: rhbz#1925577
2021-02-08 14:48:58 +01:00
Jaroslav Škarvada
d5dbfb93a1 Fixed requires for wireshark plugin
Resolves: rhbz#1925577
2021-02-08 12:27:53 +01:00
Jaroslav Škarvada
addbe90df6 Added workaround for s390x FTBFS
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2021-02-02 22:15:28 +01:00
Jaroslav Škarvada
b8f61d0e94 FTBFS fixes
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2021-02-01 21:01:45 +01:00
Jaroslav Škarvada
7e9476da6c Added fix for gcc-11
Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
2021-01-26 01:19:00 +01:00
Jaroslav Škarvada
9833c761ac New version
Resolves: rhbz#1918161
2021-01-26 00:54:58 +01:00
Jonathan Wakely
653a3d51a1 Rebuilt for Boost 1.75 2021-01-22 20:53:53 +00:00
Tom Stellard
96f2e1b8e1 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-09 00:21:18 +00:00
Jeff Law
c31974efbc Fix missing #includes for gcc-11 2020-12-04 21:03:00 -07:00
4 changed files with 243 additions and 240 deletions

4
.gitignore vendored
View file

@ -1,2 +1,2 @@
uhd-*.tar.gz
uhd-images_*.tar.xz
/uhd-*.tar.gz
/uhd-images_*.tar.xz

View file

@ -1,2 +1,2 @@
SHA512 (uhd-images_3.14.1.1.tar.xz) = d2afde2f6a243fe3763f09ffe50bf4372af7f2b840df013f3eb111f0e713c9d57317414c389c8db87151ec8c2a868b2d4c67e571a8f6d3b17a250fb63f25aedd
SHA512 (uhd-3.15.0.0-rc2.tar.gz) = e4054ac9e481e1ee97f9046f0c2b3053c4d346bbe8df01e6ae515a1d592ac5a41e847537f4e20ba105f52a5d6aa3a5b5a356faa8cb220873521cbdb3a8cd56fd
SHA512 (uhd-4.10.0.0.tar.gz) = 600b6c8b1d5e37643e086d00e3c594b6b83a467b097576625dd4a949b3aab81cbbc221f2649a639fef67dfc0dce3bb919abee3cfb6ca266ad547262a16cdbd0e
SHA512 (uhd-images_4.10.0.0.tar.xz) = c5e54f47361a71baa3b5450fd4a3970a03349ecd69837a5de03a63f42b977f1e7e7246c0645d7178feac31f0c071e1914b3d8fcd60f8031aef4cfa45539d5054

View file

@ -1,182 +0,0 @@
--- uhd-3.15.0.0-rc2/host/cmake/Modules/UHDBoost.cmake~ 2020-06-03 14:17:53.758142936 +0100
+++ uhd-3.15.0.0-rc2/host/cmake/Modules/UHDBoost.cmake 2020-06-03 14:17:55.821143050 +0100
@@ -260,6 +260,9 @@
# works for Boost 1.67.0 and newer & doesn't hurt older
add_definitions(-DBOOST_ASIO_DISABLE_STD_EXPERIMENTAL_STRING_VIEW)
+ # Needed for Boost 1.73.0 to prevent warnings
+ add_definitions(-DBOOST_BIND_GLOBAL_PLACEHOLDERS)
+
# Boost 1.70.0's find cmake scripts don't always set the expected
# return variables. Replicate the commit that fixes that issue here:
# https://github.com/boostorg/boost_install/commit/cfa8d55250dfc2635e907e42da423e4eb540dee5
--- uhd-3.15.0.0-rc2/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp~ 2020-06-03 14:27:43.441170397 +0100
+++ uhd-3.15.0.0-rc2/host/lib/rfnoc/dma_fifo_block_ctrl_impl.cpp 2020-06-03 14:27:48.015170596 +0100
@@ -17,6 +17,7 @@
using namespace uhd;
using namespace uhd::rfnoc;
+using namespace boost::placeholders;
class dma_fifo_block_ctrl_impl : public dma_fifo_block_ctrl
{
--- uhd-3.15.0.0-rc2/host/lib/usrp/multi_usrp.cpp~ 2020-06-03 14:28:32.297172502 +0100
+++ uhd-3.15.0.0-rc2/host/lib/usrp/multi_usrp.cpp 2020-06-03 14:28:40.874172872 +0100
@@ -31,6 +31,7 @@
using namespace uhd;
using namespace uhd::usrp;
+using namespace boost::placeholders;
const size_t multi_usrp::ALL_MBOARDS = size_t(~0);
const size_t multi_usrp::ALL_CHANS = size_t(~0);
--- uhd-3.15.0.0-rc2/host/lib/usrp/cores/rx_dsp_core_3000.cpp~ 2020-06-03 14:31:35.175180398 +0100
+++ uhd-3.15.0.0-rc2/host/lib/usrp/cores/rx_dsp_core_3000.cpp 2020-06-03 14:31:42.021180693 +0100
@@ -37,6 +37,7 @@
}
using namespace uhd;
+using namespace boost::placeholders;
const double rx_dsp_core_3000::DEFAULT_CORDIC_FREQ = 0.0;
const double rx_dsp_core_3000::DEFAULT_RATE = 1e6;
--- uhd-3.15.0.0-rc2/host/lib/usrp/cores/tx_dsp_core_3000.cpp~ 2020-06-03 14:32:19.984182329 +0100
+++ uhd-3.15.0.0-rc2/host/lib/usrp/cores/tx_dsp_core_3000.cpp 2020-06-03 14:32:25.278182557 +0100
@@ -28,6 +28,7 @@
}
using namespace uhd;
+using namespace boost::placeholders;
const double tx_dsp_core_3000::DEFAULT_CORDIC_FREQ = 0.0;
const double tx_dsp_core_3000::DEFAULT_RATE = 1e6;
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_cbx.cpp~ 2020-06-03 14:33:42.513185887 +0100
+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_cbx.cpp 2020-06-03 14:33:44.167185959 +0100
@@ -12,6 +12,7 @@
using namespace uhd;
using namespace uhd::usrp;
using namespace boost::assign;
+using namespace boost::placeholders;
/***********************************************************************
* Structors
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx2.cpp~ 2020-06-03 14:34:31.865188014 +0100
+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx2.cpp 2020-06-03 14:34:38.007188279 +0100
@@ -65,6 +65,7 @@
using namespace uhd;
using namespace uhd::usrp;
using namespace boost::assign;
+using namespace boost::placeholders;
/***********************************************************************
* The TVRX2 types
--- uhd-3.15.0.0-rc2/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp~ 2020-06-03 14:35:57.858191722 +0100
+++ uhd-3.15.0.0-rc2/host/lib/usrp/x300/x300_radio_ctrl_impl.cpp 2020-06-03 14:36:02.680191929 +0100
@@ -27,6 +27,7 @@
using namespace uhd::usrp;
using namespace uhd::rfnoc;
using namespace uhd::usrp::x300;
+using namespace boost::placeholders;
static const size_t IO_MASTER_RADIO = 0;
--- uhd-3.15.0.0-rc2/host/lib/usrp/b100/b100_impl.cpp~ 2020-06-03 14:36:19.706192663 +0100
+++ uhd-3.15.0.0-rc2/host/lib/usrp/b100/b100_impl.cpp 2020-06-03 14:36:25.680192921 +0100
@@ -23,6 +23,7 @@
using namespace uhd;
using namespace uhd::usrp;
using namespace uhd::transport;
+using namespace boost::placeholders;
namespace {
constexpr uint16_t B100_VENDOR_ID = 0x2500;
--- uhd-3.15.0.0-rc2/host/lib/usrp_clock/octoclock/octoclock_impl.cpp~ 2020-06-03 14:36:54.427194160 +0100
+++ uhd-3.15.0.0-rc2/host/lib/usrp_clock/octoclock/octoclock_impl.cpp 2020-06-03 14:37:11.471194895 +0100
@@ -34,6 +34,7 @@
using namespace uhd;
using namespace uhd::usrp_clock;
using namespace uhd::transport;
+using namespace boost::placeholders;
namespace asio = boost::asio;
namespace fs = boost::filesystem;
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version4.cpp~ 2020-06-03 14:40:42.223206781 +0100
+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version4.cpp 2020-06-03 14:40:49.140207195 +0100
@@ -13,6 +13,7 @@
using namespace uhd;
using namespace uhd::usrp;
using namespace boost::assign;
+using namespace boost::placeholders;
/***********************************************************************
* Structors
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx2.cpp~ 2020-06-03 14:41:03.583208062 +0100
+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx2.cpp 2020-06-03 14:41:12.806208613 +0100
@@ -26,6 +26,7 @@
using namespace uhd;
using namespace uhd::usrp;
using namespace boost::assign;
+using namespace boost::placeholders;
/***********************************************************************
* The DBSRX2 constants
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx.cpp~ 2020-06-03 14:41:26.807209454 +0100
+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_tvrx.cpp 2020-06-03 14:41:38.846210175 +0100
@@ -41,6 +41,7 @@
using namespace uhd;
using namespace uhd::usrp;
using namespace boost::assign;
+using namespace boost::placeholders;
/***********************************************************************
* The tvrx constants
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx.cpp~ 2020-06-03 14:41:50.031210845 +0100
+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_dbsrx.cpp 2020-06-03 14:41:55.988211201 +0100
@@ -31,6 +31,7 @@
using namespace uhd;
using namespace uhd::usrp;
using namespace boost::assign;
+using namespace boost::placeholders;
/***********************************************************************
* The DBSRX constants
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_common.cpp~ 2020-06-03 15:03:03.828285516 +0100
+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_common.cpp 2020-06-03 15:03:06.925285692 +0100
@@ -10,6 +10,7 @@
using namespace uhd;
using namespace uhd::usrp;
using namespace boost::assign;
+using namespace boost::placeholders;
/***********************************************************************
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_xcvr2450.cpp~ 2020-06-03 15:03:37.135287400 +0100
+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_xcvr2450.cpp 2020-06-03 15:03:46.203287915 +0100
@@ -58,6 +58,7 @@
using namespace uhd;
using namespace uhd::usrp;
using namespace boost::assign;
+using namespace boost::placeholders;
/***********************************************************************
* The XCVR 2450 constants
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version3.cpp~ 2020-06-03 15:04:13.982289481 +0100
+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_sbx_version3.cpp 2020-06-03 15:04:21.595289912 +0100
@@ -13,6 +13,7 @@
using namespace uhd;
using namespace uhd::usrp;
using namespace boost::assign;
+using namespace boost::placeholders;
/***********************************************************************
* Structors
--- uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_ubx.cpp~ 2020-06-03 15:20:39.628345132 +0100
+++ uhd-3.15.0.0-rc2/host/lib/usrp/dboard/db_ubx.cpp 2020-06-03 15:20:48.073345609 +0100
@@ -30,6 +30,7 @@
using namespace uhd;
using namespace uhd::usrp;
+using namespace boost::placeholders;
/***********************************************************************
* UBX Data Structures

293
uhd.spec
View file

@ -9,16 +9,17 @@
# images you need to install appropriate tools (e.g. Xilinx ISE).
%bcond_without binary_firmware
# By default do not build with wireshark support, it's currently
# broken (upstream ticket #268)
# Currently broken: https://github.com/EttusResearch/uhd/issues/413
%bcond_with wireshark
# NEON support is by default disabled on ARMs
# building with --with=neon will enable auto detection
%bcond_with neon
%global wireshark_dissectors chdr zpu octoclock
%global wireshark_ver %((%{__awk} '/^#define VERSION[ \t]+/ { print $NF }' /usr/include/wireshark/config.h 2>/dev/null||echo none)|/usr/bin/tr -d '"')
# X.Y.Z
%global wireshark_ver_full %((%{__awk} '/^#define VERSION[ \t]+/ { print $NF }' /usr/include/wireshark/config.h 2>/dev/null||echo none)|/usr/bin/tr -d '"')
# X.Y
%global wireshark_ver %(VF="%{wireshark_ver_full}"; echo ${VF%.*})
%ifarch %{arm} aarch64
%if ! %{with neon}
@ -26,34 +27,49 @@
%endif
%endif
%global ver 3.15.0.0
%global verd 3.14.1.1
Name: uhd
URL: http://github.com/EttusResearch/uhd
Version: %{ver}
Release: 0.8.rc2%{?dist}
License: GPLv3+
Version: 4.10.0.0
#%%global images_ver %%{version}
%global images_ver 4.10.0.0
Release: 4%{?dist}
# Automatically converted from old format: GPLv3+ - review is highly recommended.
License: GPL-3.0-or-later
BuildRequires: make
BuildRequires: gcc-c++
BuildRequires: cmake
BuildRequires: boost-devel, libusb1-devel, python3-cheetah, ncurses-devel
BuildRequires: python3-docutils, doxygen, pkgconfig, libpcap-devel
BuildRequires: python3-numpy, vim-common
BuildRequires: boost-devel
BuildRequires: libusb1-devel
BuildRequires: python3-cheetah
BuildRequires: ncurses-devel
BuildRequires: python3-docutils
BuildRequires: doxygen
BuildRequires: pkgconfig
BuildRequires: libpcap-devel
BuildRequires: python3-numpy
BuildRequires: vim-common
BuildRequires: libatomic
%if %{with wireshark}
BuildRequires: wireshark-devel
BuildRequires: libgcrypt-devel
BuildRequires: gnutls-devel
%endif
BuildRequires: python3-mako, python3-requests, python3-devel, tar
BuildRequires: pybind11-devel
BuildRequires: python3-mako
BuildRequires: python3-requests
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: tar
%if ! %{with binary_firmware}
BuildRequires: sdcc sed
BuildRequires: sdcc
BuildRequires: sed
%endif
Requires(pre): shadow-utils, glibc-common
Requires(pre): glibc-common
Requires: python3-tkinter
Summary: Universal Hardware Driver for Ettus Research products
#Source0: %%{url}/archive/v%%{version}/uhd-%%{version}.tar.gz
Source0: %{url}/archive/v%{ver}-rc2/uhd-%{ver}-rc2.tar.gz
Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz
Source1: %{name}-limits.conf
Source2: %{url}/releases/download/v%{verd}/uhd-images_%{verd}.tar.xz
Patch0: %{name}-bind-placeholders.patch
Source2: %{url}/releases/download/v%{images_ver}/uhd-images_%{images_ver}.tar.xz
%description
The UHD is the universal hardware driver for Ettus Research products.
@ -93,15 +109,14 @@ Tools that are useful for working with and/or debugging USRP device.
%package wireshark
Summary: Wireshark dissector plugins
Requires: %{name} = %{version}-%{release}
Requires: wireshark = %{wireshark_ver}
Requires: %{_libdir}/wireshark/plugins/%{wireshark_ver}
%description wireshark
Wireshark dissector plugins.
%endif
%prep
%setup -q -n %{name}-%{ver}-rc2
%patch0 -p1
%autosetup -p1
# firmware
%if %{with binary_firmware}
@ -116,6 +131,11 @@ rm -rf images/winusb_driver
# fix python shebangs
find . -type f -name "*.py" -exec sed -i '/^#!/ s|.*|#!%{__python3}|' {} \;
# Create a sysusers.d config file
cat >uhd.sysusers.conf <<EOF
g usrp -
EOF
%build
# firmware
%if ! %{with binary_firmware}
@ -128,34 +148,29 @@ popd
%endif
pushd host
# DLIB_SUFFIX workaround for cmake 4.0
# https://github.com/EttusResearch/uhd/issues/844
%cmake %{?have_neon} -DPYTHON_EXECUTABLE="%{__python3}" \
-DPYBIND11_INCLUDE_DIR="/usr/include/pybind11/" \
-DUHD_VERSION="%{version}" \
-DENABLE_TESTS=off ../
-DENABLE_TESTS=off ../ \
%if "%{?_lib}"=="lib64"
-DLIB_SUFFIX=64
%endif
%cmake_build
popd
# tools
pushd tools/uhd_dump
make %{?_smp_mflags} CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}"
popd
%if %{with wireshark}
# wireshark dissectors
pushd tools/dissectors
for d in %{wireshark_dissectors}
do
mkdir "build_$d"
pushd "build_$d"
%cmake -DETTUS_DISSECTOR_NAME="$d" -S ".."
%cmake_build
popd
done
%cmake -DENABLE_OCTOCLOCK=ON -DENABLE_ZPU=ON
%cmake_build
popd
%endif
#%%check
#cd host/build
#make test
#cd host/%%{_vpath_builddir}
#%%ctest
%install
# fix python shebangs (run again for generated scripts)
@ -165,7 +180,7 @@ pushd host
%cmake_install
# Fix udev rules and use dynamic ACL management for device
sed -i 's/BUS==/SUBSYSTEM==/;s/SYSFS{/ATTRS{/;s/MODE:="0666"/GROUP:="usrp" MODE:="0660", ENV{ID_SOFTWARE_RADIO}="1"/' %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules
sed -i 's/BUS==/SUBSYSTEM==/;s/SYSFS{/ATTRS{/;s/MODE:="0666"/GROUP:="usrp", MODE:="0660", ENV{ID_SOFTWARE_RADIO}="1"/' %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules
mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d
mv %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules %{buildroot}%{_prefix}/lib/udev/rules.d/10-usrp-uhd.rules
@ -201,38 +216,34 @@ popd
# tools
install -Dpm 0755 tools/usrp_x3xx_fpga_jtag_programmer.sh %{buildroot}%{_bindir}/usrp_x3xx_fpga_jtag_programmer.sh
install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log
%if %{with wireshark}
# wireshark dissectors
pushd tools/dissectors
for d in build_*/*
do
pushd "$d"
%make_install
popd
done
%cmake_install
popd
mv %{buildroot}${HOME}/.wireshark %{buildroot}%{_libdir}/wireshark
# fix wireshark dissectors location
mkdir -p %{buildroot}%{_libdir}/wireshark/plugins/%{wireshark_ver}
mv %{buildroot}%{_prefix}/epan %{buildroot}%{_libdir}/wireshark/plugins/%{wireshark_ver}
%endif
# add directory for modules
mkdir -p %{buildroot}%{_libdir}/uhd/modules
install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf
%ldconfig_scriptlets
%pre
getent group usrp >/dev/null || \
%{_sbindir}/groupadd -r usrp >/dev/null 2>&1
exit 0
%files
%exclude %{_docdir}/%{name}/doxygen
%exclude %{_datadir}/uhd/images
%doc _tmpdoc/*
%dir %{_libdir}/uhd
%{_bindir}/usrpctl
%{_bindir}/uhd_*
%{_bindir}/usrp2_*
%{_bindir}/usrp_hwd.py
%{_prefix}/lib/udev/rules.d/10-usrp-uhd.rules
%config(noreplace) %{_sysconfdir}/security/limits.d/*.conf
%{_libdir}/lib*.so.*
@ -241,6 +252,8 @@ exit 0
%{_mandir}/man1/*.1*
%{_datadir}/uhd
%{python3_sitearch}/uhd
%{python3_sitearch}/usrp_mpm
%{_sysusersdir}/uhd.conf
%files firmware
%dir %{_datadir}/uhd/images
@ -258,14 +271,186 @@ exit 0
%files tools
%doc tools/README.md
%{_bindir}/usrp_x3xx_fpga_jtag_programmer.sh
%{_bindir}/chdr_log
%if %{with wireshark}
%files wireshark
%{_libdir}/wireshark/plugins/*
%{_libdir}/wireshark/plugins/%{wireshark_ver}/epan/*
%endif
%changelog
* Wed Jul 22 2026 Python Maint <python-maint@redhat.com> - 4.10.0.0-4
- Rebuilt for Python 3.15.0b4 ABI change
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.10.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Thu Jun 04 2026 Python Maint <python-maint@redhat.com> - 4.10.0.0-2
- Rebuilt for Python 3.15
* Tue Apr 28 2026 Jaroslav Škarvada <jskarvad@redhat.com> - 4.10.0.0-1
- New version
Resolves: rhbz#2451594
* Tue Jan 20 2026 Fedora Release Engineering <releng@fedoraproject.org> - 4.9.0.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Mon Jan 12 2026 Jonathan Wakely <jwakely@fedoraproject.org> - 4.9.0.1-2
- Rebuilt for Boost 1.90
* Mon Oct 13 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 4.9.0.1-2
- New version
Resolves: rhbz#2403533
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 4.9.0.0-2
- Rebuilt for Python 3.14.0rc3 bytecode
* Thu Sep 11 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 4.9.0.0-1
- New version
Resolves: rhbz#2387862
* Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 4.8.0.0-4
- Rebuilt for Python 3.14.0rc2 bytecode
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Tue Jun 03 2025 Python Maint <python-maint@redhat.com> - 4.8.0.0-2
- Rebuilt for Python 3.14
* Wed Mar 12 2025 Jaroslav Škarvada <jskarvad@redhat.com> - 4.8.0.0-1
- New version
Resolves: rhbz#2337610
Resolves: rhbz#2341478
* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.7.0.0-5
- Add sysusers.d config file to allow rpm to create users/groups automatically
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Thu Jul 25 2024 Miroslav Suchý <msuchy@redhat.com> - 4.7.0.0-3
- convert license to SPDX
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Mon Jul 15 2024 Jaroslav Škarvada <jskarvad@redhat.com> - 4.7.0.0-1
- New version
Resolves: rhbz#2293732
* Sat Jun 08 2024 Python Maint <python-maint@redhat.com> - 4.6.0.0-4
- Rebuilt for Python 3.13
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Jan 18 2024 Jonathan Wakely <jwakely@redhat.com> - 4.6.0.0-2
- Rebuilt for Boost 1.83
* Tue Nov 21 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 4.6.0.0-1
- New version
Resolves: rhbz#2247579
* Mon Sep 25 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 4.5.0.0-1
- New version
Resolves: rhbz#2237074
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.4.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Jun 14 2023 Python Maint <python-maint@redhat.com> - 4.4.0.0-3
- Rebuilt for Python 3.12
* Mon Feb 20 2023 Jonathan Wakely <jwakely@redhat.com> - 4.4.0.0-2
- Rebuilt for Boost 1.81
* Wed Feb 1 2023 Jaroslav Škarvada <jskarvad@redhat.com> - 4.4.0.0-1
- New version
Resolves: rhbz#2164284
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Sep 24 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 4.3.0.0-1
- New version
Resolves: rhbz#2124734
* Fri Jul 29 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 4.2.0.1-1
- New version
Resolves: rhbz#2110023
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jun 20 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 4.2.0.0-3
- Rebuilt for new python
Resolves: rhbz#2099182
* Wed May 04 2022 Thomas Rodgers <trodgers@redhat.com> - 4.2.0.0-2
- Rebuilt for Boost 1.78
* Thu Apr 21 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 4.2.0.0-1
- New version
Resolves: rhbz#2073640
* Tue Feb 1 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 4.1.0.5-5
- Switched to the upstream patch to fix compilation on the s390x
* Fri Jan 28 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 4.1.0.5-4
- Fixed images path
* Fri Jan 28 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 4.1.0.5-3
- Defuzzified s390x patch
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Dec 15 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 4.1.0.5-1
- New version
Resolves: rhbz#2029036
* Mon Oct 4 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 4.1.0.4-1
- New version
Resolves: rhbz#2006293
* Mon Sep 13 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 4.1.0.2-1
- New version
Resolves: rhbz#1989976
* Fri Aug 06 2021 Jonathan Wakely <jwakely@redhat.com> - 4.1.0.1-3
- Rebuilt for Boost 1.76
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.0.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jul 14 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 4.1.0.1-1
- New version
Resolves: rhbz#1982075
* Thu Jul 1 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 4.1.0.0-1
- New version
Resolves: rhbz#1976430
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 4.0.0.0-4
- Rebuilt for Python 3.10
* Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 4.0.0.0-3
- Rebuilt for removed libstdc++ symbol (#1937698)
* Mon Feb 8 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 4.0.0.0-2
- Fixed requires for wireshark plugin
Resolves: rhbz#1925577
* Mon Jan 25 2021 Jaroslav Škarvada <jskarvad@redhat.com> - 4.0.0.0-1
- New version
Resolves: rhbz#1918161
* Fri Jan 22 2021 Jonathan Wakely <jwakely@redhat.com> - 3.15.0.0-0.10.rc2
- Rebuilt for Boost 1.75
* Fri Dec 4 2020 Jeff Law <law@redhat.com> - 3.15.0.0-0.9.rc2
- Fix missing #includes for gcc-11
* Wed Aug 5 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 3.15.0.0-0.8.rc2
- Fixed FTBFS
Resolves: rhbz#1865590