diff --git a/0001-CMake-4-compatibility.patch b/0001-CMake-4-compatibility.patch deleted file mode 100644 index 6c9ff8f..0000000 --- a/0001-CMake-4-compatibility.patch +++ /dev/null @@ -1,39 +0,0 @@ -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/changelog b/changelog deleted file mode 100644 index a8c40f2..0000000 --- a/changelog +++ /dev/null @@ -1,42 +0,0 @@ -* 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 36f9898..70f121b 100644 --- a/usbtop.spec +++ b/usbtop.spec @@ -1,12 +1,10 @@ Name: usbtop Version: 1.0 -Release: %autorelease +Release: 10%{?dist} Summary: Utility to show USB bandwidth -License: BSD-3-Clause +License: BSD URL: https://github.com/aguinet/usbtop -Source: %{url}/archive/release-%{version}/usbtop-%{version}.tar.gz -# https://github.com/aguinet/usbtop/pull/45 -Patch: 0001-CMake-4-compatibility.patch +Source0: %{url}/archive/release-%{version}/usbtop-%{version}.tar.gz BuildRequires: systemd-rpm-macros BuildRequires: make @@ -22,7 +20,7 @@ USB buses and devices. %prep -%autosetup -p 1 -n usbtop-release-%{version} +%autosetup -n usbtop-release-%{version} rm -rf third-party @@ -36,10 +34,6 @@ 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 || : @@ -53,4 +47,33 @@ modprobe usbmon &> /dev/null || : %changelog -%autochangelog +* 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