From c75af2cfbe4146a038c3441df824987f6d3550ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sat, 16 Nov 2024 20:15:39 +0100 Subject: [PATCH 01/20] New version Resolves: rhbz#2325899 --- sources | 2 +- urh.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 7af696f..317174f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (urh-2.9.6.tar.gz) = c5a153bf6df2421b496c58957b5ea0d591efd8caa12e08638560c125014d935abf279328a8b91fd09ab21444a58eea6ab7e59c3524b5c586c294b11123bff250 +SHA512 (urh-2.9.8.tar.gz) = a5327bee699bba8e6ffef2e7ec54f5f4b354feda18340c9b567b10b8c9283c5c907a546fd8a5660a2c325d42b8928cb9592630d0c2a5ed7dfdcf5dc434be4cb2 diff --git a/urh.spec b/urh.spec index d0cafd0..59231d7 100644 --- a/urh.spec +++ b/urh.spec @@ -2,8 +2,8 @@ # python 2 not supported Name: urh -Version: 2.9.6 -Release: 9%{?dist} +Version: 2.9.8 +Release: 1%{?dist} Summary: Universal Radio Hacker: investigate wireless protocols like a boss # Automatically converted from old format: ASL 2.0 and GPLv2 - review is highly recommended. License: Apache-2.0 AND GPL-2.0-only @@ -92,6 +92,10 @@ install -Dpm 0644 %{SOURCE1} \ %{python3_sitearch}/urh-%{version}-*.egg-info %changelog +* Sat Nov 16 2024 Jaroslav Škarvada - 2.9.8-1 +- New version + Resolves: rhbz#2325899 + * Wed Aug 07 2024 Miroslav Suchý - 2.9.6-9 - convert license to SPDX From a51f52d1cd4f2863dbcabcabdac7c2e080c31f73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sat, 16 Nov 2024 20:45:36 +0100 Subject: [PATCH 02/20] Dropped upstreamed patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- urh-2.9.6-python-3.13.patch | 22 ---------------------- urh.spec | 2 -- 2 files changed, 24 deletions(-) delete mode 100644 urh-2.9.6-python-3.13.patch diff --git a/urh-2.9.6-python-3.13.patch b/urh-2.9.6-python-3.13.patch deleted file mode 100644 index 84d691e..0000000 --- a/urh-2.9.6-python-3.13.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/urh/dev/native/lib/airspy.pyx b/src/urh/dev/native/lib/airspy.pyx -index ee2cf43..bfba573 100644 ---- a/src/urh/dev/native/lib/airspy.pyx -+++ b/src/urh/dev/native/lib/airspy.pyx -@@ -7,9 +7,6 @@ from cython.view cimport array as cvarray # needed for converting of malloc arr - from urh.util.Logger import logger - - --cdef extern from "Python.h": -- void PyEval_InitThreads() -- - ctypedef unsigned char uint8_t - ctypedef unsigned int uint32_t - ctypedef unsigned long long uint64_t -@@ -81,7 +78,6 @@ cpdef int set_if_rx_gain(uint8_t vga_gain): - cpdef int start_rx(callback): - global f - f = callback -- PyEval_InitThreads() - cairspy.airspy_set_sample_type(_c_device, cairspy.airspy_sample_type.AIRSPY_SAMPLE_FLOAT32_IQ) - return cairspy.airspy_start_rx(_c_device, _c_callback_recv, NULL) - diff --git a/urh.spec b/urh.spec index 59231d7..ec1f9c9 100644 --- a/urh.spec +++ b/urh.spec @@ -24,8 +24,6 @@ BuildRequires: python3-qt5 BuildRequires: python3-cython Requires: python3-numpy Requires: python3-qt5 -# https://github.com/jopohl/urh/pull/1111 -Patch0: urh-2.9.6-python-3.13.patch %description The Universal Radio Hacker is a software for investigating unknown wireless From ac4c18513e6acb61471eab38473e6b0ff5475fde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 6 Jan 2025 11:46:29 +0100 Subject: [PATCH 03/20] Relaxed numpy dependency, this will probably kill the GUI Resolves: rhbz#2332202 --- urh-2.9.8-relax-numpy-dep.patch | 22 ++++++++++++++++++++++ urh.spec | 9 ++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 urh-2.9.8-relax-numpy-dep.patch diff --git a/urh-2.9.8-relax-numpy-dep.patch b/urh-2.9.8-relax-numpy-dep.patch new file mode 100644 index 0000000..7071d81 --- /dev/null +++ b/urh-2.9.8-relax-numpy-dep.patch @@ -0,0 +1,22 @@ +diff --git a/setup.py b/setup.py +index e6f122d..ea30195 100644 +--- a/setup.py ++++ b/setup.py +@@ -142,7 +142,7 @@ def read_long_description(): + return "" + + +-install_requires = ["numpy<2.0.0", "psutil", "cython", "setuptools"] ++install_requires = ["numpy", "psutil", "cython", "setuptools"] + if IS_RELEASE: + install_requires.append("pyqt5") + else: +@@ -168,7 +168,7 @@ setup( + license="GNU General Public License (GPL)", + download_url="https://github.com/jopohl/urh/tarball/v" + str(version.VERSION), + install_requires=install_requires, +- setup_requires=["numpy<2.0.0"], ++ setup_requires=["numpy"], + packages=get_packages(), + ext_modules=get_extensions(), + cmdclass={"build_ext": build_ext}, diff --git a/urh.spec b/urh.spec index ec1f9c9..9efae72 100644 --- a/urh.spec +++ b/urh.spec @@ -3,7 +3,7 @@ Name: urh Version: 2.9.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Universal Radio Hacker: investigate wireless protocols like a boss # Automatically converted from old format: ASL 2.0 and GPLv2 - review is highly recommended. License: Apache-2.0 AND GPL-2.0-only @@ -24,6 +24,9 @@ BuildRequires: python3-qt5 BuildRequires: python3-cython Requires: python3-numpy Requires: python3-qt5 +# Temporal dirty workaround, the GUI will probably crash, it has to be ported +# to numpy-2, upstream report: https://github.com/jopohl/urh/issues/1149 +Patch0: urh-2.9.8-relax-numpy-dep.patch %description The Universal Radio Hacker is a software for investigating unknown wireless @@ -90,6 +93,10 @@ install -Dpm 0644 %{SOURCE1} \ %{python3_sitearch}/urh-%{version}-*.egg-info %changelog +* Mon Jan 6 2025 Jaroslav Škarvada - 2.9.8-2 +- Relaxed numpy dependency, this will probably kill the GUI + Resolves: rhbz#2332202 + * Sat Nov 16 2024 Jaroslav Škarvada - 2.9.8-1 - New version Resolves: rhbz#2325899 From a1f7186bd55faa264e6d5e6db88a10b59538fca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 6 Jan 2025 14:11:55 +0100 Subject: [PATCH 04/20] Updated comments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- urh.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/urh.spec b/urh.spec index 9efae72..07ea2de 100644 --- a/urh.spec +++ b/urh.spec @@ -24,8 +24,9 @@ BuildRequires: python3-qt5 BuildRequires: python3-cython Requires: python3-numpy Requires: python3-qt5 -# Temporal dirty workaround, the GUI will probably crash, it has to be ported -# to numpy-2, upstream report: https://github.com/jopohl/urh/issues/1149 +# Temporal workaround, it may cause problems with the GUI may crash, it should +# be ported to numpy-2, upstream report: +# https://github.com/jopohl/urh/issues/1149 Patch0: urh-2.9.8-relax-numpy-dep.patch %description @@ -94,7 +95,7 @@ install -Dpm 0644 %{SOURCE1} \ %changelog * Mon Jan 6 2025 Jaroslav Škarvada - 2.9.8-2 -- Relaxed numpy dependency, this will probably kill the GUI +- Relaxed numpy dependency, this may cause problems with the GUI Resolves: rhbz#2332202 * Sat Nov 16 2024 Jaroslav Škarvada - 2.9.8-1 From 2c0d02bc36ac83289927f91cbbc0ac9ad82fc86a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 7 Jan 2025 16:03:52 +0100 Subject: [PATCH 05/20] Added check phase (still disabled) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- urh.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/urh.spec b/urh.spec index 07ea2de..3d50fb0 100644 --- a/urh.spec +++ b/urh.spec @@ -20,6 +20,8 @@ BuildRequires: hackrf-devel BuildRequires: rtl-sdr-devel BuildRequires: uhd-devel BuildRequires: python3-qt5 +BuildRequires: python3-pytest +BuildRequires: xorg-x11-server-Xvfb # Unpinning Cython raised upstream: https://github.com/jopohl/urh/issues/1087 BuildRequires: python3-cython Requires: python3-numpy @@ -82,6 +84,10 @@ desktop-file-install --add-category="Utility" \ install -Dpm 0644 %{SOURCE1} \ %{buildroot}%{_metainfodir}/io.github.jopohl.urh.metainfo.xml +%check +# https://github.com/jopohl/urh/issues/1149 +#xvfb-run pytest -s -v tests + %files %license LICENSE %doc README.md From 233914873f96b6a042faf9af1e3f3cdb15b2e9fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:53:08 +0000 Subject: [PATCH 06/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- urh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/urh.spec b/urh.spec index 3d50fb0..c87c575 100644 --- a/urh.spec +++ b/urh.spec @@ -3,7 +3,7 @@ Name: urh Version: 2.9.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Universal Radio Hacker: investigate wireless protocols like a boss # Automatically converted from old format: ASL 2.0 and GPLv2 - review is highly recommended. License: Apache-2.0 AND GPL-2.0-only @@ -100,6 +100,9 @@ install -Dpm 0644 %{SOURCE1} \ %{python3_sitearch}/urh-%{version}-*.egg-info %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2.9.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Jan 6 2025 Jaroslav Škarvada - 2.9.8-2 - Relaxed numpy dependency, this may cause problems with the GUI Resolves: rhbz#2332202 From 590c020ae00557faccd5feda69fd7f6538344d9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 17 Mar 2025 18:33:08 +0100 Subject: [PATCH 07/20] Rebuilt for new uhd --- urh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/urh.spec b/urh.spec index c87c575..a1110a1 100644 --- a/urh.spec +++ b/urh.spec @@ -3,7 +3,7 @@ Name: urh Version: 2.9.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Universal Radio Hacker: investigate wireless protocols like a boss # Automatically converted from old format: ASL 2.0 and GPLv2 - review is highly recommended. License: Apache-2.0 AND GPL-2.0-only @@ -100,6 +100,9 @@ install -Dpm 0644 %{SOURCE1} \ %{python3_sitearch}/urh-%{version}-*.egg-info %changelog +* Mon Mar 17 2025 Jaroslav Škarvada - 2.9.8-4 +- Rebuilt for new uhd + * Sun Jan 19 2025 Fedora Release Engineering - 2.9.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b5d3ff7642275b945dc9d9ac30e88716fe9b426b Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 16:09:52 +0200 Subject: [PATCH 08/20] Rebuilt for Python 3.14 --- urh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/urh.spec b/urh.spec index a1110a1..18f92e4 100644 --- a/urh.spec +++ b/urh.spec @@ -3,7 +3,7 @@ Name: urh Version: 2.9.8 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Universal Radio Hacker: investigate wireless protocols like a boss # Automatically converted from old format: ASL 2.0 and GPLv2 - review is highly recommended. License: Apache-2.0 AND GPL-2.0-only @@ -100,6 +100,9 @@ install -Dpm 0644 %{SOURCE1} \ %{python3_sitearch}/urh-%{version}-*.egg-info %changelog +* Tue Jun 03 2025 Python Maint - 2.9.8-5 +- Rebuilt for Python 3.14 + * Mon Mar 17 2025 Jaroslav Škarvada - 2.9.8-4 - Rebuilt for new uhd From 13a0dfd773240e1e2f61e19ad720e2e99998ab74 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:50:57 +0000 Subject: [PATCH 09/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- urh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/urh.spec b/urh.spec index 18f92e4..b0c09b0 100644 --- a/urh.spec +++ b/urh.spec @@ -3,7 +3,7 @@ Name: urh Version: 2.9.8 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Universal Radio Hacker: investigate wireless protocols like a boss # Automatically converted from old format: ASL 2.0 and GPLv2 - review is highly recommended. License: Apache-2.0 AND GPL-2.0-only @@ -100,6 +100,9 @@ install -Dpm 0644 %{SOURCE1} \ %{python3_sitearch}/urh-%{version}-*.egg-info %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.9.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jun 03 2025 Python Maint - 2.9.8-5 - Rebuilt for Python 3.14 From 6f6e07ea168310d2b61eb9494e379ea16f36fdd9 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: Thu, 31 Jul 2025 02:07:23 +0200 Subject: [PATCH 10/20] Fix build failures with Cython >= 3.1 Resolves: rhbz#2377057 --- fix-cython-3.1-build.patch | 39 ++++++++++++++++++++++++++++++++++++++ urh.spec | 10 +++++++++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 fix-cython-3.1-build.patch diff --git a/fix-cython-3.1-build.patch b/fix-cython-3.1-build.patch new file mode 100644 index 0000000..c0a44cd --- /dev/null +++ b/fix-cython-3.1-build.patch @@ -0,0 +1,39 @@ +From 11451e4cc0dab5e189cd441b96399f679c532fd3 Mon Sep 17 00:00:00 2001 +From: "Prof. Dr. Andreas Noack" +Date: Thu, 31 Jul 2025 10:15:32 +0200 +Subject: [PATCH] Fix compilation with Cython3.1. (#1184) + +Thanks to ahesford: + +Failure to compile with Cython 3.1 is caused by a collision between struct hackrf_device_list and the function hackrf_device_list. In the C library that this wraps, the two names are distinct. Cython, however, folds struct hackrf_device_list into just hackrf_device_list. Fortunately, Cython allows the use of a name for its definitions that differs from the underlying C name, so the struct can just be called c_hackrf_device_list. This doesn't seem to be a critical change because the immediately following typedef just aliases this to hackrf_device_list_t everywhere it is needed. + +Cf. http://docs.cython.org/en/stable/src/userguide/external_C_code.html#resolving-naming-conflicts-c-name-specifications +--- + src/urh/dev/native/lib/chackrf.pxd | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/urh/dev/native/lib/chackrf.pxd b/src/urh/dev/native/lib/chackrf.pxd +index a1382db..1577352 100644 +--- a/src/urh/dev/native/lib/chackrf.pxd ++++ b/src/urh/dev/native/lib/chackrf.pxd +@@ -54,7 +54,7 @@ cdef extern from "libhackrf/hackrf.h": + uint32_t part_id[2] + uint32_t serial_no[4] + +- ctypedef struct hackrf_device_list: ++ ctypedef struct c_hackrf_device_list "hackrf_device_list": + char ** serial_numbers + hackrf_usb_board_id * usb_board_ids + int *usb_device_index +@@ -63,7 +63,7 @@ cdef extern from "libhackrf/hackrf.h": + void ** usb_devices + int usb_devicecount + +- ctypedef hackrf_device_list hackrf_device_list_t; ++ ctypedef c_hackrf_device_list hackrf_device_list_t; + + ctypedef int (*hackrf_sample_block_cb_fn)(hackrf_transfer* transfer) + +-- +2.50.1 + diff --git a/urh.spec b/urh.spec index b0c09b0..a116125 100644 --- a/urh.spec +++ b/urh.spec @@ -3,7 +3,7 @@ Name: urh Version: 2.9.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Universal Radio Hacker: investigate wireless protocols like a boss # Automatically converted from old format: ASL 2.0 and GPLv2 - review is highly recommended. License: Apache-2.0 AND GPL-2.0-only @@ -31,6 +31,10 @@ Requires: python3-qt5 # https://github.com/jopohl/urh/issues/1149 Patch0: urh-2.9.8-relax-numpy-dep.patch +# Resolve build failures with Cython >= 3.1 +# Fixed upstream: https://github.com/jopohl/urh/pull/1184 +Patch1: fix-cython-3.1-build.patch + %description The Universal Radio Hacker is a software for investigating unknown wireless protocols. @@ -100,6 +104,10 @@ install -Dpm 0644 %{SOURCE1} \ %{python3_sitearch}/urh-%{version}-*.egg-info %changelog +* Thu Jul 31 2025 Charalampos Stratakis - 2.9.8-7 +- Fix build failures with Cython >= 3.1 + Resolves: rhbz#2377057 + * Fri Jul 25 2025 Fedora Release Engineering - 2.9.8-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 9e0dce5342d90ed16f83c9a4e219be839db20fb2 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:21:32 +0200 Subject: [PATCH 11/20] Rebuilt for Python 3.14.0rc2 bytecode --- urh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/urh.spec b/urh.spec index a116125..8031c0e 100644 --- a/urh.spec +++ b/urh.spec @@ -3,7 +3,7 @@ Name: urh Version: 2.9.8 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Universal Radio Hacker: investigate wireless protocols like a boss # Automatically converted from old format: ASL 2.0 and GPLv2 - review is highly recommended. License: Apache-2.0 AND GPL-2.0-only @@ -104,6 +104,9 @@ install -Dpm 0644 %{SOURCE1} \ %{python3_sitearch}/urh-%{version}-*.egg-info %changelog +* Fri Aug 15 2025 Python Maint - 2.9.8-8 +- Rebuilt for Python 3.14.0rc2 bytecode + * Thu Jul 31 2025 Charalampos Stratakis - 2.9.8-7 - Fix build failures with Cython >= 3.1 Resolves: rhbz#2377057 From 6a64c0b076514e8ae97a9df7c9617cfd016a8cb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 11 Sep 2025 17:36:40 +0200 Subject: [PATCH 12/20] Rebuilt for new uhd --- urh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/urh.spec b/urh.spec index 8031c0e..174ab62 100644 --- a/urh.spec +++ b/urh.spec @@ -3,7 +3,7 @@ Name: urh Version: 2.9.8 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Universal Radio Hacker: investigate wireless protocols like a boss # Automatically converted from old format: ASL 2.0 and GPLv2 - review is highly recommended. License: Apache-2.0 AND GPL-2.0-only @@ -104,6 +104,9 @@ install -Dpm 0644 %{SOURCE1} \ %{python3_sitearch}/urh-%{version}-*.egg-info %changelog +* Thu Sep 11 2025 Jaroslav Škarvada - 2.9.8-9 +- Rebuilt for new uhd + * Fri Aug 15 2025 Python Maint - 2.9.8-8 - Rebuilt for Python 3.14.0rc2 bytecode From e478593c8f7bd3d09aed8cc6eb8dfc66aed416d2 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 15:01:18 +0200 Subject: [PATCH 13/20] Rebuilt for Python 3.14.0rc3 bytecode --- urh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/urh.spec b/urh.spec index 174ab62..81f18ef 100644 --- a/urh.spec +++ b/urh.spec @@ -3,7 +3,7 @@ Name: urh Version: 2.9.8 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Universal Radio Hacker: investigate wireless protocols like a boss # Automatically converted from old format: ASL 2.0 and GPLv2 - review is highly recommended. License: Apache-2.0 AND GPL-2.0-only @@ -104,6 +104,9 @@ install -Dpm 0644 %{SOURCE1} \ %{python3_sitearch}/urh-%{version}-*.egg-info %changelog +* Fri Sep 19 2025 Python Maint - 2.9.8-10 +- Rebuilt for Python 3.14.0rc3 bytecode + * Thu Sep 11 2025 Jaroslav Škarvada - 2.9.8-9 - Rebuilt for new uhd From 4dcbf745e311bf2fa920da591e570a13cbf242ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Sat, 3 Jan 2026 01:26:12 +0100 Subject: [PATCH 14/20] New version Resolves: rhbz#2423176 --- fix-cython-3.1-build.patch | 39 --------------------------------- sources | 2 +- urh-2.9.8-relax-numpy-dep.patch | 22 ------------------- urh.spec | 16 +++++--------- 4 files changed, 7 insertions(+), 72 deletions(-) delete mode 100644 fix-cython-3.1-build.patch delete mode 100644 urh-2.9.8-relax-numpy-dep.patch diff --git a/fix-cython-3.1-build.patch b/fix-cython-3.1-build.patch deleted file mode 100644 index c0a44cd..0000000 --- a/fix-cython-3.1-build.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 11451e4cc0dab5e189cd441b96399f679c532fd3 Mon Sep 17 00:00:00 2001 -From: "Prof. Dr. Andreas Noack" -Date: Thu, 31 Jul 2025 10:15:32 +0200 -Subject: [PATCH] Fix compilation with Cython3.1. (#1184) - -Thanks to ahesford: - -Failure to compile with Cython 3.1 is caused by a collision between struct hackrf_device_list and the function hackrf_device_list. In the C library that this wraps, the two names are distinct. Cython, however, folds struct hackrf_device_list into just hackrf_device_list. Fortunately, Cython allows the use of a name for its definitions that differs from the underlying C name, so the struct can just be called c_hackrf_device_list. This doesn't seem to be a critical change because the immediately following typedef just aliases this to hackrf_device_list_t everywhere it is needed. - -Cf. http://docs.cython.org/en/stable/src/userguide/external_C_code.html#resolving-naming-conflicts-c-name-specifications ---- - src/urh/dev/native/lib/chackrf.pxd | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/urh/dev/native/lib/chackrf.pxd b/src/urh/dev/native/lib/chackrf.pxd -index a1382db..1577352 100644 ---- a/src/urh/dev/native/lib/chackrf.pxd -+++ b/src/urh/dev/native/lib/chackrf.pxd -@@ -54,7 +54,7 @@ cdef extern from "libhackrf/hackrf.h": - uint32_t part_id[2] - uint32_t serial_no[4] - -- ctypedef struct hackrf_device_list: -+ ctypedef struct c_hackrf_device_list "hackrf_device_list": - char ** serial_numbers - hackrf_usb_board_id * usb_board_ids - int *usb_device_index -@@ -63,7 +63,7 @@ cdef extern from "libhackrf/hackrf.h": - void ** usb_devices - int usb_devicecount - -- ctypedef hackrf_device_list hackrf_device_list_t; -+ ctypedef c_hackrf_device_list hackrf_device_list_t; - - ctypedef int (*hackrf_sample_block_cb_fn)(hackrf_transfer* transfer) - --- -2.50.1 - diff --git a/sources b/sources index 317174f..5df2392 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (urh-2.9.8.tar.gz) = a5327bee699bba8e6ffef2e7ec54f5f4b354feda18340c9b567b10b8c9283c5c907a546fd8a5660a2c325d42b8928cb9592630d0c2a5ed7dfdcf5dc434be4cb2 +SHA512 (urh-2.10.0.tar.gz) = 0e46c7f74b1108ed32128cb1b3034b62ec03595057e5822c7e27e9340d2b81cc6240376bef3d3ba5b03e47396ccdfd737cb911788a1f36be2be30928e101fc57 diff --git a/urh-2.9.8-relax-numpy-dep.patch b/urh-2.9.8-relax-numpy-dep.patch deleted file mode 100644 index 7071d81..0000000 --- a/urh-2.9.8-relax-numpy-dep.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/setup.py b/setup.py -index e6f122d..ea30195 100644 ---- a/setup.py -+++ b/setup.py -@@ -142,7 +142,7 @@ def read_long_description(): - return "" - - --install_requires = ["numpy<2.0.0", "psutil", "cython", "setuptools"] -+install_requires = ["numpy", "psutil", "cython", "setuptools"] - if IS_RELEASE: - install_requires.append("pyqt5") - else: -@@ -168,7 +168,7 @@ setup( - license="GNU General Public License (GPL)", - download_url="https://github.com/jopohl/urh/tarball/v" + str(version.VERSION), - install_requires=install_requires, -- setup_requires=["numpy<2.0.0"], -+ setup_requires=["numpy"], - packages=get_packages(), - ext_modules=get_extensions(), - cmdclass={"build_ext": build_ext}, diff --git a/urh.spec b/urh.spec index 81f18ef..9ae2237 100644 --- a/urh.spec +++ b/urh.spec @@ -2,8 +2,8 @@ # python 2 not supported Name: urh -Version: 2.9.8 -Release: 10%{?dist} +Version: 2.10.0 +Release: 1%{?dist} Summary: Universal Radio Hacker: investigate wireless protocols like a boss # Automatically converted from old format: ASL 2.0 and GPLv2 - review is highly recommended. License: Apache-2.0 AND GPL-2.0-only @@ -26,14 +26,6 @@ BuildRequires: xorg-x11-server-Xvfb BuildRequires: python3-cython Requires: python3-numpy Requires: python3-qt5 -# Temporal workaround, it may cause problems with the GUI may crash, it should -# be ported to numpy-2, upstream report: -# https://github.com/jopohl/urh/issues/1149 -Patch0: urh-2.9.8-relax-numpy-dep.patch - -# Resolve build failures with Cython >= 3.1 -# Fixed upstream: https://github.com/jopohl/urh/pull/1184 -Patch1: fix-cython-3.1-build.patch %description The Universal Radio Hacker is a software for investigating unknown wireless @@ -104,6 +96,10 @@ install -Dpm 0644 %{SOURCE1} \ %{python3_sitearch}/urh-%{version}-*.egg-info %changelog +* Sat Jan 03 2026 Jaroslav Škarvada - 2.10.0-1 +- New version + Resolves: rhbz#2423176 + * Fri Sep 19 2025 Python Maint - 2.9.8-10 - Rebuilt for Python 3.14.0rc3 bytecode From 580577da4067f1c09d96f1858a7013ff0e9d4041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 15 Jan 2026 14:14:24 +0100 Subject: [PATCH 15/20] Converted to new python packaging Resolves: rhbz#2378489 --- urh.spec | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/urh.spec b/urh.spec index 9ae2237..10d3285 100644 --- a/urh.spec +++ b/urh.spec @@ -1,16 +1,12 @@ -%{?python_enable_dependency_generator} -# python 2 not supported - Name: urh Version: 2.10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Universal Radio Hacker: investigate wireless protocols like a boss # Automatically converted from old format: ASL 2.0 and GPLv2 - review is highly recommended. License: Apache-2.0 AND GPL-2.0-only URL: https://github.com/jopohl/urh Source0: https://github.com/jopohl/urh/archive/v%{version}/%{name}-%{version}.tar.gz Source1: io.github.jopohl.urh.metainfo.xml -BuildRequires: python3-setuptools BuildRequires: python3-devel BuildRequires: gcc-c++ BuildRequires: python3-numpy @@ -19,13 +15,12 @@ BuildRequires: airspyone_host-devel BuildRequires: hackrf-devel BuildRequires: rtl-sdr-devel BuildRequires: uhd-devel -BuildRequires: python3-qt5 -BuildRequires: python3-pytest +BuildRequires: python3-pyqt6 BuildRequires: xorg-x11-server-Xvfb # Unpinning Cython raised upstream: https://github.com/jopohl/urh/issues/1087 BuildRequires: python3-cython Requires: python3-numpy -Requires: python3-qt5 +Requires: python3-pyqt6 %description The Universal Radio Hacker is a software for investigating unknown wireless @@ -52,11 +47,15 @@ popd sed -i 's/"cython<3.0.0"/"cython"/' setup.py +%generate_buildrequires +%pyproject_buildrequires + %build -%py3_build +%pyproject_wheel %install -%py3_install +%pyproject_install +%pyproject_save_files urh # remove cpp files generated by cython pushd %{buildroot}%{python3_sitearch}/urh/dev/native/lib @@ -84,7 +83,7 @@ install -Dpm 0644 %{SOURCE1} \ # https://github.com/jopohl/urh/issues/1149 #xvfb-run pytest -s -v tests -%files +%files -f %{pyproject_files} %license LICENSE %doc README.md %{_bindir}/urh @@ -92,10 +91,12 @@ install -Dpm 0644 %{SOURCE1} \ %{_datadir}/icons/hicolor/128x128/apps/urh.png %{_datadir}/applications/urh.desktop %{_metainfodir}/io.github.jopohl.urh.metainfo.xml -%{python3_sitearch}/urh -%{python3_sitearch}/urh-%{version}-*.egg-info %changelog +* Thu Jan 15 2026 Jaroslav Škarvada - 2.10.0-2 +- Converted to new python packaging + Resolves: rhbz#2378489 + * Sat Jan 03 2026 Jaroslav Škarvada - 2.10.0-1 - New version Resolves: rhbz#2423176 From 61b45da603dbff0c9ed2834a88977451ad7a31fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:40:11 +0000 Subject: [PATCH 16/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- urh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/urh.spec b/urh.spec index 10d3285..467a257 100644 --- a/urh.spec +++ b/urh.spec @@ -1,6 +1,6 @@ Name: urh Version: 2.10.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Universal Radio Hacker: investigate wireless protocols like a boss # Automatically converted from old format: ASL 2.0 and GPLv2 - review is highly recommended. License: Apache-2.0 AND GPL-2.0-only @@ -93,6 +93,9 @@ install -Dpm 0644 %{SOURCE1} \ %{_metainfodir}/io.github.jopohl.urh.metainfo.xml %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 2.10.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Thu Jan 15 2026 Jaroslav Škarvada - 2.10.0-2 - Converted to new python packaging Resolves: rhbz#2378489 From 00cba95c12576eaf238806ce3f66e3c44b21564e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 28 Apr 2026 16:46:34 +0200 Subject: [PATCH 17/20] Rebuilt for new uhd --- urh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/urh.spec b/urh.spec index 467a257..14139f8 100644 --- a/urh.spec +++ b/urh.spec @@ -1,6 +1,6 @@ Name: urh Version: 2.10.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Universal Radio Hacker: investigate wireless protocols like a boss # Automatically converted from old format: ASL 2.0 and GPLv2 - review is highly recommended. License: Apache-2.0 AND GPL-2.0-only @@ -93,6 +93,9 @@ install -Dpm 0644 %{SOURCE1} \ %{_metainfodir}/io.github.jopohl.urh.metainfo.xml %changelog +* Tue Apr 28 2026 Jaroslav Škarvada - 2.10.0-4 +- Rebuilt for new uhd + * Sat Jan 17 2026 Fedora Release Engineering - 2.10.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 73a5a07fa380ff2d4b94a65e0c30a403645f57a9 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 4 Jun 2026 12:38:47 +0200 Subject: [PATCH 18/20] Rebuilt for Python 3.15 --- urh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/urh.spec b/urh.spec index 14139f8..d886ab8 100644 --- a/urh.spec +++ b/urh.spec @@ -1,6 +1,6 @@ Name: urh Version: 2.10.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Universal Radio Hacker: investigate wireless protocols like a boss # Automatically converted from old format: ASL 2.0 and GPLv2 - review is highly recommended. License: Apache-2.0 AND GPL-2.0-only @@ -93,6 +93,9 @@ install -Dpm 0644 %{SOURCE1} \ %{_metainfodir}/io.github.jopohl.urh.metainfo.xml %changelog +* Thu Jun 04 2026 Python Maint - 2.10.0-5 +- Rebuilt for Python 3.15 + * Tue Apr 28 2026 Jaroslav Škarvada - 2.10.0-4 - Rebuilt for new uhd From ea7213543f9071569df5631d21676f07aeef3b0b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:14:48 +0000 Subject: [PATCH 19/20] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- urh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/urh.spec b/urh.spec index d886ab8..0889ad6 100644 --- a/urh.spec +++ b/urh.spec @@ -1,6 +1,6 @@ Name: urh Version: 2.10.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Universal Radio Hacker: investigate wireless protocols like a boss # Automatically converted from old format: ASL 2.0 and GPLv2 - review is highly recommended. License: Apache-2.0 AND GPL-2.0-only @@ -93,6 +93,9 @@ install -Dpm 0644 %{SOURCE1} \ %{_metainfodir}/io.github.jopohl.urh.metainfo.xml %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 2.10.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Thu Jun 04 2026 Python Maint - 2.10.0-5 - Rebuilt for Python 3.15 From dc88b3f59d3549202f696df285ea313a440a5175 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Wed, 22 Jul 2026 10:11:31 +0200 Subject: [PATCH 20/20] Rebuilt for Python 3.15.0b4 ABI change --- urh.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/urh.spec b/urh.spec index 0889ad6..4f4e967 100644 --- a/urh.spec +++ b/urh.spec @@ -1,6 +1,6 @@ Name: urh Version: 2.10.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Universal Radio Hacker: investigate wireless protocols like a boss # Automatically converted from old format: ASL 2.0 and GPLv2 - review is highly recommended. License: Apache-2.0 AND GPL-2.0-only @@ -93,6 +93,9 @@ install -Dpm 0644 %{SOURCE1} \ %{_metainfodir}/io.github.jopohl.urh.metainfo.xml %changelog +* Wed Jul 22 2026 Python Maint - 2.10.0-7 +- Rebuilt for Python 3.15.0b4 ABI change + * Fri Jul 17 2026 Fedora Release Engineering - 2.10.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild