diff --git a/.gitignore b/.gitignore index 6858a23..3b204fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,2 @@ -/*.src.rpm -/results_ubertooth /ubertooth-2017-03-R2.tar.xz /ubertooth-2018-06-R1.tar.xz -/ubertooth-2018-08-R1.tar.xz -/ubertooth-2018-12-R1.tar.xz -/ubertooth-2020-12-R1.tar.xz diff --git a/0000-fix-python-shebang.patch b/0000-fix-python-shebang.patch new file mode 100644 index 0000000..a552c42 --- /dev/null +++ b/0000-fix-python-shebang.patch @@ -0,0 +1,18 @@ +diff -Nru ubertooth-2017-03-R2.orig/host/python/specan_ui/specan/Ubertooth.py ubertooth-2017-03-R2/host/python/specan_ui/specan/Ubertooth.py +--- ubertooth-2017-03-R2.orig/host/python/specan_ui/specan/Ubertooth.py 2017-03-14 01:07:02.000000000 +0300 ++++ ubertooth-2017-03-R2/host/python/specan_ui/specan/Ubertooth.py 2018-04-24 00:11:44.986581020 +0300 +@@ -1,5 +1,3 @@ +-#!/usr/bin/env python +-# + # Copyright 2011 Jared Boone + # + # This file is part of Project Ubertooth. +diff -Nru ubertooth-2017-03-R2.orig/host/python/specan_ui/ubertooth-specan-ui ubertooth-2017-03-R2/host/python/specan_ui/ubertooth-specan-ui +--- ubertooth-2017-03-R2.orig/host/python/specan_ui/ubertooth-specan-ui 2017-03-14 01:07:02.000000000 +0300 ++++ ubertooth-2017-03-R2/host/python/specan_ui/ubertooth-specan-ui 2018-04-24 00:11:57.718667386 +0300 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + # + # Copyright 2011 Jared Boone + # diff --git a/changelog b/changelog deleted file mode 100644 index 6b23585..0000000 --- a/changelog +++ /dev/null @@ -1,128 +0,0 @@ -* Fri Jul 17 2026 Fedora Release Engineering - 2020.12.R1-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Wed Jun 03 2026 Python Maint - 2020.12.R1-26 -- Rebuilt for Python 3.15 - -* Sat Jan 17 2026 Fedora Release Engineering - 2020.12.R1-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Tue Dec 02 2025 Jan Grulich - 2020.12.R1-24 -- Rebuild (python-pyside6) - -* Fri Sep 19 2025 Python Maint - 2020.12.R1-23 -- Rebuilt for Python 3.14.0rc3 bytecode - -* Fri Aug 15 2025 Python Maint - 2020.12.R1-22 -- Rebuilt for Python 3.14.0rc2 bytecode - -* Fri Jul 25 2025 Fedora Release Engineering - 2020.12.R1-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Mon Jun 02 2025 Python Maint - 2020.12.R1-20 -- Rebuilt for Python 3.14 - -* Sun Jan 19 2025 Fedora Release Engineering - 2020.12.R1-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Sep 27 2024 Davide Cavalca - 2020.12.R1-18 -- Make it build with the latest Python - Fixes: RHBZ#2259655, RHBZ#2242706, RHBZ#2242709 -- Update summary and description -- Drop deprecated macros - -* Mon Jul 29 2024 Miroslav Suchý - 2020.12.R1-17 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 2020.12.R1-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Jun 07 2024 Python Maint - 2020.12.R1-15 -- Rebuilt for Python 3.13 - -* Sat Jan 27 2024 Fedora Release Engineering - 2020.12.R1-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 2020.12.R1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jun 13 2023 Python Maint - 2020.12.R1-12 -- Rebuilt for Python 3.12 - -* Sat Jan 21 2023 Fedora Release Engineering - 2020.12.R1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 2020.12.R1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jun 16 2022 Python Maint - 2020.12.R1-9 -- Rebuilt for Python 3.11 - -* Thu Jun 16 2022 Davide Cavalca - 2020.12.R1-8 -- Fix build issues; Resolves: RHBZ#2069144 - -* Mon Jun 13 2022 Python Maint - 2020.12.R1-7 -- Rebuilt for Python 3.11 - -* Sat Jan 22 2022 Fedora Release Engineering - 2020.12.R1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 2020.12.R1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 2020.12.R1-4 -- Rebuilt for Python 3.10 - -* Wed Jan 27 2021 Fedora Release Engineering - 2020.12.R1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jan 11 2021 Sergey Avseyev 2020.12.R1-2 -- Fix build with python 3.10 - -* Mon Jan 04 2021 Sergey Avseyev 2020.12.R1-1 -- Update to 2020-12-R1 - -* Fri Jan 31 2020 Fedora Release Engineering - 2018.12.R1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Nov 18 2019 Sergey Avseyev - 2018.12.R1-8 -- Rebuilt with python3-pyside2 - -* Thu Oct 03 2019 Miro Hrončok - 2018.12.R1-7 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Mon Aug 19 2019 Miro Hrončok - 2018.12.R1-6 -- Rebuilt for Python 3.8 - -* Sat Jul 27 2019 Fedora Release Engineering - 2018.12.R1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed Jun 05 2019 Sergey Avseyev - 2018.12.R1-4 -- Fix pyside imports in ubertooth-specan-ui - -* Sun Feb 03 2019 Fedora Release Engineering - 2018.12.R1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Jan 21 2019 Sergey Avseyev - 2018.12.R1-2 -- Add explicit curdir on CMake invocation - -* Thu Dec 06 2018 Sergey Avseyev 2018.12.R1-1 -- Update to 2018-12-R1 - -* Fri Aug 10 2018 Sergey Avseyev 2018.08.R1-1 -- Update to 2018-08-R1 - -* Sun Jul 15 2018 Sergey Avseyev - 2018.07.R1-3 -- Added systemd as build requirement for _udevrulesdir macro - -* Sat Jul 14 2018 Fedora Release Engineering - 2018.06.R1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Jul 06 2018 Sergey Avseyev 2018.06.R1-1 -- Update to 2018-06-R1 - -* Tue Jun 19 2018 Miro Hrončok - 2017.03.R2-2 -- Rebuilt for Python 3.7 - -* Mon Apr 23 2018 Sergey Avseyev 2017.03.R2-1 -- Initial import diff --git a/sources b/sources index 149a0e9..23677d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ubertooth-2020-12-R1.tar.xz) = f127cae09d9b20dc34ffad080871f4505cbeccc1117e0e4e841ecf4a30f578d02b67b52786d7a82bdfc43d06562919008c076f8eb9befc7e4bd95def05a3864c +SHA512 (ubertooth-2018-06-R1.tar.xz) = 48865184473dc99e865c6c997e3a1ad9f9f4702ac6d580cc695adea935615a07caeb12a2d10bd81de3e32e332dbc3af291b7d9380eb86a1cdf391ddf4b260b80 diff --git a/ubertooth-0001-remove-shebang-from-library-script.patch b/ubertooth-0001-remove-shebang-from-library-script.patch deleted file mode 100644 index 830972e..0000000 --- a/ubertooth-0001-remove-shebang-from-library-script.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 500d9b2024e55c1bd269e80ede3980a60f6abbef Mon Sep 17 00:00:00 2001 -From: Sergey Avseyev -Date: Sat, 2 Jan 2021 13:24:37 +0300 -Subject: [PATCH] remove shebang from library script - ---- - host/python/specan_ui/specan/Ubertooth.py | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/host/python/specan_ui/specan/Ubertooth.py b/host/python/specan_ui/specan/Ubertooth.py -index 9887c17..8c427ca 100644 ---- a/host/python/specan_ui/specan/Ubertooth.py -+++ b/host/python/specan_ui/specan/Ubertooth.py -@@ -1,5 +1,3 @@ --#!/usr/bin/env python3 --# - # Copyright 2011 Jared Boone - # - # This file is part of Project Ubertooth. --- -2.29.2 - diff --git a/ubertooth.spec b/ubertooth.spec index 218c9da..012fe74 100644 --- a/ubertooth.spec +++ b/ubertooth.spec @@ -1,47 +1,39 @@ -%global POSTYEAR 2020 -%global POSTMONTH 12 +%global POSTYEAR 2018 +%global POSTMONTH 06 %global POSTNUM 1 -%global _description %{expand: -Project Ubertooth is an open source wireless development platform suitable -for Bluetooth experimentation. Ubertooth ships with a capable BLE (Bluetooth -Smart) sniffer and can sniff some data from Basic Rate (BR) Bluetooth Classic -connections.} - Name: ubertooth Version: %{POSTYEAR}.%{POSTMONTH}.R%{POSTNUM} -Release: %autorelease -Summary: Bluetooth wireless development platform for experimentation +Release: 1%{?dist} +Summary: A Bluetooth wireless development platform for experimentation # This package is only includes host part of the Ubertooth project, which is licensed under GPLv2. # But parts of the firmware, which is running on the board, licensed under BSD (3 clause): lpcusb, # and GPL v2 or later. -License: GPL-2.0-only +License: GPLv2 URL: https://github.com/greatscottgadgets/ubertooth -Source: %{url}/releases/download/%{POSTYEAR}-%{POSTMONTH}-R%{POSTNUM}/%{name}-%{POSTYEAR}-%{POSTMONTH}-R%{POSTNUM}.tar.xz -Patch: ubertooth-0001-remove-shebang-from-library-script.patch - -BuildRequires: bluez-libs-devel -BuildRequires: cmake -BuildRequires: gcc-c++ -BuildRequires: libbtbb-devel -BuildRequires: libpcap-devel -BuildRequires: libusb1-devel -BuildRequires: python3-devel -BuildRequires: python3-numpy -BuildRequires: systemd-rpm-macros +Source0: https://github.com/greatscottgadgets/ubertooth/releases/download/%{POSTYEAR}-%{POSTMONTH}-R%{POSTNUM}/%{name}-%{POSTYEAR}-%{POSTMONTH}-R%{POSTNUM}.tar.xz +Patch0: 0000-fix-python-shebang.patch +BuildRequires: libusb1-devel cmake libpcap-devel gcc-c++ bluez-libs-devel libbtbb-devel python3-devel Requires: lib%{name}%{?_isa} = %{version}-%{release} Recommends: %{name}-specan-ui = %{version}-%{release} -%description %_description +%description +Project Ubertooth is an open source wireless development platform suitable +for Bluetooth experimentation. Ubertooth ships with a capable BLE (Bluetooth +Smart) sniffer and can sniff some data from Basic Rate (BR) Bluetooth Classic +connections. %package -n lib%{name} Summary: Shared library for Bluetooth experimentation -Requires: systemd-udev -%description -n lib%{name} %_description +%description -n lib%{name} +Project Ubertooth is an open source wireless development platform suitable +for Bluetooth experimentation. Ubertooth ships with a capable BLE (Bluetooth +Smart) sniffer and can sniff some data from Basic Rate (BR) Bluetooth Classic +connections. -This package provides the the ubertooth shared library. +This package provides the development files for using the ubertooth library. %package devel Summary: Development files for lib%{name} @@ -53,10 +45,8 @@ developing applications that use %{name}. %package specan-ui Summary: Graphical spectrum analyzer for %{name} -Requires: python3-QtPy -Requires: python3-numpy%{?_isa} -Requires: python3-pyside6%{?_isa} Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: python3-pyside%{?_isa} %description specan-ui The %{name}-specan-ui is a basic spectrum analysis tool for the Ubertooth. @@ -65,47 +55,32 @@ The %{name}-specan-ui is a basic spectrum analysis tool for the Ubertooth. %prep %autosetup -p1 -n %{name}-%{POSTYEAR}-%{POSTMONTH}-R%{POSTNUM} -# Fix udev rules -sed -i -e 's/GROUP="@UBERTOOTH_GROUP@"/ENV{ID_SOFTWARE_RADIO}="1"/g' \ - host/misc/udev/40-ubertooth.rules.in - -# Use the correct version -sed -i "s/version\s*=.*/version = '%{version}',/" \ - host/python/specan_ui/setup.py.in \ - host/python/specan_ui/setup.py - -%generate_buildrequires -cd host/python/specan_ui >/dev/null -%pyproject_buildrequires -cd - >/dev/null %build -export CMAKE_POLICY_VERSION_MINIMUM=3.5 -%cmake \ +sed -i -e 's/GROUP="@UBERTOOTH_GROUP@"/ENV{ID_SOFTWARE_RADIO}="1"/g' host/misc/udev/40-ubertooth.rules.in +%cmake host \ -DINSTALL_UDEV_RULES=on \ -DUDEV_RULES_GROUP=plugdev \ - -DUDEV_RULES_PATH:PATH=%{_udevrulesdir} \ - -S host - -%cmake_build - + -DUDEV_RULES_PATH:PATH=%{_udevrulesdir} +%make_build ( cd host/python/specan_ui - %pyproject_wheel + sed -i "s/version\s*=\s*''/version = '%{version}'/" setup.py + %py3_build ) %install -%cmake_install +%make_install ( cd host/python/specan_ui - %pyproject_install -%pyproject_save_files specan + %py3_install install -Dp -m755 ubertooth-specan-ui %{buildroot}%{_bindir} ) -%check -%pyproject_check_import + +%ldconfig_scriptlets + %files %license COPYING TRADEMARK @@ -122,14 +97,19 @@ export CMAKE_POLICY_VERSION_MINIMUM=3.5 %{_udevrulesdir}/40-ubertooth.rules %files devel -%{_includedir}/ubertooth.h -%{_includedir}/ubertooth_*.h +%{_includedir}/* %{_libdir}/lib%{name}.so -%files specan-ui -f %{pyproject_files} +%files specan-ui %doc host/python/specan_ui/README %{_bindir}/%{name}-specan-ui +%{python3_sitelib}/specan +%{python3_sitelib}/specan-%{version}-py?.?.egg-info %changelog -%autochangelog +* Fri Jul 06 2018 Sergey Avseyev 2018.06.R1-1 +- Update to 2018-06-R1 + +* Mon Apr 23 2018 Sergey Avseyev 2017.03.R2-1 +- Initial import