diff --git a/sources b/sources index 6a64760..15eff2b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.8.0.0.tar.gz) = 61e92209e69994b1c5d3a2a88f749ddca612a3fa3c1580c00a9577e25fab5055d7c80571f2843cca3951fc941d1a81566bafc21070fb93cb3e566228c46331e7 -SHA512 (uhd-images_4.8.0.0.tar.xz) = 4203e5b7f642d7850e9563ba495a60efe965a64223d9208c780e1400ea755b322125fff53c3f8a3fb010617b57a4da638dc3cf80bf7d95604e20788cc469edb9 +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-gcc-15-fix.patch b/uhd-4.8.0.0-gcc-15-fix.patch deleted file mode 100644 index ad860ad..0000000 --- a/uhd-4.8.0.0-gcc-15-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/host/include/uhd/features/ref_clk_calibration_iface.hpp b/host/include/uhd/features/ref_clk_calibration_iface.hpp -index 86a2005..7aa8062 100644 ---- a/host/include/uhd/features/ref_clk_calibration_iface.hpp -+++ b/host/include/uhd/features/ref_clk_calibration_iface.hpp -@@ -8,6 +8,7 @@ - - #include - #include -+#include - #include - - namespace uhd { namespace features { -diff --git a/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp b/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp -index fd23fb8..8f1fc4e 100644 ---- a/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp -+++ b/host/lib/include/uhdlib/usrp/dboard/fbx/fbx_constants.hpp -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/tools/uhd_dump/uhd_dump.h b/tools/uhd_dump/uhd_dump.h -index 3a6ac4e..12d39e3 100644 ---- a/tools/uhd_dump/uhd_dump.h -+++ b/tools/uhd_dump/uhd_dump.h -@@ -50,7 +50,6 @@ - // UDP used as source for all CHDR comms. - #define CHDR_PORT 49153 - --typedef unsigned char bool; - typedef unsigned char u8; - typedef unsigned short u16; - typedef unsigned int u32; 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.spec b/uhd.spec index e07ab96..4adc306 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,9 +29,10 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.8.0.0 -%global images_ver %{version} -Release: 5%{?dist} +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 @@ -69,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 -# https://github.com/EttusResearch/uhd/issues/844 -Patch: uhd-4.8.0.0-gcc-15-fix.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -164,11 +160,6 @@ pushd host %cmake_build popd -# tools -pushd tools/uhd_dump -make %{?_smp_mflags} CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" -popd - %if %{with wireshark} # wireshark dissectors pushd tools/dissectors @@ -179,7 +170,7 @@ popd #%%check #cd host/%%{_vpath_builddir} -#make test +#%%ctest %install # fix python shebangs (run again for generated scripts) @@ -225,7 +216,6 @@ 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 @@ -281,7 +271,6 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %files tools %doc tools/README.md %{_bindir}/usrp_x3xx_fpga_jtag_programmer.sh -%{_bindir}/chdr_log %if %{with wireshark} %files wireshark @@ -289,9 +278,35 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog -* Tue Oct 07 2025 Jaroslav Škarvada - 4.8.0.0-5 -- Rebuilt due to python "magic number" change - Resolves: rhbz#2396886 +* 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 + +* 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 + +* 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 + +* 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 + +* Thu Sep 11 2025 Jaroslav Škarvada - 4.9.0.0-1 +- New version + Resolves: rhbz#2387862 * Fri Aug 15 2025 Python Maint - 4.8.0.0-4 - Rebuilt for Python 3.14.0rc2 bytecode