From 613bc2470d5d7d8474b48f8cb60200ae9e7e7bb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 1 Feb 2022 01:06:00 +0100 Subject: [PATCH 01/43] Switched to the upstream patch to fix compilation on the s390x --- uhd-4.1.0.5-s390x-build-fix.patch | 54 +++++++++++++++++++++++++------ uhd.spec | 5 ++- 2 files changed, 49 insertions(+), 10 deletions(-) diff --git a/uhd-4.1.0.5-s390x-build-fix.patch b/uhd-4.1.0.5-s390x-build-fix.patch index d4b1e45..b843d80 100644 --- a/uhd-4.1.0.5-s390x-build-fix.patch +++ b/uhd-4.1.0.5-s390x-build-fix.patch @@ -1,10 +1,46 @@ -diff --git a/host/lib/utils/CMakeLists.txt b/host/lib/utils/CMakeLists.txt -index 639b3e9..abd4e0f 100644 ---- a/host/lib/utils/CMakeLists.txt -+++ b/host/lib/utils/CMakeLists.txt -@@ -243,3 +243,5 @@ if(ENABLE_C_API) - ${CMAKE_CURRENT_SOURCE_DIR}/thread_priority_c.cpp - ) - endif(ENABLE_C_API) +diff --git a/host/cmake/Modules/UHDAtomics.cmake b/host/cmake/Modules/UHDAtomics.cmake +index 4d53a2d..e206f39 100644 +--- a/host/cmake/Modules/UHDAtomics.cmake ++++ b/host/cmake/Modules/UHDAtomics.cmake +@@ -33,6 +33,16 @@ function(CHECK_WORKING_CXX_ATOMICS64 varname) + " ${varname}) + endfunction(CHECK_WORKING_CXX_ATOMICS64) + ++function(CHECK_WORKING_CXX_BOOST_ATOMICS varname) ++ CHECK_CXX_SOURCE_COMPILES(" ++ #include ++ boost::lockfree::queue queue(1); ++ int main() { ++ return queue.is_lock_free(); ++ } ++ " ${varname}) ++endfunction(CHECK_WORKING_CXX_BOOST_ATOMICS) + -+LIBUHD_APPEND_LIBS(atomic) + macro(CHECK_ATOMICS_LIB_REQUIRED required_var) + set(${required_var} FALSE) + if(MSVC) +@@ -76,5 +86,24 @@ macro(CHECK_ATOMICS_LIB_REQUIRED required_var) + "Host compiler appears to require libatomic for 64-bit operations, but cannot find it.") + endif() + endif() ++ # Check whether boost requires atomic. ++ CHECK_WORKING_CXX_BOOST_ATOMICS(HAVE_CXX_BOOST_ATOMICS_WITHOUT_LIB) ++ # If not, check if the library exists, and atomics work with it. ++ if(NOT HAVE_CXX_BOOST_ATOMICS_WITHOUT_LIB) ++ check_library_exists(atomic __atomic_fetch_add_4 "" HAVE_LIBATOMIC) ++ if(HAVE_LIBATOMIC) ++ set(${required_var} TRUE) ++ set(CMAKE_REQUIRED_LIBRARIES "atomic") ++ CHECK_WORKING_CXX_BOOST_ATOMICS(HAVE_CXX_BOOST_ATOMICS_WITH_LIB) ++ unset(CMAKE_REQUIRED_LIBRARIES) ++ if (NOT HAVE_CXX_BOOST_ATOMICS_WITH_LIB) ++ message(FATAL_ERROR "Host compiler must support std::atomic!") ++ endif() ++ else() ++ message( ++ FATAL_ERROR ++ "Host compiler appears to require libatomic, but cannot find it.") ++ endif() ++ endif() + endif() + endmacro(CHECK_ATOMICS_LIB_REQUIRED) diff --git a/uhd.spec b/uhd.spec index 97f307f..b68836c 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.1.0.5 #%%global images_ver %%{version} %global images_ver 4.1.0.4 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -283,6 +283,9 @@ exit 0 %endif %changelog +* Tue Feb 1 2022 Jaroslav Škarvada - 4.1.0.5-5 +- Switched to the upstream patch to fix compilation on the s390x + * Fri Jan 28 2022 Jaroslav Škarvada - 4.1.0.5-4 - Fixed images path From 875ad9bdff2967d07b899385c4cf448a91438c6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 21 Apr 2022 15:04:27 +0200 Subject: [PATCH 02/43] New version Resolves: rhbz#2073640 --- sources | 4 +- uhd-4.1.0.5-s390x-build-fix.patch | 46 ------------------- ...x.patch => uhd-4.2.0.0-imagepath-fix.patch | 6 +-- uhd.spec | 17 +++---- 4 files changed, 14 insertions(+), 59 deletions(-) delete mode 100644 uhd-4.1.0.5-s390x-build-fix.patch rename uhd-4.1.0.5-imagepath-fix.patch => uhd-4.2.0.0-imagepath-fix.patch (74%) diff --git a/sources b/sources index 881fa60..20ccc4b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-images_4.1.0.4.tar.xz) = 6dfd612d794281e01739e6d2623c89d1a516e6a770cc39ce7536d6b760a51a4e2e09453d80791c417d635d3f76326a397875e04dd08418ed724b4d0679f2961b -SHA512 (uhd-4.1.0.5.tar.gz) = 4929ebc8a12bcc0acfe4a64ceafe17387420e2f056e7bb7284a8d7b60d14aba05484b3c033ce63b00c6d9115f570b056df4e2b36e11a2b25079a8c34b1d084af +SHA512 (uhd-4.2.0.0.tar.gz) = a5f105a8765a06e53bed17dee760dfa985d40a97c61ca243127c8a912378d6f5ae81170a48e8e5f92a238bcfd66742798043b3fb0119e574dbac74291f15ec9c +SHA512 (uhd-images_4.1.0.5.tar.xz) = fa9ca49bc917e55a1505acce090dc6b06cac6c59fbe7a78c2c47f79783fab52baf9563903715da205762962485c8b4a83292a171a33e7c247b0eeb35819aff5c diff --git a/uhd-4.1.0.5-s390x-build-fix.patch b/uhd-4.1.0.5-s390x-build-fix.patch deleted file mode 100644 index b843d80..0000000 --- a/uhd-4.1.0.5-s390x-build-fix.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/host/cmake/Modules/UHDAtomics.cmake b/host/cmake/Modules/UHDAtomics.cmake -index 4d53a2d..e206f39 100644 ---- a/host/cmake/Modules/UHDAtomics.cmake -+++ b/host/cmake/Modules/UHDAtomics.cmake -@@ -33,6 +33,16 @@ function(CHECK_WORKING_CXX_ATOMICS64 varname) - " ${varname}) - endfunction(CHECK_WORKING_CXX_ATOMICS64) - -+function(CHECK_WORKING_CXX_BOOST_ATOMICS varname) -+ CHECK_CXX_SOURCE_COMPILES(" -+ #include -+ boost::lockfree::queue queue(1); -+ int main() { -+ return queue.is_lock_free(); -+ } -+ " ${varname}) -+endfunction(CHECK_WORKING_CXX_BOOST_ATOMICS) -+ - macro(CHECK_ATOMICS_LIB_REQUIRED required_var) - set(${required_var} FALSE) - if(MSVC) -@@ -76,5 +86,24 @@ macro(CHECK_ATOMICS_LIB_REQUIRED required_var) - "Host compiler appears to require libatomic for 64-bit operations, but cannot find it.") - endif() - endif() -+ # Check whether boost requires atomic. -+ CHECK_WORKING_CXX_BOOST_ATOMICS(HAVE_CXX_BOOST_ATOMICS_WITHOUT_LIB) -+ # If not, check if the library exists, and atomics work with it. -+ if(NOT HAVE_CXX_BOOST_ATOMICS_WITHOUT_LIB) -+ check_library_exists(atomic __atomic_fetch_add_4 "" HAVE_LIBATOMIC) -+ if(HAVE_LIBATOMIC) -+ set(${required_var} TRUE) -+ set(CMAKE_REQUIRED_LIBRARIES "atomic") -+ CHECK_WORKING_CXX_BOOST_ATOMICS(HAVE_CXX_BOOST_ATOMICS_WITH_LIB) -+ unset(CMAKE_REQUIRED_LIBRARIES) -+ if (NOT HAVE_CXX_BOOST_ATOMICS_WITH_LIB) -+ message(FATAL_ERROR "Host compiler must support std::atomic!") -+ endif() -+ else() -+ message( -+ FATAL_ERROR -+ "Host compiler appears to require libatomic, but cannot find it.") -+ endif() -+ endif() - endif() - endmacro(CHECK_ATOMICS_LIB_REQUIRED) diff --git a/uhd-4.1.0.5-imagepath-fix.patch b/uhd-4.2.0.0-imagepath-fix.patch similarity index 74% rename from uhd-4.1.0.5-imagepath-fix.patch rename to uhd-4.2.0.0-imagepath-fix.patch index 847ff04..7230a92 100644 --- a/uhd-4.1.0.5-imagepath-fix.patch +++ b/uhd-4.2.0.0-imagepath-fix.patch @@ -1,13 +1,13 @@ diff --git a/host/lib/utils/paths.cpp b/host/lib/utils/paths.cpp -index 802dd5e..e3bd722 100644 +index 73b4cc2..a122c9d 100644 --- a/host/lib/utils/paths.cpp +++ b/host/lib/utils/paths.cpp -@@ -289,7 +289,7 @@ std::string uhd::get_pkg_path(void) +@@ -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 + // 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 b68836c..0a0938a 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,10 +29,10 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.1.0.5 +Version: 4.2.0.0 #%%global images_ver %%{version} -%global images_ver 4.1.0.4 -Release: 5%{?dist} +%global images_ver 4.1.0.5 +Release: 1%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -68,11 +68,9 @@ 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 -# https://github.com/EttusResearch/uhd/issues/410 -Patch1: uhd-4.1.0.5-s390x-build-fix.patch # dirty workaround for the https://github.com/EttusResearch/uhd/issues/551 # until the better fix is available -Patch2: uhd-4.1.0.5-imagepath-fix.patch +Patch0: uhd-4.2.0.0-imagepath-fix.patch %description The UHD is the universal hardware driver for Ettus Research products. @@ -120,8 +118,7 @@ Wireshark dissector plugins. %prep %setup -q -%patch1 -p1 -b .s390x-build-fix -%patch2 -p1 -b .imagepath-fix +%patch0 -p1 -b .imagepath-fix # firmware %if %{with binary_firmware} @@ -283,6 +280,10 @@ exit 0 %endif %changelog +* Thu Apr 21 2022 Jaroslav Škarvada - 4.2.0.0-1 +- New version + Resolves: rhbz#2073640 + * Tue Feb 1 2022 Jaroslav Škarvada - 4.1.0.5-5 - Switched to the upstream patch to fix compilation on the s390x From 1bc8bc1e0f221e87829e27385ce4cae0d3e76c97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 21 Apr 2022 21:32:44 +0200 Subject: [PATCH 03/43] Fixed FTBFS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uhd.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/uhd.spec b/uhd.spec index 0a0938a..c1e8faa 100644 --- a/uhd.spec +++ b/uhd.spec @@ -239,6 +239,7 @@ exit 0 %exclude %{_datadir}/uhd/images %doc _tmpdoc/* %dir %{_libdir}/uhd +%{_bindir}/usrpctl %{_bindir}/uhd_* %{_bindir}/usrp2_* %{_bindir}/rfnoc_image_builder @@ -270,9 +271,6 @@ exit 0 %doc tools/README.md %{_bindir}/usrp_x3xx_fpga_jtag_programmer.sh %{_bindir}/chdr_log -%{_bindir}/aurora_bist_test.py -%{_bindir}/usrp_update_fs -%{_bindir}/e320_bist %if %{with wireshark} %files wireshark From 4047fb8169b8e2521f55dfbd5135fdb7ea09a337 Mon Sep 17 00:00:00 2001 From: Thomas Rodgers Date: Wed, 4 May 2022 11:42:27 +0200 Subject: [PATCH 04/43] Rebuilt for Boost 1.78 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index c1e8faa..6f0115d 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.2.0.0 #%%global images_ver %%{version} %global images_ver 4.1.0.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -278,6 +278,9 @@ exit 0 %endif %changelog +* Wed May 04 2022 Thomas Rodgers - 4.2.0.0-2 +- Rebuilt for Boost 1.78 + * Thu Apr 21 2022 Jaroslav Škarvada - 4.2.0.0-1 - New version Resolves: rhbz#2073640 From e5fb6d407069a870b581c2b89cd35685fcf74edd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 20 Jun 2022 12:27:34 +0200 Subject: [PATCH 05/43] Rebuilt for new python Resolves: rhbz#2099182 --- uhd.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 6f0115d..2961a01 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.2.0.0 #%%global images_ver %%{version} %global images_ver 4.1.0.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -278,6 +278,10 @@ exit 0 %endif %changelog +* Mon Jun 20 2022 Jaroslav Škarvada - 4.2.0.0-3 +- Rebuilt for new python + Resolves: rhbz#2099182 + * Wed May 04 2022 Thomas Rodgers - 4.2.0.0-2 - Rebuilt for Boost 1.78 From f11fa01adb3bd845c6666acf1b95d829b47ae624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 21 Jun 2022 14:24:16 +0200 Subject: [PATCH 06/43] 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 --- uhd.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/uhd.spec b/uhd.spec index 2961a01..37f9458 100644 --- a/uhd.spec +++ b/uhd.spec @@ -53,6 +53,7 @@ BuildRequires: wireshark-devel BuildRequires: libgcrypt-devel BuildRequires: gnutls-devel %endif +BuildRequires: pybind11-devel BuildRequires: python3-mako BuildRequires: python3-requests BuildRequires: python3-devel @@ -146,6 +147,7 @@ popd pushd host %cmake %{?have_neon} -DPYTHON_EXECUTABLE="%{__python3}" \ + -DPYBIND11_INCLUDE_DIR="/usr/include/pybind11/" \ -DUHD_VERSION="%{version}" \ -DENABLE_TESTS=off ../ %cmake_build From 8c8cb59a3387a732e7eff1faec8f5e79512a19b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:19:11 +0000 Subject: [PATCH 07/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 37f9458..34bf925 100644 --- a/uhd.spec +++ b/uhd.spec @@ -32,7 +32,7 @@ URL: http://github.com/EttusResearch/uhd Version: 4.2.0.0 #%%global images_ver %%{version} %global images_ver 4.1.0.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -280,6 +280,9 @@ exit 0 %endif %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 4.2.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 20 2022 Jaroslav Škarvada - 4.2.0.0-3 - Rebuilt for new python Resolves: rhbz#2099182 From b9d08a4ba6f5dc7b9e4e390c55529f6fcbe67ea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 29 Jul 2022 23:30:17 +0200 Subject: [PATCH 08/43] New version Resolves: rhbz#2110023 --- sources | 4 ++-- uhd.spec | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sources b/sources index 20ccc4b..7e2ebbe 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.2.0.0.tar.gz) = a5f105a8765a06e53bed17dee760dfa985d40a97c61ca243127c8a912378d6f5ae81170a48e8e5f92a238bcfd66742798043b3fb0119e574dbac74291f15ec9c -SHA512 (uhd-images_4.1.0.5.tar.xz) = fa9ca49bc917e55a1505acce090dc6b06cac6c59fbe7a78c2c47f79783fab52baf9563903715da205762962485c8b4a83292a171a33e7c247b0eeb35819aff5c +SHA512 (uhd-4.2.0.1.tar.gz) = 9b5e1c706f937e433c3eebe32492bf7bc8d38e8f4bca231e0cd2b1b9996910203c6cc3ffea8c54467062e24f912ece3a476943c7d73500d7dc1a958cc67c4807 +SHA512 (uhd-images_4.2.0.1.tar.xz) = cb2c5465c1b4ad9e1192392b48740e0d2be07a9a7ce65adbe7d7850062b48a96a06fef9bb1350f6586054c5cf3354abb9dce66259e95391ec4494f3e1046b905 diff --git a/uhd.spec b/uhd.spec index 34bf925..2f71bee 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,10 +29,10 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.2.0.0 +Version: 4.2.0.1 #%%global images_ver %%{version} -%global images_ver 4.1.0.5 -Release: 4%{?dist} +%global images_ver 4.2.0.1 +Release: 1%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -280,6 +280,10 @@ exit 0 %endif %changelog +* Fri Jul 29 2022 Jaroslav Škarvada - 4.2.0.1-1 +- New version + Resolves: rhbz#2110023 + * Sat Jul 23 2022 Fedora Release Engineering - 4.2.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 435955a71853042b000600736c4b3c8cd6441325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sat, 24 Sep 2022 18:17:23 +0200 Subject: [PATCH 09/43] New version Resolves: rhbz#2124734 --- sources | 4 ++-- uhd.spec | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/sources b/sources index 7e2ebbe..cce63fb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.2.0.1.tar.gz) = 9b5e1c706f937e433c3eebe32492bf7bc8d38e8f4bca231e0cd2b1b9996910203c6cc3ffea8c54467062e24f912ece3a476943c7d73500d7dc1a958cc67c4807 -SHA512 (uhd-images_4.2.0.1.tar.xz) = cb2c5465c1b4ad9e1192392b48740e0d2be07a9a7ce65adbe7d7850062b48a96a06fef9bb1350f6586054c5cf3354abb9dce66259e95391ec4494f3e1046b905 +SHA512 (uhd-4.3.0.0.tar.gz) = 8907e134747b853dd3fa457ac097287783b362a56ac9fdf6fb44157baa1ddabfe3934e110bfac81180b42ea7ec2defefc444736955091a072b1166b5d27253fc +SHA512 (uhd-images_4.3.0.0.tar.xz) = 3b34d7b2d3d957284cd8a94043158ba5d7b9999d3da4ed6f97f6d38b427c3af54129e7b5a9840d7ec8ff1e8c5c61ef31f62994d81d7ea8a36cbd098274a999d7 diff --git a/uhd.spec b/uhd.spec index 2f71bee..457cf26 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,9 +29,8 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.2.0.1 -#%%global images_ver %%{version} -%global images_ver 4.2.0.1 +Version: 4.3.0.0 +%global images_ver %{version} Release: 1%{?dist} License: GPLv3+ BuildRequires: make @@ -280,6 +279,10 @@ exit 0 %endif %changelog +* Sat Sep 24 2022 Jaroslav Škarvada - 4.3.0.0-1 +- New version + Resolves: rhbz#2124734 + * Fri Jul 29 2022 Jaroslav Škarvada - 4.2.0.1-1 - New version Resolves: rhbz#2110023 From def8e2df85df84f2dc10cdc639b6b4685c4575c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 05:44:28 +0000 Subject: [PATCH 10/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 457cf26..eed4bc9 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.3.0.0 %global images_ver %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 4.3.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Sep 24 2022 Jaroslav Škarvada - 4.3.0.0-1 - New version Resolves: rhbz#2124734 From 1320ace55817e287804892f2a06f6b586de33df1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Wed, 1 Feb 2023 17:39:19 +0100 Subject: [PATCH 11/43] New version Resolves: rhbz#2164284 --- sources | 4 ++-- uhd.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index cce63fb..d994e2a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.3.0.0.tar.gz) = 8907e134747b853dd3fa457ac097287783b362a56ac9fdf6fb44157baa1ddabfe3934e110bfac81180b42ea7ec2defefc444736955091a072b1166b5d27253fc -SHA512 (uhd-images_4.3.0.0.tar.xz) = 3b34d7b2d3d957284cd8a94043158ba5d7b9999d3da4ed6f97f6d38b427c3af54129e7b5a9840d7ec8ff1e8c5c61ef31f62994d81d7ea8a36cbd098274a999d7 +SHA512 (uhd-images_4.4.0.0.tar.xz) = 17b364128155bf850ff5ae72eeb8fa52446881d0234254943d27524610f0efc4d5bf5da7be248982fc603101d4f76f5a8019fbecb044d2637a1022cdccde0463 +SHA512 (uhd-4.4.0.0.tar.gz) = 3c9b57dc776e0fadc991ffeede84c2367f7403bfae6fd30a045baf1c9cfb21889310b9a8340a35ea13eea00208bf678cccd7b82e190dfb6b9d61e42bdef3b21a diff --git a/uhd.spec b/uhd.spec index eed4bc9..0a7e15c 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,9 +29,9 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.3.0.0 +Version: 4.4.0.0 %global images_ver %{version} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,10 @@ exit 0 %endif %changelog +* Wed Feb 1 2023 Jaroslav Škarvada - 4.4.0.0-1 +- New version + Resolves: rhbz#2164284 + * Sat Jan 21 2023 Fedora Release Engineering - 4.3.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From e6450ed1a05dd36d9a9033e07ab459aa64cd5831 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 20 Feb 2023 21:57:26 +0000 Subject: [PATCH 12/43] Rebuilt for Boost 1.81 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 0a7e15c..de3310f 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.4.0.0 %global images_ver %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Mon Feb 20 2023 Jonathan Wakely - 4.4.0.0-2 +- Rebuilt for Boost 1.81 + * Wed Feb 1 2023 Jaroslav Škarvada - 4.4.0.0-1 - New version Resolves: rhbz#2164284 From bdf88f038a8fa8cf91d54da1487d079e42ee5312 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Fri, 19 May 2023 08:00:00 +0000 Subject: [PATCH 13/43] 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 --- uhd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index de3310f..b24324d 100644 --- a/uhd.spec +++ b/uhd.spec @@ -177,7 +177,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 From 7ba9c549ea35c311c6ce9037143f1774ac0b471d Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 14 Jun 2023 20:24:03 +0200 Subject: [PATCH 14/43] Rebuilt for Python 3.12 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index b24324d..f736999 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.4.0.0 %global images_ver %{version} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Wed Jun 14 2023 Python Maint - 4.4.0.0-3 +- Rebuilt for Python 3.12 + * Mon Feb 20 2023 Jonathan Wakely - 4.4.0.0-2 - Rebuilt for Boost 1.81 From f928391d8d225bfca65bdd8836a95637947dfba6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:02:35 +0000 Subject: [PATCH 15/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index f736999..021cfaa 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.4.0.0 %global images_ver %{version} -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 4.4.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jun 14 2023 Python Maint - 4.4.0.0-3 - Rebuilt for Python 3.12 From b3de8665ea6b7d7d5fe6140309ebd98d4920f428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 25 Sep 2023 13:58:33 +0200 Subject: [PATCH 16/43] New version Resolves: rhbz#2237074 --- sources | 4 ++-- uhd.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index d994e2a..d146703 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-images_4.4.0.0.tar.xz) = 17b364128155bf850ff5ae72eeb8fa52446881d0234254943d27524610f0efc4d5bf5da7be248982fc603101d4f76f5a8019fbecb044d2637a1022cdccde0463 -SHA512 (uhd-4.4.0.0.tar.gz) = 3c9b57dc776e0fadc991ffeede84c2367f7403bfae6fd30a045baf1c9cfb21889310b9a8340a35ea13eea00208bf678cccd7b82e190dfb6b9d61e42bdef3b21a +SHA512 (uhd-4.5.0.0.tar.gz) = 20ef6e2ee973476312a1b63e1121f98b9b2f7f471090a26e2492eb4e6ca476421e318294359144306e6663bdc2f4a86040e796707d8757cc83c62ec2a7207d77 +SHA512 (uhd-images_4.5.0.0.tar.xz) = b0b5fe02f59df574be97cb4a867da70a823bf0a3b80f9bcd88bf52248da4dccd48694e50a2d01e588de76c4857bb4cee725a7008776e2685a4d86429f50e7a41 diff --git a/uhd.spec b/uhd.spec index 021cfaa..5f891a8 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,9 +29,9 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.4.0.0 +Version: 4.5.0.0 %global images_ver %{version} -Release: 4%{?dist} +Release: 1%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,10 @@ exit 0 %endif %changelog +* Mon Sep 25 2023 Jaroslav Škarvada - 4.5.0.0-1 +- New version + Resolves: rhbz#2237074 + * Sat Jul 22 2023 Fedora Release Engineering - 4.4.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From a51621a3f95b68adfd3ffd2bc9184cea91878b7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 21 Nov 2023 14:30:29 +0100 Subject: [PATCH 17/43] New version Resolves: rhbz#2247579 --- sources | 4 ++-- uhd.spec | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index d146703..b1b2a09 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.5.0.0.tar.gz) = 20ef6e2ee973476312a1b63e1121f98b9b2f7f471090a26e2492eb4e6ca476421e318294359144306e6663bdc2f4a86040e796707d8757cc83c62ec2a7207d77 -SHA512 (uhd-images_4.5.0.0.tar.xz) = b0b5fe02f59df574be97cb4a867da70a823bf0a3b80f9bcd88bf52248da4dccd48694e50a2d01e588de76c4857bb4cee725a7008776e2685a4d86429f50e7a41 +SHA512 (uhd-4.6.0.0.tar.gz) = de9bb10e5109bd860a9b2f61841e3ade55fbbc7d8000f385fcdf1c831585c9d25999d159a7da95e3e3f0b74330c1512265994e9aacf00b1b0891f9ba6db58e30 +SHA512 (uhd-images_4.6.0.0.tar.xz) = 944a26bea2f11d0df630e14a2a586d07e185e2c9bf40e10ff17cc103a33a8cf32c37b676e15cf55a1c1efd17c82384c7323526aed4b0624fda0b58d39ed487d3 diff --git a/uhd.spec b/uhd.spec index 5f891a8..d6295b8 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,7 +29,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.5.0.0 +Version: 4.6.0.0 %global images_ver %{version} Release: 1%{?dist} License: GPLv3+ @@ -279,6 +279,10 @@ exit 0 %endif %changelog +* Tue Nov 21 2023 Jaroslav Škarvada - 4.6.0.0-1 +- New version + Resolves: rhbz#2247579 + * Mon Sep 25 2023 Jaroslav Škarvada - 4.5.0.0-1 - New version Resolves: rhbz#2237074 From 85558aa0e55af45a93bd31b8ec8483479b0bbd91 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 18 Jan 2024 00:50:07 +0000 Subject: [PATCH 18/43] Rebuilt for Boost 1.83 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index d6295b8..61eaffb 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.6.0.0 %global images_ver %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Thu Jan 18 2024 Jonathan Wakely - 4.6.0.0-2 +- Rebuilt for Boost 1.83 + * Tue Nov 21 2023 Jaroslav Škarvada - 4.6.0.0-1 - New version Resolves: rhbz#2247579 From 87fb805ffa2e1412552208abeb5fe5c35043bde0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:02:27 +0000 Subject: [PATCH 19/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 61eaffb..6adaea6 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.6.0.0 %global images_ver %{version} -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 4.6.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jan 18 2024 Jonathan Wakely - 4.6.0.0-2 - Rebuilt for Boost 1.83 From f07315bd68e67f57e7935004464a0c1bbd19d7bb Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 20/43] Eliminate use of obsolete %patchN syntax (#2283636) --- uhd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 6adaea6..2d91d5a 100644 --- a/uhd.spec +++ b/uhd.spec @@ -118,7 +118,7 @@ Wireshark dissector plugins. %prep %setup -q -%patch0 -p1 -b .imagepath-fix +%patch -P0 -p1 -b .imagepath-fix # firmware %if %{with binary_firmware} From 1b6120a7b3c061a433ab1848ce11fc8bdfe5659f Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 8 Jun 2024 22:34:34 +0200 Subject: [PATCH 21/43] Rebuilt for Python 3.13 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 2d91d5a..f09dd3d 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.6.0.0 %global images_ver %{version} -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* 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 From 32d9ecc6597ae446accd76318ed80639b9333446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 15 Jul 2024 16:36:07 +0200 Subject: [PATCH 22/43] New version Resolves: rhbz#2293732 --- sources | 4 ++-- uhd.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index b1b2a09..aec33dc 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.7.0.0.tar.gz) = 6f2c48890058620499dc4f9661da1fe26fb711225d8f1f4a84cb9a57b049cccdf87d40480618f37bc2aff23b2538b5323f526985ec25a6a1f58122d39387b0cb +SHA512 (uhd-images_4.7.0.0.tar.xz) = a7dd7b5db34b5b204c2248040fc30c542d002b572a7fc47a19b1c9fed4ef213161883eed14e20f1dccd18b8dc3a23f2afafff8350bcb60db520882a5bd775cb4 diff --git a/uhd.spec b/uhd.spec index f09dd3d..578aef9 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,9 +29,9 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.6.0.0 +Version: 4.7.0.0 %global images_ver %{version} -Release: 4%{?dist} +Release: 1%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,10 @@ exit 0 %endif %changelog +* 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 From 249f71537f51d31bc6d215925f6a0d3988bc29d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:11:17 +0000 Subject: [PATCH 23/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 578aef9..7b40a2b 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.7.0.0 %global images_ver %{version} -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ BuildRequires: make BuildRequires: gcc-c++ @@ -279,6 +279,9 @@ exit 0 %endif %changelog +* 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 From 212b456b65a4e9d362f7d18dbe2cdf362b737205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 13:29:06 +0200 Subject: [PATCH 24/43] convert GPLv3+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- uhd.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/uhd.spec b/uhd.spec index 7b40a2b..ec1bf6d 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,8 +31,9 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.7.0.0 %global images_ver %{version} -Release: 2%{?dist} -License: GPLv3+ +Release: 3%{?dist} +# Automatically converted from old format: GPLv3+ - review is highly recommended. +License: GPL-3.0-or-later BuildRequires: make BuildRequires: gcc-c++ BuildRequires: cmake @@ -279,6 +280,9 @@ exit 0 %endif %changelog +* 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 From b09e6d0822d1b44413ab0a5b7613ec77cebb277c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:40:27 +0000 Subject: [PATCH 25/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index ec1bf6d..f3e49ce 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.7.0.0 %global images_ver %{version} -Release: 3%{?dist} +Release: 4%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -280,6 +280,9 @@ exit 0 %endif %changelog +* 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 From 1538edcbf9b516dca08c6d738bd37d3be12bede5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 17:03:11 +0100 Subject: [PATCH 26/43] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- uhd.spec | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/uhd.spec b/uhd.spec index f3e49ce..597d03a 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.7.0.0 %global images_ver %{version} -Release: 4%{?dist} +Release: 5%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -63,7 +63,7 @@ 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 @@ -134,6 +134,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 @@ -255,6 +258,7 @@ exit 0 %{_datadir}/uhd %{python3_sitearch}/uhd %{python3_sitearch}/usrp_mpm +%{_sysusersdir}/uhd.conf %files firmware %dir %{_datadir}/uhd/images @@ -280,6 +284,9 @@ exit 0 %endif %changelog +* 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 From ae45f0b982fba47df421421cfa17071ccb6d5ea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 17 Mar 2025 10:24:18 +0100 Subject: [PATCH 27/43] New version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolves: rhbz#2337610 Resolves: rhbz#2341478 Signed-off-by: Jaroslav Škarvada --- sources | 4 +-- uhd-4.8.0.0-gcc-15-fix.patch | 36 +++++++++++++++++++ ...x.patch => uhd-4.8.0.0-imagepath-fix.patch | 4 +-- uhd.spec | 28 ++++++++++----- 4 files changed, 59 insertions(+), 13 deletions(-) create mode 100644 uhd-4.8.0.0-gcc-15-fix.patch rename uhd-4.2.0.0-imagepath-fix.patch => uhd-4.8.0.0-imagepath-fix.patch (85%) diff --git a/sources b/sources index aec33dc..6a64760 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (uhd-4.7.0.0.tar.gz) = 6f2c48890058620499dc4f9661da1fe26fb711225d8f1f4a84cb9a57b049cccdf87d40480618f37bc2aff23b2538b5323f526985ec25a6a1f58122d39387b0cb -SHA512 (uhd-images_4.7.0.0.tar.xz) = a7dd7b5db34b5b204c2248040fc30c542d002b572a7fc47a19b1c9fed4ef213161883eed14e20f1dccd18b8dc3a23f2afafff8350bcb60db520882a5bd775cb4 +SHA512 (uhd-4.8.0.0.tar.gz) = 61e92209e69994b1c5d3a2a88f749ddca612a3fa3c1580c00a9577e25fab5055d7c80571f2843cca3951fc941d1a81566bafc21070fb93cb3e566228c46331e7 +SHA512 (uhd-images_4.8.0.0.tar.xz) = 4203e5b7f642d7850e9563ba495a60efe965a64223d9208c780e1400ea755b322125fff53c3f8a3fb010617b57a4da638dc3cf80bf7d95604e20788cc469edb9 diff --git a/uhd-4.8.0.0-gcc-15-fix.patch b/uhd-4.8.0.0-gcc-15-fix.patch new file mode 100644 index 0000000..ad860ad --- /dev/null +++ b/uhd-4.8.0.0-gcc-15-fix.patch @@ -0,0 +1,36 @@ +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.2.0.0-imagepath-fix.patch b/uhd-4.8.0.0-imagepath-fix.patch similarity index 85% rename from uhd-4.2.0.0-imagepath-fix.patch rename to uhd-4.8.0.0-imagepath-fix.patch index 7230a92..6e825f8 100644 --- a/uhd-4.2.0.0-imagepath-fix.patch +++ b/uhd-4.8.0.0-imagepath-fix.patch @@ -1,8 +1,8 @@ diff --git a/host/lib/utils/paths.cpp b/host/lib/utils/paths.cpp -index 73b4cc2..a122c9d 100644 +index 2eac87e..2a3a3f1 100644 --- a/host/lib/utils/paths.cpp +++ b/host/lib/utils/paths.cpp -@@ -290,7 +290,7 @@ std::string uhd::get_pkg_path(void) +@@ -283,7 +283,7 @@ std::string uhd::get_pkg_data_path() std::string uhd::get_lib_path(void) { diff --git a/uhd.spec b/uhd.spec index 597d03a..3ac6719 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,9 +29,9 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.7.0.0 +Version: 4.8.0.0 %global images_ver %{version} -Release: 5%{?dist} +Release: 1%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -71,7 +71,9 @@ 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 +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. @@ -118,8 +120,7 @@ Wireshark dissector plugins. %endif %prep -%setup -q -%patch -P0 -p1 -b .imagepath-fix +%autosetup -p1 # firmware %if %{with binary_firmware} @@ -151,22 +152,27 @@ 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}" +make %{?_smp_mflags} CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" popd %if %{with wireshark} # wireshark dissectors pushd tools/dissectors -%cmake -DENABLE_RFNOC=ON -DENABLE_OCTOCLOCK=ON -DENABLE_ZPU=ON +%cmake -DENABLE_OCTOCLOCK=ON -DENABLE_ZPU=ON %cmake_build popd %endif @@ -247,7 +253,6 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %{_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 @@ -284,6 +289,11 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* 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 From c79fdf3ba9559946ad2642e02f8517e2b97ba12a Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 14:31:02 +0200 Subject: [PATCH 28/43] Rebuilt for Python 3.14 --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 3ac6719..6ed9a76 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.8.0.0 %global images_ver %{version} -Release: 1%{?dist} +Release: 2%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -289,6 +289,9 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* 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 From e93033b410eb607a281d627893abf6e18f1829a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:44:33 +0000 Subject: [PATCH 29/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 6ed9a76..7a37f06 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.8.0.0 %global images_ver %{version} -Release: 2%{?dist} +Release: 3%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -289,6 +289,9 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* 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 From e22a339e17746075a3b01c8a365560c1dc106fa7 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:21:21 +0200 Subject: [PATCH 30/43] Rebuilt for Python 3.14.0rc2 bytecode --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 7a37f06..aff47ae 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.8.0.0 %global images_ver %{version} -Release: 3%{?dist} +Release: 4%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -289,6 +289,9 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* 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 From fd8faa4c648296f13ac68da25326a0648bfaf349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 11 Sep 2025 17:50:59 +0200 Subject: [PATCH 31/43] New version Resolves: rhbz#2387862 --- sources | 4 ++-- uhd.spec | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 6a64760..2d55172 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.9.0.0.tar.gz) = df8dc56035c5fb18b958fdb6ffd28ed1bbf4a4dd051800865fe4e9a2df953e13e1930ed285507dc6d2736443a285283741b1d0dc3dae862b0bb3e477d8532641 +SHA512 (uhd-images_4.9.0.0.tar.xz) = df173afdc9a3b69989a392ec2d51a1494dfe14ba2b85a775011d09564a3928c3ccd8f68aa0b02b244ef4a5bb7c21998318bd488770b1c9f7fe354bd97ff3a0e3 diff --git a/uhd.spec b/uhd.spec index aff47ae..0555fad 100644 --- a/uhd.spec +++ b/uhd.spec @@ -29,9 +29,9 @@ Name: uhd URL: http://github.com/EttusResearch/uhd -Version: 4.8.0.0 +Version: 4.9.0.0 %global images_ver %{version} -Release: 4%{?dist} +Release: 1%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -289,6 +289,10 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* 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 From 9f6339d121caa0e9a035571ac38f0a3309e3520b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 11 Sep 2025 18:02:10 +0200 Subject: [PATCH 32/43] Dropped unneeded patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uhd-4.8.0.0-gcc-15-fix.patch | 36 ------------------------------------ uhd.spec | 2 -- 2 files changed, 38 deletions(-) delete mode 100644 uhd-4.8.0.0-gcc-15-fix.patch 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.spec b/uhd.spec index 0555fad..c9457f1 100644 --- a/uhd.spec +++ b/uhd.spec @@ -72,8 +72,6 @@ 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 -# 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. From e1213c9be03630663817bbf395a696a8096aacee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 11 Sep 2025 18:17:57 +0200 Subject: [PATCH 33/43] Followed upstream and dropped uhd_dump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uhd.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/uhd.spec b/uhd.spec index c9457f1..a4e4062 100644 --- a/uhd.spec +++ b/uhd.spec @@ -162,11 +162,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 @@ -223,7 +218,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 From df04e96c52285e1302c9641362c8c218402eacde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 12 Sep 2025 00:35:43 +0200 Subject: [PATCH 34/43] Dropped chdr_log as upstream MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- uhd.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index a4e4062..028638f 100644 --- a/uhd.spec +++ b/uhd.spec @@ -273,7 +273,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 From 0808e1d684b95c307c562e660598bb32699ad951 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 15:01:00 +0200 Subject: [PATCH 35/43] Rebuilt for Python 3.14.0rc3 bytecode --- uhd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uhd.spec b/uhd.spec index 028638f..d886d98 100644 --- a/uhd.spec +++ b/uhd.spec @@ -31,7 +31,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 4.9.0.0 %global images_ver %{version} -Release: 1%{?dist} +Release: 2%{?dist} # Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later BuildRequires: make @@ -280,6 +280,9 @@ install -m0644 -D uhd.sysusers.conf %{buildroot}%{_sysusersdir}/uhd.conf %endif %changelog +* 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 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 36/43] 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 37/43] 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 38/43] 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 39/43] 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 40/43] 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 41/43] 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 42/43] 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 43/43] 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