From ff6fd8bff685cd3aeec2b1554fe9d03a17ed7ad2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 13 Oct 2025 17:25:34 +0200 Subject: [PATCH 1/8] New version Resolves: rhbz#2403533 --- sources | 2 +- uhd.spec | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 2d55172..05dffa9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.9.0.0.tar.gz) = df8dc56035c5fb18b958fdb6ffd28ed1bbf4a4dd051800865fe4e9a2df953e13e1930ed285507dc6d2736443a285283741b1d0dc3dae862b0bb3e477d8532641 +SHA512 (uhd-4.9.0.1.tar.gz) = efb4ef440e102c7705100980a8ea0a9e55de6e631d70c1e9a39a8b6cd8991129f2fd39ba93094300bdc4878c73023a956a4f79488f6aaf5104371410de6f0497 SHA512 (uhd-images_4.9.0.0.tar.xz) = df173afdc9a3b69989a392ec2d51a1494dfe14ba2b85a775011d09564a3928c3ccd8f68aa0b02b244ef4a5bb7c21998318bd488770b1c9f7fe354bd97ff3a0e3 diff --git a/uhd.spec b/uhd.spec index d886d98..b6d82e7 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,9 +29,10 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.9.0.0 -%global images_ver %{version} -Release: 2%{?dist} +Version: 4.9.0.1 +#%%global images_ver %%{version} +%global images_ver 4.9.0.0 +Release: 1%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -280,6 +281,10 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Mon Oct 13 2025 Jaroslav Škarvada - 4.9.0.1-2 +- New version + Resolves: rhbz#2403533 + * Fri Sep 19 2025 Python Maint - 4.9.0.0-2 - Rebuilt for Python 3.14.0rc3 bytecode From 5c4d17f8f523fa3a205dadcb3662cecd7c05ef74 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 12 Jan 2026 18:30:39 +0000 Subject: [PATCH 2/8] Rebuilt for Boost 1.90 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index b6d82e7..20a398c 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.9.0.1 #%%global images_ver %%{version} %global images_ver 4.9.0.0 -Release: 1%{?dist} +Release: 2%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -281,6 +281,9 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Mon Jan 12 2026 Jonathan Wakely - 4.9.0.1-2 +- Rebuilt for Boost 1.90 + * Mon Oct 13 2025 Jaroslav Škarvada - 4.9.0.1-2 - New version Resolves: rhbz#2403533 From 1baf9fd961dfa3abdb99e54138ceda121469f8c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 13 Jan 2026 16:35:41 +0100 Subject: [PATCH 3/8] Fixed build with cmake-4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uhd-4.9.0.1-cmake-4-fix.patch | 65 +++++++++++++++++++++++++++++++++++ uhd.spec | 4 ++- 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 uhd-4.9.0.1-cmake-4-fix.patch diff --git a/uhd-4.9.0.1-cmake-4-fix.patch b/uhd-4.9.0.1-cmake-4-fix.patch new file mode 100644 index 0000000..df096a3 --- /dev/null +++ b/uhd-4.9.0.1-cmake-4-fix.patch @@ -0,0 +1,65 @@ +diff --git a/firmware/fx2/CMakeLists.txt b/firmware/fx2/CMakeLists.txt +index 7a41333..10a363d 100644 +--- a/firmware/fx2/CMakeLists.txt ++++ b/firmware/fx2/CMakeLists.txt +@@ -15,7 +15,7 @@ + # along with this program. If not, see . + # + +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.5) + set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/config/Toolchain-sdcc.cmake) + project(USRP1 C) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/") +diff --git a/firmware/octoclock/CMakeLists.txt b/firmware/octoclock/CMakeLists.txt +index 4d99add..483a191 100644 +--- a/firmware/octoclock/CMakeLists.txt ++++ b/firmware/octoclock/CMakeLists.txt +@@ -15,7 +15,7 @@ + # along with this program. If not, see . + # + +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.5) + set(CMAKE_SYSTEM_NAME Generic) + + find_program(AVR_CC avr-gcc REQUIRED) +diff --git a/firmware/usrp2/CMakeLists.txt b/firmware/usrp2/CMakeLists.txt +index 693fbf9..9ec61f8 100644 +--- a/firmware/usrp2/CMakeLists.txt ++++ b/firmware/usrp2/CMakeLists.txt +@@ -18,7 +18,7 @@ + ######################################################################## + # setup project and compiler + ######################################################################## +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.5) + #force the compiler because the check wont use the special flag below + include(CMakeForceCompiler) + set(CMAKE_SYSTEM_NAME Generic) +diff --git a/firmware/usrp3/CMakeLists.txt b/firmware/usrp3/CMakeLists.txt +index 9cfbe99..bfbcb83 100644 +--- a/firmware/usrp3/CMakeLists.txt ++++ b/firmware/usrp3/CMakeLists.txt +@@ -18,7 +18,7 @@ + ######################################################################## + # setup project and compiler + ######################################################################## +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.5) + #force the compiler because the check wont use the special flag below + include(CMakeForceCompiler) + set(CMAKE_SYSTEM_NAME Generic) +diff --git a/tools/dissectors/CMakeLists.txt b/tools/dissectors/CMakeLists.txt +index 8fa8542..af67ee0 100644 +--- a/tools/dissectors/CMakeLists.txt ++++ b/tools/dissectors/CMakeLists.txt +@@ -4,7 +4,7 @@ + # SPDX-License-Identifier: GPL-3.0-or-later + # + +-cmake_minimum_required(VERSION 3.1) ++cmake_minimum_required(VERSION 3.5) + cmake_policy(SET CMP0048 NEW) + project(EttusDissectors VERSION 4.0.0 DESCRIPTION "Dissector Plugins" LANGUAGES C CXX) + diff --git a/uhd.spec b/uhd.spec index 20a398c..e5f50c1 100644 --- a/uhd.spec +++ b/uhd.spec @@ -73,6 +73,8 @@ Source2: %{url}/releases/download/v%{images_ver}/uhd-images_%{images_ver} # dirty workaround for the https://github.com/EttusResearch/uhd/issues/551 # until the better fix is available Patch: uhd-4.8.0.0-imagepath-fix.patch +# already in upstream +Patch: uhd-4.9.0.1-cmake-4-fix.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -173,7 +175,7 @@ popd #%%check #cd host/%%{_vpath_builddir} -#make test +#%%ctest %install # fix python shebangs (run again for generated scripts) From 23b5fbbc6736c96b31107f90637f96b288ebea6f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 20 Jan 2026 03:31:08 +0000 Subject: [PATCH 4/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index e5f50c1..142ba1f 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.9.0.1 #%%global images_ver %%{version} %global images_ver 4.9.0.0 -Release: 2%{?dist} +Release: 3%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -283,6 +283,9 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Tue Jan 20 2026 Fedora Release Engineering - 4.9.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Mon Jan 12 2026 Jonathan Wakely - 4.9.0.1-2 - Rebuilt for Boost 1.90 From 1c486dd191d9ebced50cb2a9ab7e47ebb18c49f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 28 Apr 2026 13:38:36 +0200 Subject: [PATCH 5/8] New version Resolves: rhbz#2451594 --- sources | 4 +- uhd-4.8.0.0-imagepath-fix.patch | 13 ------- uhd-4.9.0.1-cmake-4-fix.patch | 65 --------------------------------- uhd.spec | 15 ++++---- 4 files changed, 9 insertions(+), 88 deletions(-) delete mode 100644 uhd-4.8.0.0-imagepath-fix.patch delete mode 100644 uhd-4.9.0.1-cmake-4-fix.patch diff --git a/sources b/sources index 05dffa9..15eff2b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.9.0.1.tar.gz) = efb4ef440e102c7705100980a8ea0a9e55de6e631d70c1e9a39a8b6cd8991129f2fd39ba93094300bdc4878c73023a956a4f79488f6aaf5104371410de6f0497 -SHA512 (uhd-images_4.9.0.0.tar.xz) = df173afdc9a3b69989a392ec2d51a1494dfe14ba2b85a775011d09564a3928c3ccd8f68aa0b02b244ef4a5bb7c21998318bd488770b1c9f7fe354bd97ff3a0e3 +SHA512 (uhd-4.10.0.0.tar.gz) = 600b6c8b1d5e37643e086d00e3c594b6b83a467b097576625dd4a949b3aab81cbbc221f2649a639fef67dfc0dce3bb919abee3cfb6ca266ad547262a16cdbd0e +SHA512 (uhd-images_4.10.0.0.tar.xz) = c5e54f47361a71baa3b5450fd4a3970a03349ecd69837a5de03a63f42b977f1e7e7246c0645d7178feac31f0c071e1914b3d8fcd60f8031aef4cfa45539d5054 diff --git a/uhd-4.8.0.0-imagepath-fix.patch b/uhd-4.8.0.0-imagepath-fix.patch deleted file mode 100644 index 6e825f8..0000000 --- a/uhd-4.8.0.0-imagepath-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/host/lib/utils/paths.cpp b/host/lib/utils/paths.cpp -index 2eac87e..2a3a3f1 100644 ---- a/host/lib/utils/paths.cpp -+++ b/host/lib/utils/paths.cpp -@@ -283,7 +283,7 @@ std::string uhd::get_pkg_data_path() - - std::string uhd::get_lib_path(void) - { -- fs::path runtime_libfile_path = boost::dll::this_line_location(); -+ fs::path runtime_libfile_path = "/usr" / boost::dll::this_line_location(); - // Normalize before decomposing path so result is reliable - fs::path lib_path = runtime_libfile_path.lexically_normal().parent_path(); - return lib_path.string(); diff --git a/uhd-4.9.0.1-cmake-4-fix.patch b/uhd-4.9.0.1-cmake-4-fix.patch deleted file mode 100644 index df096a3..0000000 --- a/uhd-4.9.0.1-cmake-4-fix.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/firmware/fx2/CMakeLists.txt b/firmware/fx2/CMakeLists.txt -index 7a41333..10a363d 100644 ---- a/firmware/fx2/CMakeLists.txt -+++ b/firmware/fx2/CMakeLists.txt -@@ -15,7 +15,7 @@ - # along with this program. If not, see . - # - --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.5) - set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/config/Toolchain-sdcc.cmake) - project(USRP1 C) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/config/") -diff --git a/firmware/octoclock/CMakeLists.txt b/firmware/octoclock/CMakeLists.txt -index 4d99add..483a191 100644 ---- a/firmware/octoclock/CMakeLists.txt -+++ b/firmware/octoclock/CMakeLists.txt -@@ -15,7 +15,7 @@ - # along with this program. If not, see . - # - --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.5) - set(CMAKE_SYSTEM_NAME Generic) - - find_program(AVR_CC avr-gcc REQUIRED) -diff --git a/firmware/usrp2/CMakeLists.txt b/firmware/usrp2/CMakeLists.txt -index 693fbf9..9ec61f8 100644 ---- a/firmware/usrp2/CMakeLists.txt -+++ b/firmware/usrp2/CMakeLists.txt -@@ -18,7 +18,7 @@ - ######################################################################## - # setup project and compiler - ######################################################################## --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.5) - #force the compiler because the check wont use the special flag below - include(CMakeForceCompiler) - set(CMAKE_SYSTEM_NAME Generic) -diff --git a/firmware/usrp3/CMakeLists.txt b/firmware/usrp3/CMakeLists.txt -index 9cfbe99..bfbcb83 100644 ---- a/firmware/usrp3/CMakeLists.txt -+++ b/firmware/usrp3/CMakeLists.txt -@@ -18,7 +18,7 @@ - ######################################################################## - # setup project and compiler - ######################################################################## --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.5) - #force the compiler because the check wont use the special flag below - include(CMakeForceCompiler) - set(CMAKE_SYSTEM_NAME Generic) -diff --git a/tools/dissectors/CMakeLists.txt b/tools/dissectors/CMakeLists.txt -index 8fa8542..af67ee0 100644 ---- a/tools/dissectors/CMakeLists.txt -+++ b/tools/dissectors/CMakeLists.txt -@@ -4,7 +4,7 @@ - # SPDX-License-Identifier: GPL-3.0-or-later - # - --cmake_minimum_required(VERSION 3.1) -+cmake_minimum_required(VERSION 3.5) - cmake_policy(SET CMP0048 NEW) - project(EttusDissectors VERSION 4.0.0 DESCRIPTION "Dissector Plugins" LANGUAGES C CXX) - diff --git a/uhd.spec b/uhd.spec index 142ba1f..1f5d9a4 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,10 +29,10 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.9.0.1 +Version: 4.10.0.0 #%%global images_ver %%{version} -%global images_ver 4.9.0.0 -Release: 3%{?dist} +%global images_ver 4.10.0.0 +Release: 1%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -70,11 +70,6 @@ Summary: Universal Hardware Driver for Ettus Research products Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz Source1: %{name}-limits.conf Source2: %{url}/releases/download/v%{images_ver}/uhd-images_%{images_ver}.tar.xz -# dirty workaround for the https://github.com/EttusResearch/uhd/issues/551 -# until the better fix is available -Patch: uhd-4.8.0.0-imagepath-fix.patch -# already in upstream -Patch: uhd-4.9.0.1-cmake-4-fix.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -283,6 +278,10 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Tue Apr 28 2026 Jaroslav Škarvada - 4.10.0.0-1 +- New version + Resolves: rhbz#2451594 + * Tue Jan 20 2026 Fedora Release Engineering - 4.9.0.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 77495c7172a7fc42c43f6d74de51d37b4e3bad03 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 4 Jun 2026 09:33:17 +0200 Subject: [PATCH 6/8] Rebuilt for Python 3.15 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 1f5d9a4..018fed5 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.10.0.0 #%%global images_ver %%{version} %global images_ver 4.10.0.0 -Release: 1%{?dist} +Release: 2%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -278,6 +278,9 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Thu Jun 04 2026 Python Maint - 4.10.0.0-2 +- Rebuilt for Python 3.15 + * Tue Apr 28 2026 Jaroslav Škarvada - 4.10.0.0-1 - New version Resolves: rhbz#2451594 From 69834dded8aceb7170094f5e52c447880eefcbcb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:08:18 +0000 Subject: [PATCH 7/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 018fed5..2c1c096 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.10.0.0 #%%global images_ver %%{version} %global images_ver 4.10.0.0 -Release: 2%{?dist} +Release: 3%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -278,6 +278,9 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 4.10.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Thu Jun 04 2026 Python Maint - 4.10.0.0-2 - Rebuilt for Python 3.15 From acfe813c92501f3f69407edb0ba32c547f44eb1a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 22 Jul 2026 10:11:19 +0200 Subject: [PATCH 8/8] Rebuilt for Python 3.15.0b4 ABI change --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 2c1c096..4adc306 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.10.0.0 #%%global images_ver %%{version} %global images_ver 4.10.0.0 -Release: 3%{?dist} +Release: 4%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -278,6 +278,9 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* Wed Jul 22 2026 Python Maint - 4.10.0.0-4 +- Rebuilt for Python 3.15.0b4 ABI change + * Fri Jul 17 2026 Fedora Release Engineering - 4.10.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild