Compare commits

...
Sign in to create a new pull request.

11 commits

Author SHA1 Message Date
Fedora Release Engineering
876a5e698f Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild 2026-07-17 08:16:51 +00:00
Fedora Release Engineering
ab9daab028 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 19:42:14 +00:00
Fedora Release Engineering
165196b331 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 19:53:04 +00:00
817e2d80a0 CMake 4 compatibility rhbz#2381622 2025-07-17 15:47:11 -05:00
bb34335eb1 Fix build when sbindir != /usr/sbin
... (rhbz#2341491)
2025-04-15 15:00:47 +02:00
9195b58da9 Confirm that the license is BSD-3-Clause
This is what the LICENSE text says and what github also thinks.
2025-04-15 14:59:51 +02:00
ba0627c2cc Convert to %autorelease and %autochangelog
[skip changelog]
2025-04-15 14:45:08 +02:00
Fedora Release Engineering
5a380b53eb Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 13:57:24 +00:00
Miroslav Suchý
0c344328b3 convert license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-09-04 22:35:23 +02:00
Fedora Release Engineering
1435ee09e8 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 08:26:05 +00:00
Fedora Release Engineering
1cc1e14e74 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 07:19:00 +00:00
3 changed files with 92 additions and 34 deletions

View file

@ -0,0 +1,39 @@
From acca6c92bb28e7be2bcb56fd4b6431bb849963a7 Mon Sep 17 00:00:00 2001
From: Carl George <carlwgeorge@gmail.com>
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 <min> value. Or, use the <min>...<max> syntax
to tell CMake that the project requires at least <min> but has been updated
to work with policies introduced by <max> 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

42
changelog Normal file
View file

@ -0,0 +1,42 @@
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Wed Sep 04 2024 Miroslav Suchý <msuchy@redhat.com> - 1.0-13
- convert license to SPDX
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Sep 04 2019 Carl George <carl@george.computer> - 1.0-2
- BuildRequires systemd-rpm-macros and use %%_modulesloaddir
- Use %%autosetup
* Tue Sep 03 2019 Carl George <carl@george.computer> - 1.0-1
- Initial package rhbz#1748678

View file

@ -1,10 +1,12 @@
Name: usbtop
Version: 1.0
Release: 10%{?dist}
Release: %autorelease
Summary: Utility to show USB bandwidth
License: BSD
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
@ -34,6 +36,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 || :
@ -47,33 +53,4 @@ modprobe usbmon &> /dev/null || :
%changelog
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Sep 04 2019 Carl George <carl@george.computer> - 1.0-2
- BuildRequires systemd-rpm-macros and use %%_modulesloaddir
- Use %%autosetup
* Tue Sep 03 2019 Carl George <carl@george.computer> - 1.0-1
- Initial package rhbz#1748678
%autochangelog