Compare commits
15 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
876a5e698f | ||
|
|
ab9daab028 | ||
|
|
165196b331 | ||
| 817e2d80a0 | |||
| bb34335eb1 | |||
| 9195b58da9 | |||
| ba0627c2cc | |||
|
|
5a380b53eb | ||
|
|
0c344328b3 | ||
|
|
1435ee09e8 | ||
|
|
1cc1e14e74 | ||
|
|
7784a719fa | ||
|
|
f2b6223824 | ||
|
|
256136ce7e | ||
|
|
d457113fc0 |
3 changed files with 92 additions and 22 deletions
39
0001-CMake-4-compatibility.patch
Normal file
39
0001-CMake-4-compatibility.patch
Normal 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
42
changelog
Normal 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
|
||||
33
usbtop.spec
33
usbtop.spec
|
|
@ -1,10 +1,12 @@
|
|||
Name: usbtop
|
||||
Version: 1.0
|
||||
Release: 6%{?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,21 +53,4 @@ modprobe usbmon &> /dev/null || :
|
|||
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue