From 1cc1e14e743993e84383cbc3f1f4a4629ba68d7a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:19:00 +0000 Subject: [PATCH 01/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- usbtop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbtop.spec b/usbtop.spec index 70f121b..17aa35c 100644 --- a/usbtop.spec +++ b/usbtop.spec @@ -1,6 +1,6 @@ Name: usbtop Version: 1.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Utility to show USB bandwidth License: BSD URL: https://github.com/aguinet/usbtop @@ -47,6 +47,9 @@ modprobe usbmon &> /dev/null || : %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 1.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 1435ee09e8814eecefa52106e7688cc4515bab84 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:26:05 +0000 Subject: [PATCH 02/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- usbtop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbtop.spec b/usbtop.spec index 17aa35c..b5784f2 100644 --- a/usbtop.spec +++ b/usbtop.spec @@ -1,6 +1,6 @@ Name: usbtop Version: 1.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Utility to show USB bandwidth License: BSD URL: https://github.com/aguinet/usbtop @@ -47,6 +47,9 @@ modprobe usbmon &> /dev/null || : %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 1.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 0c344328b3a9c784a3ac8b41869812531f90c197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 22:35:23 +0200 Subject: [PATCH 03/11] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- usbtop.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/usbtop.spec b/usbtop.spec index b5784f2..04d4771 100644 --- a/usbtop.spec +++ b/usbtop.spec @@ -1,8 +1,9 @@ Name: usbtop Version: 1.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Utility to show USB bandwidth -License: BSD +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD URL: https://github.com/aguinet/usbtop Source0: %{url}/archive/release-%{version}/usbtop-%{version}.tar.gz @@ -47,6 +48,9 @@ modprobe usbmon &> /dev/null || : %changelog +* Wed Sep 04 2024 Miroslav Suchý - 1.0-13 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 1.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 5a380b53eb7b5d87699413f77517d96cd6c59ad0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:57:24 +0000 Subject: [PATCH 04/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- usbtop.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usbtop.spec b/usbtop.spec index 04d4771..1bf61eb 100644 --- a/usbtop.spec +++ b/usbtop.spec @@ -1,6 +1,6 @@ Name: usbtop Version: 1.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Utility to show USB bandwidth # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -48,6 +48,9 @@ modprobe usbmon &> /dev/null || : %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Sep 04 2024 Miroslav Suchý - 1.0-13 - convert license to SPDX From ba0627c2ccd89f29cc59b7d8e233afb7a68761cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 15 Apr 2025 14:45:08 +0200 Subject: [PATCH 05/11] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 42 ++++++++++++++++++++++++++++++++++++++++++ usbtop.spec | 45 ++------------------------------------------- 2 files changed, 44 insertions(+), 43 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..a8c40f2 --- /dev/null +++ b/changelog @@ -0,0 +1,42 @@ +* Sun Jan 19 2025 Fedora Release Engineering - 1.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Sep 04 2024 Miroslav Suchý - 1.0-13 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 1.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 1.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 1.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 1.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 1.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Sep 04 2019 Carl George - 1.0-2 +- BuildRequires systemd-rpm-macros and use %%_modulesloaddir +- Use %%autosetup + +* Tue Sep 03 2019 Carl George - 1.0-1 +- Initial package rhbz#1748678 diff --git a/usbtop.spec b/usbtop.spec index 1bf61eb..f93f3d2 100644 --- a/usbtop.spec +++ b/usbtop.spec @@ -1,6 +1,6 @@ Name: usbtop Version: 1.0 -Release: 14%{?dist} +Release: %autorelease Summary: Utility to show USB bandwidth # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -48,45 +48,4 @@ modprobe usbmon &> /dev/null || : %changelog -* Sun Jan 19 2025 Fedora Release Engineering - 1.0-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Sep 04 2024 Miroslav Suchý - 1.0-13 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 1.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 1.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 1.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jan 27 2021 Fedora Release Engineering - 1.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Sep 04 2019 Carl George - 1.0-2 -- BuildRequires systemd-rpm-macros and use %%_modulesloaddir -- Use %%autosetup - -* Tue Sep 03 2019 Carl George - 1.0-1 -- Initial package rhbz#1748678 +%autochangelog From 9195b58da9e96be476028890a0120221ee5285be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 15 Apr 2025 14:46:33 +0200 Subject: [PATCH 06/11] Confirm that the license is BSD-3-Clause This is what the LICENSE text says and what github also thinks. --- usbtop.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/usbtop.spec b/usbtop.spec index f93f3d2..2aadf55 100644 --- a/usbtop.spec +++ b/usbtop.spec @@ -2,8 +2,7 @@ Name: usbtop Version: 1.0 Release: %autorelease Summary: Utility to show USB bandwidth -# Automatically converted from old format: BSD - review is highly recommended. -License: LicenseRef-Callaway-BSD +License: BSD-3-Clause URL: https://github.com/aguinet/usbtop Source0: %{url}/archive/release-%{version}/usbtop-%{version}.tar.gz From bb34335eb134436d8fdccee98b7509dabd67ce69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 15 Apr 2025 15:00:47 +0200 Subject: [PATCH 07/11] Fix build when sbindir != /usr/sbin ... (rhbz#2341491) --- usbtop.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usbtop.spec b/usbtop.spec index 2aadf55..3e7e9dc 100644 --- a/usbtop.spec +++ b/usbtop.spec @@ -34,6 +34,10 @@ rm -rf third-party install -d %{buildroot}%{_modulesloaddir} echo usbmon > %{buildroot}%{_modulesloaddir}/usbtop.conf +# The CMake config hardcodes the directory name +%if "%{_sbindir}" == "%{_bindir}" +mv -v %{buildroot}/usr/sbin %{buildroot}%{_bindir} +%endif %post modprobe usbmon &> /dev/null || : From 817e2d80a06b1696587f2b43d0d900f6c585294c Mon Sep 17 00:00:00 2001 From: Carl George Date: Thu, 17 Jul 2025 15:47:11 -0500 Subject: [PATCH 08/11] CMake 4 compatibility rhbz#2381622 --- 0001-CMake-4-compatibility.patch | 39 ++++++++++++++++++++++++++++++++ usbtop.spec | 6 +++-- 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 0001-CMake-4-compatibility.patch diff --git a/0001-CMake-4-compatibility.patch b/0001-CMake-4-compatibility.patch new file mode 100644 index 0000000..6c9ff8f --- /dev/null +++ b/0001-CMake-4-compatibility.patch @@ -0,0 +1,39 @@ +From acca6c92bb28e7be2bcb56fd4b6431bb849963a7 Mon Sep 17 00:00:00 2001 +From: Carl George +Date: Thu, 17 Jul 2025 15:02:29 -0500 +Subject: [PATCH] CMake 4 compatibility + +CMake 4 drops compatibility with CMake older than 3.5, and now returns +this error: + + CMake Error at CMakeLists.txt:1 (cmake_minimum_required): + Compatibility with CMake < 3.5 has been removed from CMake. + + Update the VERSION argument value. Or, use the ... syntax + to tell CMake that the project requires at least but has been updated + to work with policies introduced by or earlier. + + Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. + +To allow building with CMake 2.8 through 4, update +cmake_minimum_required to the min...max syntax. + +https://cmake.org/cmake/help/latest/release/4.0.html#deprecated-and-removed-features +https://fedoraproject.org/wiki/Changes/CMake4.0#Migration +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8ae2192..4b8551e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 2.8...4.0) + project(usbtop) + + set (VERSION_MAJOR 0) +-- +2.50.1 + diff --git a/usbtop.spec b/usbtop.spec index 3e7e9dc..36f9898 100644 --- a/usbtop.spec +++ b/usbtop.spec @@ -4,7 +4,9 @@ Release: %autorelease Summary: Utility to show USB bandwidth License: BSD-3-Clause URL: https://github.com/aguinet/usbtop -Source0: %{url}/archive/release-%{version}/usbtop-%{version}.tar.gz +Source: %{url}/archive/release-%{version}/usbtop-%{version}.tar.gz +# https://github.com/aguinet/usbtop/pull/45 +Patch: 0001-CMake-4-compatibility.patch BuildRequires: systemd-rpm-macros BuildRequires: make @@ -20,7 +22,7 @@ USB buses and devices. %prep -%autosetup -n usbtop-release-%{version} +%autosetup -p 1 -n usbtop-release-%{version} rm -rf third-party From 165196b3316ce187d301633fe065305579bdf5c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:53:04 +0000 Subject: [PATCH 09/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From ab9daab02855e508d7509d6ec4d33ec143d9af6e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:42:14 +0000 Subject: [PATCH 10/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 876a5e698fd96cea6780381439c28ba99ec63a37 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:16:51 +0000 Subject: [PATCH 11/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild