diff --git a/sources b/sources index b1b2a09..15eff2b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.6.0.0.tar.gz) = de9bb10e5109bd860a9b2f61841e3ade55fbbc7d8000f385fcdf1c831585c9d25999d159a7da95e3e3f0b74330c1512265994e9aacf00b1b0891f9ba6db58e30 -SHA512 (uhd-images_4.6.0.0.tar.xz) = 944a26bea2f11d0df630e14a2a586d07e185e2c9bf40e10ff17cc103a33a8cf32c37b676e15cf55a1c1efd17c82384c7323526aed4b0624fda0b58d39ed487d3 +SHA512 (uhd-4.10.0.0.tar.gz) = 600b6c8b1d5e37643e086d00e3c594b6b83a467b097576625dd4a949b3aab81cbbc221f2649a639fef67dfc0dce3bb919abee3cfb6ca266ad547262a16cdbd0e +SHA512 (uhd-images_4.10.0.0.tar.xz) = c5e54f47361a71baa3b5450fd4a3970a03349ecd69837a5de03a63f42b977f1e7e7246c0645d7178feac31f0c071e1914b3d8fcd60f8031aef4cfa45539d5054 diff --git a/uhd-4.2.0.0-imagepath-fix.patch b/uhd-4.2.0.0-imagepath-fix.patch deleted file mode 100644 index 7230a92..0000000 --- a/uhd-4.2.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 73b4cc2..a122c9d 100644 ---- a/host/lib/utils/paths.cpp -+++ b/host/lib/utils/paths.cpp -@@ -290,7 +290,7 @@ std::string uhd::get_pkg_path(void) - - 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 6adaea6..4adc306 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,10 +29,12 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.6.0.0 -%global images_ver %{version} -Release: 3%{?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 @@ -62,15 +64,12 @@ BuildRequires: tar 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 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 -Patch0: uhd-4.2.0.0-imagepath-fix.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -117,8 +116,7 @@ Wireshark dissector plugins. %endif %prep -%setup -q -%patch0 -p1 -b .imagepath-fix +%autosetup -p1 # firmware %if %{with binary_firmware} @@ -133,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 </dev/null || \ - %{_sbindir}/groupadd -r usrp >/dev/null 2>&1 -exit 0 %files %exclude %{_docdir}/%{name}/doxygen @@ -243,7 +243,6 @@ exit 0 %{_bindir}/usrpctl %{_bindir}/uhd_* %{_bindir}/usrp2_* -%{_bindir}/rfnoc_image_builder %{_bindir}/usrp_hwd.py %{_prefix}/lib/udev/rules.d/10-usrp-uhd.rules %config(noreplace) %{_sysconfdir}/security/limits.d/*.conf @@ -254,6 +253,7 @@ exit 0 %{_datadir}/uhd %{python3_sitearch}/uhd %{python3_sitearch}/usrp_mpm +%{_sysusersdir}/uhd.conf %files firmware %dir %{_datadir}/uhd/images @@ -271,7 +271,6 @@ exit 0 %files tools %doc tools/README.md %{_bindir}/usrp_x3xx_fpga_jtag_programmer.sh -%{_bindir}/chdr_log %if %{with wireshark} %files wireshark @@ -279,6 +278,69 @@ exit 0 %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 + +* 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 + +* Fri Jul 25 2025 Fedora Release Engineering - 4.8.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Tue Jun 03 2025 Python Maint - 4.8.0.0-2 +- Rebuilt for Python 3.14 + +* Wed Mar 12 2025 Jaroslav Škarvada - 4.8.0.0-1 +- New version + Resolves: rhbz#2337610 + Resolves: rhbz#2341478 + +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 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 - 4.7.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jul 25 2024 Miroslav Suchý - 4.7.0.0-3 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 4.7.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jul 15 2024 Jaroslav Škarvada - 4.7.0.0-1 +- New version + Resolves: rhbz#2293732 + +* Sat Jun 08 2024 Python Maint - 4.6.0.0-4 +- Rebuilt for Python 3.13 + * Sat Jan 27 2024 Fedora Release Engineering - 4.6.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild