Compare commits

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

4 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
2 changed files with 43 additions and 2 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

View file

@ -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