Rebuilt for Python 3.15.0b4 ABI change

Resolves: rhbz#2451594

.gitignore

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

sources

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

uhd.spec

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